Merge pull request #191 from gabrielbazan7/feat/receive

effects on views if the user has not yet backed up a wallet
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-27 10:00:19 -03:00 committed by GitHub
commit 3ffd4ce731
21 changed files with 293 additions and 110 deletions

View file

@ -1,4 +1,4 @@
#onboarding-backup-warning{
#backup-warning{
.warning{
margin:4rem auto 1rem;
height: 11rem;
@ -21,7 +21,7 @@
}
@media (max-width: 400px){
#onboarding-backup-warning{
#backup-warning{
.warning{
margin: 2rem auto 1rem;
height: 8rem;
@ -45,10 +45,10 @@
}
}
@media (max-height: 540px){
#onboarding-backup-warning{
#backup-warning{
.cta-buttons{
float:left;
position: relative;
}
}
}
}

View file

@ -9,7 +9,12 @@
transform: translate(-50%, -50%);
border-radius: .25rem;
&-header {
background: rgb(1, 209, 162);
&-success {
background: rgb(1, 209, 162);
}
&-warning {
background: orange;
}
padding: 1rem;
border-radius: .25rem .25rem 0 0;
min-height: 120px;
@ -26,6 +31,12 @@
background-size: contain;
margin-top: .3rem;
}
&-img-warning {
background-image: url('../img/onboarding-success.svg');
height: 6rem;
background-size: contain;
margin-top: .3rem;
}
}
&-content {
padding: .5rem .8rem;
@ -42,11 +53,16 @@
font-weight: 200;
}
}
&-content-success{
&-content-success {
button{
color:rgb(23, 174, 140) !important;
}
}
&-content-warning {
button{
color: orange !important;
}
}
}
.modal-backdrop.active {

View file

@ -1,7 +1,7 @@
#screenshot-warning-modal{
.popup-modal-header{
&-img{
background-image: url('../img/onboarding-no-screenshot.svg');
background-image: url('../img/no-screenshot.svg');
}
}
}
}

View file

@ -101,7 +101,7 @@
max-width: 600px !important;
}
button{
max-width: 400px !important;
max-width: 400px !important;
}
}
}
@ -112,6 +112,6 @@
@import "onboard-tour";
@import "onboard-collect-email";
@import "onboard-backup-request";
@import "onboard-backup-warning";
@import "../backup-warning";
@import "onboard-disclaimer";
@import "onboard-push-notifications";

View file

@ -9,6 +9,20 @@
}
#address {
background: #fff;
.incomplete {
padding: 50px;
.title {
padding: 20px;
font-size: 25px;
color: #444;
}
.subtitle {
padding: 20px;
color: #444;
}
.button {
}
}
.item {
border: none;
font-size: .8rem;
@ -29,6 +43,16 @@
}
&-gen-address {}
}
.qr {
padding: 30px;
}
.backup {
background-color: orange;
color: #fff;
i {
padding: 10px;
}
}
}
#wallets {
position: relative;