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

# Conflicts:
#	public/views/tab-home.html
This commit is contained in:
Jamal Jackson 2016-09-27 13:43:36 -04:00
commit 28b6e312a7
19 changed files with 191 additions and 137 deletions

View file

@ -594,6 +594,10 @@ ul.wallet-selection.wallets {
margin-right: 40px;
}
.m55r {
margin-right: 55px;
}
.m25r {
margin-right: 25px;
}

View file

@ -3,7 +3,7 @@
bottom: 100px;
}
.head {
padding-bottom: 55px;
padding-bottom: 30px;
.sending-label{
line-height: 70px;
font-size: 25px;

View file

@ -15,9 +15,14 @@
position: absolute;
bottom: 0;
}
@media (min-width: 400px){
.warning{
height:16rem;
}
}
}
@media (max-width: 400px){
@media (max-width: 399px){
#onboarding-backup-request{
.warning{
margin: 2rem auto 1rem;
@ -52,7 +57,7 @@
@media (min-height: 980px){
#onboarding-backup-request{
#arrow-down{
margin-top: 15rem;
margin-top: 7rem;
}
}
}

View file

@ -80,6 +80,19 @@
font-size:.8rem;
}
}
@media (min-width: 400px){
&{
max-width: 400px;
label{
.checkbox{
left:1rem;
}
.item-content{
font-size: 1rem;
}
}
}
}
}
}
}

View file

@ -16,4 +16,11 @@
position: absolute;
top: 10px;
}
.show-more {
text-align: center;
padding: 20px;
font-size: 16px;
color: #387ef5;
font-weight: bold;
}
}