From d7b85e46e55f2be6deff75f0f6a1d1ac4e8e3db9 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 1 Aug 2016 17:35:31 -0300 Subject: [PATCH] resize font --- public/views/modals/inputAmount.html | 2 +- public/views/walletHome.html | 4 ++-- src/js/controllers/modals/inputAmount.js | 8 ++++++++ src/sass/main.scss | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/public/views/modals/inputAmount.html b/public/views/modals/inputAmount.html index 81e189df1..f2e0307e3 100644 --- a/public/views/modals/inputAmount.html +++ b/public/views/modals/inputAmount.html @@ -15,7 +15,7 @@
-
{{amount || '-'}}
+
{{amount || '-'}}
{{globalResult}} [{{amountResult || 0}} {{alternativeIsoCode}}]
{{globalResult}} [{{alternativeResult || 0}} {{unitName}}]
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index ac79a87f0..d15c1675d 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -420,11 +420,11 @@ Amount [{{home.alternativeIsoCode}}]
-
+
-
+
diff --git a/src/js/controllers/modals/inputAmount.js b/src/js/controllers/modals/inputAmount.js index 0335655dd..365b2b236 100644 --- a/src/js/controllers/modals/inputAmount.js +++ b/src/js/controllers/modals/inputAmount.js @@ -28,7 +28,13 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct $scope.showAlternativeAmount = !$scope.showAlternativeAmount; }; + function checkFontSize() { + if ($scope.amount && $scope.amount.length >= 13) $scope.smallFont = true; + else $scope.smallFont = false; + }; + $scope.pushDigit = function(digit) { + checkFontSize(); if ($scope.amount && $scope.amount.length >= 20) return; $scope.amount = $scope.amount + digit; @@ -71,10 +77,12 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct $scope.amount = $scope.amount.slice(0, -1); processAmount($scope.amount); + checkFontSize(); }; function resetAmount() { $scope.amount = $scope.alternativeResult = $scope.amountResult = $scope.globalResult = ''; + checkFontSize(); }; function processAmount(val) { diff --git a/src/sass/main.scss b/src/sass/main.scss index fdab2fa47..0ca43d701 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -99,6 +99,10 @@ h4.title a { } } +.small-font { + font-size: 34px !important; +} + .modal-content h4, .glidera h4, .coinbase h4 { background: #F6F7F9; padding: 25px 0px 5px 10px;