diff --git a/public/views/includes/wallets.html b/public/views/includes/wallets.html index 356ce9135..3fa2178ff 100644 --- a/public/views/includes/wallets.html +++ b/public/views/includes/wallets.html @@ -1,16 +1,18 @@
-
- - {{wallet.name || wallet.id}} - - {{wallet.m}}-of-{{wallet.n}} - - - Incomplete - - +
+
+ + {{wallet.name || wallet.id}} + + {{wallet.m}}-of-{{wallet.n}} + + + Incomplete + + +
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index 780360ccb..eb284a0d0 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -1,36 +1,52 @@ - + {{'Receive' | translate}} - -
- -
- Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup. +
+
+
+ +
+ Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup. +
+
-
- -
- No Wallet -
- -
-
- - Share address +
+
+
+ + Share +
+
+
+
+ + Next Address +
+
-
- - Next Address +
+
+
+ + ... + {{addr}} +
+
-
- - ... - {{addr}} + +
+
+ No Wallet
- - -
+
+ + +
+ diff --git a/src/sass/common.scss b/src/sass/common.scss index 9350009f1..f866cfd60 100644 --- a/src/sass/common.scss +++ b/src/sass/common.scss @@ -63,3 +63,7 @@ ion-header-bar{ border:none; } } + +.border-top{ + border-top:1px solid rgb(228,228,228); +} diff --git a/src/sass/main.scss b/src/sass/main.scss index b0f2c402a..5a0672550 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -772,6 +772,10 @@ ul.wallet-selection.wallets { margin: 30px 0; } +.m15v { + margin: 15px 0; +} + .m10h { margin: 0 10px; } @@ -995,6 +999,8 @@ input[type=number] { @import 'mixins/mixins'; @import "views/add"; @import "views/tab-home"; +@import "views/tab-receive"; @import "views/walletDetails"; @import 'views/onboarding/onboarding'; @import "views/includes/walletActivity"; +@import "views/includes/wallets"; diff --git a/src/sass/mixins/layout.scss b/src/sass/mixins/layout.scss index 71affb4b8..c55eb4932 100644 --- a/src/sass/mixins/layout.scss +++ b/src/sass/mixins/layout.scss @@ -1,4 +1,8 @@ @mixin center-block($topBottom: 0) { float:none; margin: $topBottom auto; +} + +.center-block{ + @include center-block(); } \ No newline at end of file diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss new file mode 100644 index 000000000..4f73f3ce6 --- /dev/null +++ b/src/sass/views/includes/wallets.scss @@ -0,0 +1,33 @@ +.wallets{ + .slides{ + .swiper-container{ + width:75% !important; + overflow:visible; + } + .card{ + padding: .7rem; + padding-left:.25rem; + padding-right:.25rem; + border-radius: .25rem; + } + .swiper-slide{ + width:100% !important; + &.swiper-slide-prev, &.swiper-slide-next{ + opacity: .2; + } + &.swiper-slide-prev{ + left:-5%; + } + &.swiper-slide-next{ + left:4%; + } + span{ + float:right; + clear:both; + } + } + } + .swiper-pagination{ + visibility: hidden; + } +} \ No newline at end of file diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss new file mode 100644 index 000000000..7651accbf --- /dev/null +++ b/src/sass/views/tab-receive.scss @@ -0,0 +1,34 @@ +#tab-receive { + #address { + background: #fff; + .item { + border: none; + font-size: .9rem; + i { + font-size: 1.3rem; + &.ion-social-bitcoin-outline { + border-right: 1px solid rgb(228, 228, 228); + } + } + } + .bit-address { + font-size: .8rem; + .item { + padding-top: 5px; + padding-bottom: 5px; + } + &-gen-address {} + } + } + #wallets { + &:before { + content: ""; + display: inline-block; + width: 0; + height: 0; + border-style: solid; + border-width: 0 20px 20px 20px; + border-color: transparent transparent #6980fe transparent; + } + } +}