diff --git a/css/src/main.css b/css/src/main.css index b071003f7..3fd9163fd 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -80,7 +80,7 @@ font-family: 'Ubuntu', Helvetica, sans-serif !important; } -h1, h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5, h6, .panel h2 { color: #2C3E50; } @@ -203,6 +203,11 @@ header .alt-currency { float: left; } +.col2_full { + width: 194px; + height: 62px; +} + .col3 a { font-size: 20px; display: block; @@ -245,6 +250,17 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu -webkit-box-shadow: 0 0 0px 1000px white inset; } +.home-wallet .avatar-wallet { + background: #1ABC9C; + margin: 0; + width: 45px; + height: 45px; + font-size: 30px; + padding-top: 10px; + margin-right: 15px; + color: #FFF; +} + .side-nav.wallets .avatar-wallet{ background-color: #7A8C9E; color: #213140; @@ -607,14 +623,10 @@ a.button-setup { color: #B6E9DF; } -.founds .locked { +.locked { font-size: 11px; - z-index: -99999; background-color: #213140; - position: absolute; - top: 52px; - width: 250px; - left: 0; + width: 100%; padding: 0.3rem 0.7rem; color: white; border-bottom: 1px solid #374756; @@ -1128,8 +1140,6 @@ a:hover .photo-container { color: #fff; } -.side-nav {padding-top: 50px;} - .side-nav li { font-size: 16px; line-height: 40px; diff --git a/css/src/mobile.css b/css/src/mobile.css index f5c498a42..0795d9a02 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -199,5 +199,9 @@ padding: 0.15rem 0.2rem; } + .line-t { + border-top: 1px solid #3C5269; + } + } diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 576618b8f..97eb4ea50 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -50,6 +50,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function( if ($rootScope.wallet) { $rootScope.$watch('wallet.id', function() { $scope.walletSelection = false; + $scope.getWallets(); }); } @@ -61,13 +62,23 @@ angular.module('copayApp.controllers').controller('SidebarController', function( $scope.walletSelection = !$scope.walletSelection; if (!$scope.walletSelection) return; + $scope.getWallets(); + }; + + $scope.getWallets = function() { $scope.wallets = []; var wids = _.pluck($rootScope.iden.listWallets(), 'id'); _.each(wids, function(wid) { if (controllerUtils.isFocusedWallet(wid)) return; var w = $rootScope.iden.getWalletById(wid); $scope.wallets.push(w); - controllerUtils.updateTxsAndBalance(w); + controllerUtils.updateTxs({ + wallet: w, + pending: true + }); + controllerUtils.updateBalance(w, function() { + $rootScope.$digest(); + }) }); }; }); diff --git a/js/models/Compatibility.js b/js/models/Compatibility.js index 0a136391b..f003b9f63 100644 --- a/js/models/Compatibility.js +++ b/js/models/Compatibility.js @@ -162,6 +162,7 @@ Compatibility.readWalletPre8 = function(walletId, password, cb) { var self = this; var passphrase = cryptoUtils.kdf(password); var obj = {}; + var key; for (key in localStorage) { if (key.indexOf('wallet::' + walletId) !== -1) { diff --git a/views/copayers.html b/views/copayers.html index 12342f945..3c6b08631 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -18,7 +18,7 @@ -
+
diff --git a/views/homeWallet.html b/views/homeWallet.html index d95152be2..c922d691e 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -1,70 +1,68 @@ -
+
-

Home

-
-
+

Home

- -
-
{{$root.wallet.getName() | limitTo: 1}}
-
{{$root.wallet.getName()}}
-
- {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} - {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} + +
+
+
+
{{$root.wallet.getName() | limitTo: 1}}
+
+
+

{{$root.wallet.getName()}}

+
+
+ {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} + {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}
- -
-
-
-
- - - Quick receive -
- - -
-

{{address.addressStr}}

- - - -
-
-
-
-
- -
-
- {{copayer.peerId}} -
- - {{'Me'|translate}} - {{copayer.nick}} + +
+
+

Quick receive

+
+ + +
+

{{address.addressStr}}

+ + + +
+ +
+
-
Ready
-
- +
+ -
+ +
+
+

Copayers

+
+ {{copayer.peerId}} +
+ + {{'Me'|translate}} + {{copayer.nick}} +
+
Ready
+
+
+
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 9f0a8ea89..ce882f4d5 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -59,7 +59,7 @@ {{'Add Wallet' | translate }}
-
+
@@ -73,12 +73,13 @@ - {{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} -   + + {{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} +
-
+