resize font

This commit is contained in:
Javier 2016-08-01 17:35:31 -03:00
parent a72bd7fde9
commit d7b85e46e5
4 changed files with 15 additions and 3 deletions

View File

@ -15,7 +15,7 @@
<ion-content> <ion-content>
<div ng-show="!specificAmount"> <div ng-show="!specificAmount">
<div class="send-amount row" ng-style="{'background-color':index.backgroundColor}"> <div class="send-amount row" ng-style="{'background-color':index.backgroundColor}">
<div class="size-48">{{amount || '-'}}</div> <div class="size-48" ng-class="{'small-font': smallFont}">{{amount || '-'}}</div>
<div class="size-21 text-light" ng-show="!showAlternativeAmount">{{globalResult}} [{{amountResult || 0}} {{alternativeIsoCode}}]</div> <div class="size-21 text-light" ng-show="!showAlternativeAmount">{{globalResult}} [{{amountResult || 0}} {{alternativeIsoCode}}]</div>
<div class="size-21 text-light" ng-show="showAlternativeAmount">{{globalResult}} [{{alternativeResult || 0}} {{unitName}}]</div> <div class="size-21 text-light" ng-show="showAlternativeAmount">{{globalResult}} [{{alternativeResult || 0}} {{unitName}}]</div>
</div> </div>

View File

@ -420,11 +420,11 @@
<span translate>Amount</span><span ng-show="showAlternative"> [{{home.alternativeIsoCode}}]</span> <span translate>Amount</span><span ng-show="showAlternative"> [{{home.alternativeIsoCode}}]</span>
</label> </label>
<div class="input"> <div class="input">
<div ng-if="index.isCordova"> <div ng-if="!index.isCordova">
<input type="amount" readonly="true" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel> <input type="amount" readonly="true" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel>
<input type="amount" readonly="true" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel> <input type="amount" readonly="true" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ng-focus="openInputAmountModal()" ignore-mouse-wheel>
</div> </div>
<div ng-if="!index.isCordova"> <div ng-if="index.isCordova">
<input type="number" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ignore-mouse-wheel> <input type="number" ng-show="!showAlternative" id="amount" ng-disabled="home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{home.unitName}}" ng-model="_amount" valid-amount required autocomplete="off" ignore-mouse-wheel>
<input type="number" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ignore-mouse-wheel> <input type="number" ng-show="showAlternative" id="alternative" ng-disabled="!home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{ home.alternativeName }}" ng-model="_alternative" required autocomplete="off" ignore-mouse-wheel>
</div> </div>

View File

@ -28,7 +28,13 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
$scope.showAlternativeAmount = !$scope.showAlternativeAmount; $scope.showAlternativeAmount = !$scope.showAlternativeAmount;
}; };
function checkFontSize() {
if ($scope.amount && $scope.amount.length >= 13) $scope.smallFont = true;
else $scope.smallFont = false;
};
$scope.pushDigit = function(digit) { $scope.pushDigit = function(digit) {
checkFontSize();
if ($scope.amount && $scope.amount.length >= 20) return; if ($scope.amount && $scope.amount.length >= 20) return;
$scope.amount = $scope.amount + digit; $scope.amount = $scope.amount + digit;
@ -71,10 +77,12 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
$scope.amount = $scope.amount.slice(0, -1); $scope.amount = $scope.amount.slice(0, -1);
processAmount($scope.amount); processAmount($scope.amount);
checkFontSize();
}; };
function resetAmount() { function resetAmount() {
$scope.amount = $scope.alternativeResult = $scope.amountResult = $scope.globalResult = ''; $scope.amount = $scope.alternativeResult = $scope.amountResult = $scope.globalResult = '';
checkFontSize();
}; };
function processAmount(val) { function processAmount(val) {

View File

@ -99,6 +99,10 @@ h4.title a {
} }
} }
.small-font {
font-size: 34px !important;
}
.modal-content h4, .glidera h4, .coinbase h4 { .modal-content h4, .glidera h4, .coinbase h4 {
background: #F6F7F9; background: #F6F7F9;
padding: 25px 0px 5px 10px; padding: 25px 0px 5px 10px;