diff --git a/public/views/includes/menu-item.html b/public/views/includes/menu-item.html index c3abc8c45..1420a8d53 100644 --- a/public/views/includes/menu-item.html +++ b/public/views/includes/menu-item.html @@ -1,11 +1,14 @@ - - -
+ + + {{ item.title|translate }} - + {{ index.pendingTxProposalsCountForUs }} - -
+ + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index ea2b7c1fb..640486b0d 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -132,7 +132,7 @@
- +
@@ -381,7 +381,7 @@
- +
@@ -414,10 +414,10 @@
{{index.addressbook[_address] || _address}}
- - +
diff --git a/src/css/main.css b/src/css/main.css index 7a60c3093..b5d820417 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1052,6 +1052,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .text-success {color: #1ABC9C;} .text-spacing {letter-spacing:2px;} .text-capitalize {text-transform: capitalize;} +.text-shadow {text-shadow: 2px 2px 3px rgba(150, 150, 150, 1);} .payment-uri .panel { line-height: 1.4; diff --git a/src/css/mobile.css b/src/css/mobile.css index fb3f66b75..0d042ad18 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -172,8 +172,8 @@ _:-ms-fullscreen, :root .main { padding-top: 1rem !important; } -.menu-activity { - background-image: linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%); +.menu-wallet-home { + background: #fff linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%); box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.35); width: 100%; height: 8rem; @@ -187,26 +187,6 @@ _:-ms-fullscreen, :root .main { z-index: -999; } -.icon-activity { - font-size: 30px; - position: absolute; - display: block; - left: 0; - right: 0; - top: -4px; -} - -.name-activity { - margin-top: 18px; -} - -.label.activity { - position: absolute; - top: 11px; - font-size: 9px; - padding: 0.15rem 0.25rem; -} - .amount { width: 100%; text-align: center; @@ -274,6 +254,7 @@ _:-ms-fullscreen, :root .main { top: inherit; right: 15px; bottom: 45px; + line-height: 12px; } .send .camera-icon a { @@ -298,6 +279,14 @@ ul.copayer-list img { display: block; } +.bottombar-item a.active span, .bottombar-item a.active i { + font-weight: bold; +} + +.bottombar-item a.active .label { + text-shadow: none; +} + .box-founds { background-color: #213140; } diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index b6f037f24..a308f6571 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -97,13 +97,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; this.onQrCodeScanned = function(data) { + if (data) go.send(); $rootScope.$emit('dataScanned', data); }; - this.openSendScreen = function() { - go.send(); - }; - rateService.whenAvailable(function() { self.isRateAvailable = true; $rootScope.$digest();