From 6a090e95f01e1047dcc9a23a6c41884576638c42 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 May 2017 16:43:49 -0300 Subject: [PATCH] Fix wallet selector to bottom. Add scroll for small screens --- src/sass/views/tab-receive.scss | 47 +++++++++++++++++---------------- www/views/tab-receive.html | 21 ++++++++------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 45a998940..847ad0d78 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -1,17 +1,11 @@ #tab-receive { + @extend .deflash-blue; .address { background: #fff; - height: 65vh; - @media(max-height: 600px) and (max-width: 320px) { - height: 70vh; - .button { - min-height: 50px; - } - } + overflow: scroll; + height: 100%; &-info { - height: 100%; - display: flex; - flex-direction: column; + padding: 10% 0 18% 0; .address-label { margin-top: 5%; font-size: 13px; @@ -19,16 +13,7 @@ .qr { position: relative; top: 15%; - } - .backup { - background-color: orange; - color: #fff; - position: absolute; - z-index: 2; - i { - padding: 10px; - } - } + } .request-button { padding-top: 20px; } @@ -36,7 +21,7 @@ .incomplete { height: 100%; .title { - margin-top: 10%; + padding-top: 10%; font-size: 25px; color: #444; text-align: center; @@ -44,12 +29,28 @@ .subtitle { padding: 20px; color: #444; - margin-top: 20%; + margin-top: 10%; text-align: center; } .button { - margin-top: 20%; + margin: 10%; } } } + .backup { + position: absolute; + top: 0; + width: 100%; + cursor: pointer; + background-color: orange; + color: #fff; + i { + padding: 10px; + } + } + .wallet-selector { + position: absolute; + bottom: 0; + width: 100%; + } } diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 6881b4477..8ae0cdde8 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -18,12 +18,7 @@ -
-
-
- Wallet not backed up -
-
+
@@ -39,13 +34,20 @@
- +
-
+ -
+ +
+
+ Wallet not backed up +
+
+ + +