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

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

Browse source 
# Conflicts:
#	public/views/onboarding/terms.html
#	src/sass/views/onboarding/terms-of-use.scss
This commit is contained in:
Jamal Jackson 2016-09-06 10:46:47 -04:00
commit 229e2fd8ec
83 changed files with 860 additions and 999 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sass/views/includes/walletActivity.scss
View file

@ -1,5 +1,9 @@
.wallet-activity {
&-not-pending {
background-color:#eee;
}
&-amount {
float: right;
font-size: 18px;

8
src/sass/views/onboarding/onboard-collect-email.scss
View file

@ -1,5 +1,8 @@
#onboarding-collect-email {
background: rgb(17, 209, 166);
.scroll {
height: 100%;
}
#success-image {
margin-top: 4rem;
}
@ -11,17 +14,18 @@
opacity: 1;
background: #fff;
color: rgb(108, 108, 108);
height: 11rem;
height: 13rem;
animation-name: topBottom;
animation-iteration-count: 1;
animation-timing-function: ease-in;
animation-duration: 1s;
animation-delay: 2s;
position: absolute;
bottom: -100%;
bottom: -13rem;
animation-fill-mode: forwards;
z-index: 5;
margin-top: 0;
width: 100%;
label {
background: rgba(200, 200, 200, 0.20);
height: 3rem;

4
src/sass/views/onboarding/onboard-welcome.scss
View file

@ -7,7 +7,7 @@
#shopping-24 {
content: url("../img/onboarding-welcome-shopping24.png");
position: absolute;
top: 2%;
top: 5%;
right: 5%;
width: 35px;
height: auto;
@ -17,7 +17,7 @@
@include center-block();
}
.logo {
margin-top: 15rem;
margin-top: 13rem;
}
button {
@include center-block(1rem);

2
src/sass/views/onboarding/onboarding.scss
View file

@ -34,7 +34,7 @@
background-size: contain;
width: 100%;
clear: both;
height: 20rem;
height: 23rem;
margin-bottom: -3rem;
background-position: center;
background-repeat: no-repeat;

4
src/sass/views/onboarding/terms-of-use.scss
View file

@ -3,8 +3,8 @@
background: #fff;
box-shadow: 0px 3px 3px 0px rgba(50, 50, 50, 0.2);
}
ion-content {
margin-top: 1.5rem;
ion-content{
padding-top: 1.5rem;
color: rgba(86, 86, 86, 0.77);
p {
padding: 0 2.5%;