Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps

This commit is contained in:
Jamal Jackson 2016-09-08 10:33:21 -04:00
commit 57c1942740
33 changed files with 566 additions and 591 deletions

View file

@ -8,6 +8,10 @@
font-weight: bold;
}
.item.item-footer {
font-weight: lighter;
}
.icon.list-add-button {
color: #666;
font-size: 38px;

View file

@ -343,7 +343,7 @@ ul.wallet-selection.wallets {
position: absolute;
top: inherit;
left: 10px;
bottom: 26px;
bottom: 15px;
font-size: 20px;
color: #fff;
}
@ -996,5 +996,6 @@ input[type=number] {
@import "views/add";
@import "views/tab-home";
@import "views/walletDetails";
@import "views/bitpayCard";
@import 'views/onboarding/onboarding';
@import "views/includes/walletActivity";

View file

@ -0,0 +1,16 @@
#bitpayCard {
.amount {
width: 100%;
text-align: center;
padding: 2rem 1rem 1.5rem 1rem;
min-height: 115px;
margin-bottom: 25px;
border-color: #172565;
background-color: #1e3186;
background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
color: #fff;
}
strong {
line-height: 100%;
}
}

View file

@ -14,14 +14,14 @@
opacity: 1;
background: #fff;
color: rgb(108, 108, 108);
height: 13rem;
height: 14rem;
animation-name: topBottom;
animation-iteration-count: 1;
animation-timing-function: ease-in;
animation-duration: 1s;
animation-delay: 2s;
position: absolute;
bottom: -13rem;
bottom: -14rem;
animation-fill-mode: forwards;
z-index: 5;
margin-top: 0;

View file

@ -1,6 +1,7 @@
#walletDetails {
.bar-header {
border: 0;
background: none;
.title, .button {
color: #fff;
}
@ -12,13 +13,17 @@
.amount {
width: 100%;
text-align: center;
padding: 2.5rem 1rem 1.5rem 1rem;
padding: 2rem 1rem 1.5rem 1rem;
color: #fff;
height: 150px;
margin-bottom: 25px;
min-height: 115px;
margin-bottom: 10px;
&-alternative {
line-height: 48px;
line-height: 36px;
}
strong {
line-height: 100%;
}
}
}