anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Use All Available Funds button.

Browse source
This commit is contained in:
Brendon Duncan 2018-07-28 15:36:23 -07:00
commit 0ba1ea1f42
3 changed files with 53 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sass/variables.scss
View file

@ -9,6 +9,7 @@ $v-font-family-light: "Roboto-Light", sans-serif-
/* Colors */ /* Colors */
$v-bitcoin-orange: #fab915 !default; $v-bitcoin-orange: #fab915 !default;
$v-off-black: #262424;
$v-dark-gray: #445 !default; $v-dark-gray: #445 !default;
$v-mid-gray: #667 !default; $v-mid-gray: #667 !default;
$v-light-gray: #9b9bab !default; $v-light-gray: #9b9bab !default;
@ -24,8 +25,11 @@ $v-text-accent-color: #647ce8 !default;
$v-success-color: #13e5b6 !default; $v-success-color: #13e5b6 !default;
$v-warning-color: #ffa500 !default; $v-warning-color: #ffa500 !default;
$v-warning-color-2: #b7664d;
$v-error-color: #ef473a !default; $v-error-color: #ef473a !default;
$v-background-under-card: #f2f2f2;
$v-wallet-color-map: ( $v-wallet-color-map: (
0: (color: #dd4b39, name: 'Cinnabar'), 0: (color: #dd4b39, name: 'Cinnabar'),
1: (color: #f38f12, name: 'Carrot Orange'), 1: (color: #f38f12, name: 'Carrot Orange'),

60
src/sass/views/amountNew.scss
View file

@ -249,7 +249,6 @@
min-height: 20px; min-height: 20px;
.warning { .warning {
color: #b7664d;
font-family: 'ProximaNova-Semibold'; font-family: 'ProximaNova-Semibold';
font-size: 12px; font-size: 12px;
padding: 0 6px 6px 6px; padding: 0 6px 6px 6px;
@ -433,38 +432,60 @@
.keypad-container { .keypad-container {
position: relative; position: relative;
font-size: 18px;
line-height: 2em;
//flex: 0 1 196px; //flex: 0 1 196px;
@media (min-height: 667px) {
font-size: 24px;
}
@media(max-height: 480px) {
font-size: 12px;
}
@media (min-height: 667px) { @media (min-height: 667px) {
//flex: 0 1 224px; //flex: 0 1 224px;
} }
.sendmax {
background: $v-off-black;
.button {
color: white;
background: black;
border: 1px solid $v-off-black;
border-radius: 0;
font-size: 0.8em;
line-height: 2em;
margin-bottom: 1.618em;
width: 100%;
.available-funds-amount {
color: #C9C9C9;
}
&:active {
background-color: $v-dark-gray;
}
}
}
.keypad { .keypad {
text-align: center; text-align: center;
font-size: 18px;
font-weight: lighter; font-weight: lighter;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
color: $v-text-primary-color; color: $v-text-primary-color;
@media (min-height: 667px) {
font-size: 24px;
}
.row { .row {
padding: 0 !important; padding: 0 !important;
margin: 0 !important; margin: 0 !important;
} }
.col {
line-height: 38px;
@media (min-height: 667px) {
line-height: 45px;
}
}
.row { .row {
&:last-child { &:last-child {
.col { .col {
@ -498,23 +519,22 @@
.digit{ .digit{
cursor: pointer; cursor: pointer;
background-color: #000; background-color: #000;
border: 1px solid #262424; border: 1px solid $v-off-black;
transition: all 0.1s ease; transition: all 0.1s ease;
&:active { &:active {
background-color: $v-dark-gray; background-color: $v-dark-gray;
} }
} }
@media(max-height: 480px) {
font-size: 12px;
}
} }
} }
} }
background: #f2f2f2;
.warning {
color: $v-warning-color-2;
}
background: $v-background-under-card;
ion-content { ion-content {
margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */ margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */

16
www/views/amountNew.html
View file

@ -48,16 +48,18 @@
Available Funds: {{vm.availableFunds}}</span> Available Funds: {{vm.availableFunds}}</span>
</div> </div>
</div> </div>
<button class="button button-sendmax" ng-if="!vm.isRequestingSpecificAmount" ng-click="vm.sendMax()">
<span>
<i class="icon ion-ios-speedometer-outline"></i>&emsp;
<span translate>Send max amount</span>
</span>
</button>
</div> </div>
<div class="keypad-container" style="background: #fff; position: absolute; bottom: 0; margin-bottom: 57px; width: 100%;"> <div class="keypad-container" style="background: #fff; position: absolute; bottom: 0; margin-bottom: 57px; width: 100%;">
<div class="sendmax">
<button class="button button-sendmax" ng-if="!vm.isRequestingSpecificAmount" ng-click="vm.sendMax()">
<span>
<span translate>Use All Available Funds</span>&ensp;
<span class="available-funds-amount">({{vm.availableFunds}})</span>
</span>
</button>
</div>
<div class="keypad" style="position: relative;"> <div class="keypad" style="position: relative;">
<div class="row"> <div class="row">