BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

adjustment to last design

This commit is contained in:
Javier 2016-08-05 15:26:27 -03:00
parent a17a4438b4
commit fb362df582
3 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
public/views/modals/inputAmount.html
View File

@ -14,52 +14,53 @@
<ion-content>
<div ng-show="!specificAmount">
<div class="send-amount row" ng-style="{'background-color':index.backgroundColor}">
<div class="size-48" ng-class="{'small-font': smallFont}">{{amount || '-'}}</div>
<div class="size-21 text-light" ng-show="!showAlternativeAmount">{{globalResult}} [{{amountResult || '0.00'}} {{alternativeIsoCode}}]</div>
<div class="size-21 text-light" ng-show="showAlternativeAmount">{{globalResult}} [{{alternativeResult || '0.00'}} {{unitName}}]</div>
</div>
<div class="button-content text-center size-10 df">
<button class="button button-amount expand button-stable" ng-click="pushOperator('x')">x</button>
<button class="button expand button-stable" ng-click="pushOperator('/')">/</button>
<button class="button expand button-stable" ng-click="pushOperator('+')">+</button>
<button class="button expand button-stable" ng-click="pushOperator('-')">-</button>
<div class="send-amount ">
<div class="size-36 text-light text-black m15t" ng-class="{'small-font-amount': smallFont}">{{amount || '-'}}</div>
<div class="size-17 text-light text-black" ng-class="{'small-font-result': smallFont}" ng-show="!showAlternativeAmount">{{globalResult}} [{{amountResult || '0.00'}} {{alternativeIsoCode}}]</div>
<div class="size-17 text-light text-black" ng-show="showAlternativeAmount">{{globalResult}} [{{alternativeResult || '0.00'}} {{unitName}}]</div>
</div>
<div class="m10b">
<div class="button-content text-center df">
<button class="button expand button-light" ng-click="pushDigit('1')">1</button>
<button class="button expand button-light" ng-click="pushDigit('2')">2</button>
<button class="button expand button-light" ng-click="pushDigit('3')">3</button>
<div class="col col-25 col-offset-50">
<button class="button expand button-stable" ng-click="resetAmount()">AC</button>
</div>
<div class="col col-25">
<button class="button expand text-center" ng-style="{'background-color':index.backgroundColor}"
ng-disabled="alternativeResult <= 0 && amountResult <= 0" ng-click="finish()" ng-show="!specificAmount">
<span>Ok</span>
</button>
</div>
<div class="button-content text-center df">
<button class="button expand button-light" ng-click="pushDigit('4')">4</button>
<button class="button expand button-light" ng-click="pushDigit('5')">5</button>
<button class="button expand button-light" ng-click="pushDigit('6')">6</button>
</div>
<div class="button-content text-center df">
<button class="button expand button-light" ng-click="pushDigit('7')">7</button>
<button class="button expand button-light" ng-click="pushDigit('8')">8</button>
<button class="button expand button-light" ng-click="pushDigit('9')">9</button>
<button class="button expand button-stable" ng-click="pushOperator('/')">/</button>
</div>
<div class="button-content text-center df">
<button class="button expand button-light" ng-click="pushDigit('4')">4</button>
<button class="button expand button-light" ng-click="pushDigit('5')">5</button>
<button class="button expand button-light" ng-click="pushDigit('6')">6</button>
<button class="button button-amount expand button-stable" ng-click="pushOperator('x')">x</button>
</div>
<div class="button-content text-center df">
<button class="button expand button-light" ng-click="pushDigit('1')">1</button>
<button class="button expand button-light" ng-click="pushDigit('2')">2</button>
<button class="button expand button-light" ng-click="pushDigit('3')">3</button>
<button class="button expand button-stable" ng-click="pushOperator('+')">+</button>
</div>
<div class="button-content text-center df">
<button class="button expand button-light" ng-click="pushDigit('.')">.</button>
<button class="button expand button-light" ng-click="pushDigit('0')">0</button>
<button class="button expand button-light" ng-click="removeDigit()"><</button>
<button class="button expand button-stable" ng-click="pushOperator('-')">-</button>
</div>
</div>
<div class="row m20t">
<div class="columns">
<button class="round expand m0"
ng-style="{'background-color':index.backgroundColor}"
ng-disabled="alternativeResult <= 0 && amountResult <= 0"
ng-click="finish()"
ng-show="!specificAmount">
<span translate ng-show="!address">Ok</span>
<span translate ng-show="address">Generate QR Code</span>
</button>
</div>
</div>
</div>

8
src/js/controllers/modals/inputAmount.js
View File

@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
unitToSatoshi = config.unitToSatoshi;
satToUnit = 1 / unitToSatoshi;
unitDecimals = config.unitDecimals;
resetAmount();
$scope.resetAmount();
};
$scope.shareAddress = function(uri) {
@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
$scope.removeDigit = function() {
if ($scope.amount.toString().length == 1) {
resetAmount();
$scope.resetAmount();
return;
}
@ -88,14 +88,14 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
checkFontSize();
};
function resetAmount() {
$scope.resetAmount = function() {
$scope.amount = $scope.alternativeResult = $scope.amountResult = $scope.globalResult = '';
checkFontSize();
};
function processAmount(val) {
if (!val) {
resetAmount();
$scope.resetAmount();
return;
}

10
src/sass/main.scss
View File

@ -99,8 +99,12 @@ h4.title a {
}
}
.small-font {
font-size: 34px !important;
.small-font-amount {
font-size: 28px !important;
}
.small-font-result {
font-size: 16px !important;
}
.modal-content h4, .glidera h4, .coinbase h4 {
@ -1585,7 +1589,7 @@ input.ng-invalid-match {
text-align: center;
padding-top: 10px;
color: #fff;
height: 150px;
height: 125px;
}
.alternative-amount {