diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index d1cf44609..179c52e58 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,17 +1,15 @@ -
- - + +
- {{item.title|translate}} - {{index.pendingTxProposalsCountForUs}}
-
+
- diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 08f5d83dd..f0bcccb92 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -13,13 +13,13 @@

Information

-
-
-
Transaction accepted...
-
But not broadcasted. Try to send manually
-
Transaction sent!
@@ -132,9 +132,9 @@
-
diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index 9d43fcde6..ba493a424 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,8 +1,8 @@ -
-
+
+ -
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index e0f17543b..46956a2c0 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -407,19 +407,18 @@ history {{btx.message || btx.addressTo}}
-
-
- - +
+ +
+
+
+
+
+
diff --git a/src/css/main.css b/src/css/main.css index 04bbbc797..51edbc350 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -26,7 +26,6 @@ h2 { font-size: 20px; font-weight: 100; } - h3 { font-weight: 300; font-size: 16px; @@ -147,7 +146,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .content { width:100%; - position: absolute; + position: absolute; top: 46px; bottom: 0; overflow: auto; @@ -1152,6 +1151,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus { vertical-align: middle; } +#history .spinner > div { + background-color: #7A8C9E; +} + .spinner > div { background-color: #fff; height: 100%; @@ -1196,4 +1199,3 @@ input.ng-invalid-match, input.ng-invalid-match:focus { -webkit-transform: scaleY(1.0); } } - diff --git a/src/css/mobile.css b/src/css/mobile.css index 0c172cbb3..228fca53b 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -39,14 +39,14 @@ body, div, .row { /* END disabling text selection */ .inner-wrap { - -webkit-transition-duration: 250ms; - transition-duration: 250ms; + -webkit-transition-duration: 250ms; + transition-duration: 250ms; } body { overflow: hidden; -ms-content-zooming: none; -} +} /* Fix IE 10 */ .extra-margin-bottom { @@ -121,7 +121,7 @@ _:-ms-fullscreen, :root .main { left: -5px; height: 45px; top: 0px; -} +} .tab-bar .text-back { margin-left: 26px; @@ -169,7 +169,7 @@ _:-ms-fullscreen, :root .main { } .off-canvas-wrap,.inner-wrap{ - height:100%; + height:100%; } .walletHome { @@ -212,15 +212,15 @@ ul.copayer-list img { } .bottombar-item a { - color: #7A8C9E; + color: #9EA9B3; padding: 0.5rem 0; display: block; - border-top: 3px solid #213140; + border-top: 3px solid #122232; } .bottombar-item a.active { color: #E4E8EC; - background-color: #213140; + background-color: #122232; } .box-founds { @@ -261,7 +261,7 @@ a.missing-copayers { .footer-setup { margin-bottom: 50px; -} +} .label { font-size: 70%; @@ -282,7 +282,7 @@ a.missing-copayers { .sidebar li.nav-item.selected { background-color: #f1f3f5; box-shadow: inset -1px 0px 1px 0px rgba(0,0,0,0.20); -} +} .sidebar .avatar-wallet, .payment-uri .avatar-wallet { background-color: #2C3E50; @@ -344,8 +344,8 @@ a.missing-copayers { line-height: 24px; } -/* - * Remove all vendors hover / shadow / fade +/* + * Remove all vendors hover / shadow / fade */ .tooltip { @@ -432,7 +432,7 @@ a.pin-button:active { } .tx-comment { - border-top: 1px solid #eee; + border-top: 1px solid #eee; padding-top: 10px; margin-top: 10px; } @@ -563,17 +563,17 @@ a.pin-button:active { padding-bottom: 20px; } -.modal.fade, +.modal.fade, .reveal-modal.fade { opacity: 1; } -.modal.fade .modal-dialog, -.modal.in .modal-dialog, -.reveal-modal-bg, -.reveal-modal-bg .fade .in, -.reveal-modal, -.reveal-modal .fade, +.modal.fade .modal-dialog, +.modal.in .modal-dialog, +.reveal-modal-bg, +.reveal-modal-bg .fade .in, +.reveal-modal, +.reveal-modal .fade, .reveal-modal .fade .out, .reveal-modal .fade .in { -webkit-transition: none !important; @@ -641,12 +641,12 @@ a.pin-button:active { color: #B7C2CD; } -:-ms-input-placeholder { +:-ms-input-placeholder { color: #B7C2CD; } -.animation-left.ng-enter, .animation-left.ng-leave, -.animation-right.ng-enter, .animation-right.ng-leave { +.animation-left.ng-enter, .animation-left.ng-leave, +.animation-right.ng-enter, .animation-right.ng-leave { -webkit-transition: all ease-in-out 250ms; transition: all ease-in-out 250ms; } @@ -668,7 +668,7 @@ a.pin-button:active { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } - + .animation-left.ng-leave, .animation-right.ng-leave { -webkit-transform: translate3d(0, 0, 0); @@ -691,7 +691,7 @@ a.pin-button:active { -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); width:100%; - position: absolute; + position: absolute; top: 46px; bottom: 70px; overflow: auto; @@ -707,6 +707,3 @@ a.pin-button:active { -webkit-transform: translate3d(-100%, 0, 0) !important; transform: translate3d(-100%, 0, 0) !important; } - - -