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

# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js
This commit is contained in:
Jamal Jackson 2016-09-14 11:42:33 -04:00
commit fdb5e467b9
28 changed files with 150 additions and 59 deletions

View file

@ -937,6 +937,27 @@ input[type=number] {
}
}
/** Gravatar **/
.gravatar {
border-radius: 50%;
}
.gravatar-content {
position: relative;
height: 70px;
border-color: #172565;
background-color: #1e3186;
background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
color: #fff;
margin-bottom: 50px;
.gravatar {
position: absolute;
bottom: -30px;
left: 41%;
}
}
/* Spinner */
.item-icon-left ion-spinner {
@ -961,6 +982,7 @@ input[type=number] {
@import 'mixins/mixins';
@import "views/add";
@import "views/amount";
@import "views/confirm";
@import "views/tab-home";
@import "views/tab-receive";
@import "views/tab-send";

View file

@ -9,7 +9,11 @@
padding-left: 48px;
}
}
.send-gravatar {
left: 11px;
position: absolute;
top: 10px;
}
.amount-pane {
position: absolute;
top: 125px;

View file

@ -0,0 +1,7 @@
#view-confirm {
.send-gravatar {
left: 11px;
position: absolute;
top: 10px;
}
}

View file

@ -11,4 +11,9 @@
padding-bottom: 1px;
}
}
.send-gravatar {
left: 11px;
position: absolute;
top: 10px;
}
}