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/home_views_polish

Browse source
This commit is contained in:
Jamal Jackson 2016-09-30 11:22:03 -04:00
commit 9980e2e11f
44 changed files with 314 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

140
src/sass/fonts.scss Normal file
View file

@ -0,0 +1,140 @@
@font-face {
font-family: 'Roboto-Black';
src: url('../roboto-font/roboto-black-webfont.woff2') format('woff2'),
url('roboto-black-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Black-Italic';
src: url('../roboto-font/roboto-blackitalic-webfont.woff2') format('woff2'),
url('roboto-blackitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Bold';
src: url('../roboto-font/roboto-bold-webfont.woff2') format('woff2'),
url('roboto-bold-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Bold-Italic';
src: url('../roboto-font/roboto-bolditalic-webfont.woff2') format('woff2'),
url('roboto-bolditalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Italic';
src: url('../roboto-font/roboto-italic-webfont.woff2') format('woff2'),
url('roboto-italic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Light';
src: url('../roboto-font/roboto-light-webfont.woff2') format('woff2'),
url('roboto-light-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Light-Italic';
src: url('../roboto-font/roboto-lightitalic-webfont.woff2') format('woff2'),
url('roboto-lightitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Medium';
src: url('../roboto-font/roboto-medium-webfont.woff2') format('woff2'),
url('roboto-medium-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Medium-Italic';
src: url('../roboto-font/roboto-mediumitalic-webfont.woff2') format('woff2'),
url('roboto-mediumitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('../roboto-font/roboto-regular-webfont.woff2') format('woff2'),
url('roboto-regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Thin';
src: url('../roboto-font/roboto-thin-webfont.woff2') format('woff2'),
url('roboto-thin-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Thin-Italic';
src: url('../roboto-font/roboto-thinitalic-webfont.woff2') format('woff2'),
url('roboto-thinitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}

1
src/sass/main.scss
View file

@ -983,6 +983,7 @@ input[type=number] {
}
}
@import "fonts";
@import "ionic";
@import "common";
@import "forms";

14
src/sass/views/onboarding/onboard-disclaimer.scss
View file

@ -3,6 +3,9 @@
height: 100%;
ion-content{
height: 100%;
&.has-header{
top:40px !important;
}
.scroll{
height: 100%;
}
@ -10,9 +13,17 @@
margin-top:1.5rem;
}
}
.tag{
padding-bottom: 0;
}
.list{
max-width: 600px;
@include center-block();
.item{
&:first-child{
padding-top: 0;
}
}
}
.item {
background: transparent;
@ -59,6 +70,9 @@
position: absolute;
bottom: 0;
width: 100%;
&.header-present{
bottom:16px;
}
&-content{
max-width: 600px;
@include center-block();

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

@ -17,7 +17,7 @@
text-align: center;
padding: 2rem 1rem 1.5rem 1rem;
color: #fff;
min-height: 115px;
height: 140px;
margin-bottom: 10px;
&-alternative {