diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index ae1d52c83..dcb81f835 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -3,6 +3,15 @@ .swiper-container { width: 85% !important; overflow: visible; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + @media (max-height: 600px){ + &{ + transform: translate(-50%, -58%); + } + } } .card { max-width: 350px; @@ -17,6 +26,9 @@ } .item{ padding:.6rem; + &.noBalance{ + padding:.6rem 1rem 1.7rem; + } span{ clear:both; width: 100%; diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 404e67e25..50129fb9c 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -13,8 +13,19 @@ .scroll{height:100%;} #address { background: #fff; - height:80%; - article{height: 100%;position: relative;} + height: calc(100vh - 33vh); + display: flex; + align-items: center; + justify-content: center; + position: relative; + flex-flow: column; + @media(max-height: 600px){ + height: calc(100vh - 36vh); + } + article{ + flex:1; + width: 100%; + } #bit-address{ position: absolute; bottom:0; @@ -52,26 +63,41 @@ } } .qr { - padding: 13vh 0 5vh 0; + padding: calc(100vh - 85vh) 0 calc(100vh - 96vh); + @media(max-height: 700px){ + padding: calc(100vh - 90vh) 0 calc(100vh - 96vh); + } + div{ + display: flex; + justify-content: center; + align-items: center; + } + } + .share{ + flex:1; + max-width: 120px; + .item{ + i{left:25px;} + } } .backup { background-color: orange; color: #fff; position: absolute; - top: 5px; + top: 0; i { padding: 10px; } } @media (max-height: 600px){ &{ - height: 77%; .qr{ - padding:6.5vh 0 2vh; + padding:6vh 0 0; div{ transform: scale(.7); } } + #bit-address{position: realtive;} } } } @@ -89,6 +115,7 @@ position: absolute; left: 50%; transform: translateX(-50%); + z-index: 2; } } #first-time-tip { @@ -131,6 +158,10 @@ border-right: 1px solid rgb(228, 228, 228); padding-right: 10px; } + .wallets{ + position: relative; + height: calc(100vh - 83vh); + } } @keyframes fadeIn { diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html index 6de2c5a5b..0b0deb799 100644 --- a/www/views/includes/wallets.html +++ b/www/views/includes/wallets.html @@ -2,7 +2,7 @@
-
+
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 7649e9b0c..ae66023d0 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -60,7 +60,7 @@
-
+