From d29b36b93518d2ff7c143c4c4e945b7ba02aa8c8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 17:10:40 -0300 Subject: [PATCH 1/3] Clear variable if wallet changed. Fix padding in home --- src/css/mobile.css | 2 +- src/js/controllers/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index f76d106b9..113948bc2 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -168,7 +168,7 @@ _:-ms-fullscreen, :root .main { .amount { width: 100%; text-align: center; - padding: 3rem 1rem; + padding: 2.5rem 1rem 1.5rem 1rem; margin-bottom: 11px; color: #fff; height: 175px; diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index cb050f6da..5f0a5ac1c 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -95,6 +95,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.totalBalanceSat = null; self.lockedBalanceSat = null; self.availableBalanceSat = null; + self.pendingAmount = null; self.totalBalanceStr = null; self.availableBalanceStr = null; From cae4074cc9aa74e76e9e88a0764154bc1e7fc942 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 17:39:31 -0300 Subject: [PATCH 2/3] Cleaning more variables --- src/js/controllers/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 5f0a5ac1c..e8a8dbf12 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -96,6 +96,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.lockedBalanceSat = null; self.availableBalanceSat = null; self.pendingAmount = null; + self.spendUnconfirmed = null; self.totalBalanceStr = null; self.availableBalanceStr = null; @@ -104,6 +105,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.alternativeBalanceAvailable = false; self.totalBalanceAlternative = null; + self.currentFeeLevel = null; self.notAuthorized = false; self.txHistory = []; self.txHistoryPaging = false; From dc512f6459ae09c15ec38417f01fafa39a5edc41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 17:41:10 -0300 Subject: [PATCH 3/3] Fix avatar padding --- src/css/mobile.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index 113948bc2..ad536cf03 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -198,7 +198,7 @@ _:-ms-fullscreen, :root .main { } .walletHome .avatar-wallet { - padding: 1.7rem 1rem; + padding: 0.5rem; width: 75px; height: 75px; position: absolute; @@ -209,7 +209,6 @@ _:-ms-fullscreen, :root .main { margin: 0; color: #FFF; font-weight: 700; - line-height: 15px; text-align: center; border-radius: 5px; } @@ -305,13 +304,12 @@ a.missing-copayers { font-size: 20px; font-weight: 700; margin-right: 15px; - padding: 0.33rem 0.65rem; - line-height: 24px; text-align: center; float: left; width: 35px; height: 35px; border-radius: 3px; + padding: 2px; } .sidebar header { @@ -340,7 +338,6 @@ a.missing-copayers { border-bottom: transparent; color: #A5B2BF; padding: 1rem 0.7rem; - line-height: 155%; } .sidebar ul.off-canvas-list li a i {