Merge branch 'feature/send' of github.com:nacardin/bitpay-wallet into nacardin-feature/send

This commit is contained in:
Jason Dreyzehner 2016-09-08 14:25:58 -04:00
commit dbf2bf93e9
6 changed files with 158 additions and 92 deletions

View file

@ -901,44 +901,6 @@ input[type=file] {
font-size: 16px;
}
/*
* Calculator
*/
.calculator .header-calc {
position: absolute;
width: 100%;
text-align: center;
}
.calculator .button-calc {
position: absolute;
width: 100%;
bottom: 0;
}
.calculator .button-calc .row {
padding: 0 !important;
}
.calculator .button-calc .columns {
cursor: pointer;
text-align: center;
}
.calculator .button-calc .operator {
color: #2C3E50;
background-color: #eee;
}
.calculator .button-calc .columns:active {
background-color: #eee;
}
.calculator .button-calc .operator:active {
background-color: #f8f8f8;
}
// No looks likes locked
input[type="number"] {
&[readonly] {
@ -998,8 +960,10 @@ input[type=number] {
@import "forms";
@import 'mixins/mixins';
@import "views/add";
@import "views/amount";
@import "views/tab-home";
@import "views/tab-receive";
@import "views/tab-send";
@import "views/walletDetails";
@import "views/bitpayCard";
@import 'views/onboarding/onboarding';