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

# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss
This commit is contained in:
Jamal Jackson 2016-09-02 06:57:50 -04:00
commit ee7bb0f455
96 changed files with 610 additions and 607 deletions

13
src/sass/views/add.scss Normal file
View file

@ -0,0 +1,13 @@
#view-add {
.item {
margin-bottom: 10px;
margin-left: 10px;
margin-right: 10px;
&:first-child {
margin-top: 25px;
}
}
}

View file

@ -1,37 +0,0 @@
.icon.nav-item-arrow-right {
color: #666;
font-size: 26px;
}
.item.item-heading {
font-weight: bold;
}
.icon.list-add-button {
color: #666;
font-size: 38px;
}
.item.item-big-icon-left {
padding-left: 74px;
}
.icon.big-icon-svg {
padding: 0 7px;
> img {
border-radius: 50%;
width: 40px;
height: 40px;
box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
}
}
.overlay{
position: absolute;
top:0;
left:0;
width:100%;
height: 100%;
background: rgba(0,0,0,.4);
z-index: 4;
}

View file

@ -5,6 +5,7 @@
background-size: contain;
background-repeat-y: no-repeat;
#shopping-24 {
content: url("../img/onboarding-welcome-shopping24.png");
position: absolute;
top: 2%;
right: 5%;

View file

@ -19,4 +19,8 @@
background-repeat: no-repeat;
background-position: -5px -6px;
}
a.item {
color: #444;
}
}

View file

@ -0,0 +1,24 @@
#walletDetails {
.bar-header {
border: 0;
.title, .button {
color: #fff;
}
.button {
background-color: transparent;
}
}
.amount {
width: 100%;
text-align: center;
padding: 2.5rem 1rem 1.5rem 1rem;
color: #fff;
height: 150px;
margin-bottom: 25px;
&-alternative {
line-height: 48px;
}
}
}