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

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

Browse source
This commit is contained in:
Nick Cardin 2016-09-01 11:40:43 -04:00
commit 3a771e0e21
116 changed files with 1732 additions and 1371 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/sass/main.scss
View file

@ -4,9 +4,7 @@
*
*/
body {
font-family: Roboto;
font-style : normal;
font-weight: 400;
font-family: 'roboto-regular';
}
h3.title {
@ -887,6 +885,14 @@ input[type=file] {
text-align: left;
}
.right {
float: right;
}
.left {
float: left;
}
.input-label {
max-width: none;
width: inherit;
@ -999,6 +1005,8 @@ input[type=number] {
@import "ionic";
@import "common";
@import 'mixins/mixins';
@import "views/add";
@import "views/tab-home";
@import 'views/onboarding/onboarding';
@import "views/includes/walletActivity";

4
src/sass/mixins/layout.scss Normal file
View file

@ -0,0 +1,4 @@
@mixin center-block($topBottom: 0) {
float:none;
margin: $topBottom auto;
}

1
src/sass/mixins/mixins.scss Normal file
View file

@ -0,0 +1 @@
@import "layout";

22
src/sass/views/onboarding/onboard-tour.scss Normal file
View file

@ -0,0 +1,22 @@
#onboard-tour {
&-secure {
#cta {
background-image: url(../img/onboarding-tour-phone.svg);
}
}
&-currency {
#cta {
background-image: url(../img/onboarding-tour-currency-bg.svg);
}
.next-slide {
margin-top: 3rem;
}
}
&-control {
#cta {
background-image: url(../img/onboarding-tour-control.svg);
background-size: 70%;
background-position: top;
}
}
}

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

@ -0,0 +1,33 @@
#onboard-welcome {
ion-content {
background: url(../img/onboarding-welcome-bg.png);
background-position: top center;
background-size: contain;
background-repeat-y: no-repeat;
#shopping-24 {
position: absolute;
top: 2%;
right: 5%;
width: 35px;
height: auto;
}
.logo,
p {
@include center-block();
}
.logo {
margin-top: 15rem;
}
button {
@include center-block(1rem);
color: #fff;
&.get-started {
background: rgb(100, 124, 232);
margin-top: 4rem;
}
&.restore {
background: none;
}
}
}
}

67
src/sass/views/onboarding/onboarding.scss Normal file
View file

@ -0,0 +1,67 @@
.onboarding {
background: rgba(30, 49, 134, 1);
background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(100%, rgba(17, 27, 73, 1)));
background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
color: #fff;
.bar.bar-header {
background: rgb(30, 49, 134);
color: #fff;
button {
color: #fff;
}
.secondary-buttons {
button {
color: rgba(255, 255, 255, .5);
}
}
}
ion-content {
color: #fff;
.scroll {}
h2 {
color: #fff;
font-size: 1.8rem;
}
p {
&.tagline {
color: rgba(255, 255, 255, .5);
}
}
.col {
@include center-block(.5rem);
}
#cta {
background-size: contain;
width: 100%;
clear: both;
height: 20rem;
margin-bottom: -3rem;
background-position: center;
background-repeat: no-repeat;
img {
height: 16rem;
}
}
button {
&.next-slide {
background: rgba(215, 215, 215, 0.10);
}
}
}
.swiper-pagination {
&-bullet {
background: rgb(100, 124, 232);
&-active {
background: rgb(100, 124, 232);
}
}
}
}
@import "terms-of-use";
@import "onboard-welcome";
@import "onboard-tour";

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

@ -0,0 +1,17 @@
#terms-of-use{
ion-header-bar{
background: #fff;
box-shadow: 0px 3px 3px 0px rgba(50, 50, 50, 0.2);
}
ion-content{
margin-top:1.5rem;
color: rgba(86, 86, 86, 0.77);
p{
padding:0 2.5%;
margin:2rem auto;
&:first-child{
margin-top:0;
}
}
}
}

4
src/sass/views/tab-home.scss
View file

@ -19,4 +19,8 @@
background-repeat: no-repeat;
background-position: -5px -6px;
}
a.item {
color: #444;
}
}