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

Browse source
This commit is contained in:
Jamal Jackson 2016-10-17 09:11:15 -04:00
commit aad986c266
117 changed files with 7705 additions and 5274 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sass/shame.scss
View file

@ -408,6 +408,14 @@ input[type=file] {
line-height: 0px;
}
.w100p {
width: 100%;
}
.pointer {
cursor: pointer;
}
.text-right {
text-align: right;
}

2
src/sass/variables.scss
View file

@ -25,7 +25,7 @@ $font-size-small: 12px;
$font-family-sans-serif: $roboto;
$font-family-light-sans-serif: $roboto-light;
$button-border-radius: $visible-radius;
$button-border-radius: $subtle-radius;
$button-height: 52px;
$button-padding: 16px;

8
src/sass/views/amount.scss
View file

@ -11,6 +11,14 @@
left: 8px;
font-size: 24px;
}
.big-icon-svg {
left:5px;
& > .bg{
width:30px;
height:30px;
box-shadow: none;
}
}
font-size: 11px;
padding-left: 48px;
}

15
src/sass/views/bitpayCard.scss
View file

@ -1,14 +1,27 @@
#bitpayCard {
.bar-header {
border: 0;
background: #1e3186;
.title, .button {
color: #fff;
}
.button {
background-color: transparent;
}
}
.amount {
width: 100%;
text-align: center;
padding: 2rem 1rem 1.5rem 1rem;
min-height: 140px;
height: 140px;
border-color: #172565;
background-color: #1e3186;
background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
color: #fff;
}
.wallet-details-wallet-info {
bottom: 5px;
}
strong {
line-height: 100%;
}

70
src/sass/views/bitpayCardIntro.scss Normal file
View file

@ -0,0 +1,70 @@
#bitpayCard-intro {
.slider-pager .slider-pager-page {
color: #fff;
}
.cta-button{
text-align: center;
position: absolute;
bottom: 55px;
padding: 0 1.5rem;
width: 100%;
}
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;
height: 100%;
.bar.bar-header {
background: rgb(30, 49, 134);
color: #fff;
button {
color: #fff;
}
.secondary-buttons {
button {
color: rgba(255, 255, 255, .5);
}
}
}
.bar.bar-stable{
border-color: transparent;
border:none;
}
.button-transparent{
background: none !important;
}
.button-translucent{
background: rgba(215, 215, 215, 0.1)
}
.button-primary{
background: rgb(100, 124, 232) !important;
color:#fff;
}
.light-blue{
color:rgb(100, 124, 232);
}
.text-white{
color: #ffffff;
}
ion-content {
background: url(../img/onboarding-welcome-bg.png);
background-position: top center;
background-size: contain;
background-repeat: repeat-x;
height: 100%;
.scroll{
height: 100%;
}
color: #fff;
p {
text-align: center;
margin: 40px 20px;
font-size: 1.2rem;
color: rgba(255, 255, 255, .5);
}
}
}

15
src/sass/views/export.scss Normal file
View file

@ -0,0 +1,15 @@
#export {
.list {
background-color: #fff;
}
.top-tabs.row {
padding: 0;
}
.top-tabs .col {
font-size: 14px;
cursor: pointer;
padding: 10px 5px;
border-bottom-width: 2px;
border-bottom-color: #172565;
}
}

12
src/sass/views/import.scss vendored Normal file
View file

@ -0,0 +1,12 @@
#import {
.top-tabs.row {
padding: 0;
}
.top-tabs .col {
font-size: 14px;
cursor: pointer;
padding: 10px 5px;
border-bottom-width: 2px;
border-bottom-color: #172565;
}
}

8
src/sass/views/includes/txp-details.scss
View file

@ -107,12 +107,8 @@
i {
color: grey;
position: inherit;
left: 25px;
vertical-align: super;
padding-right: 10px;
border-right: 1px solid;
border-color: grey;
font-size: 20px;
padding: 0 10px;
float: right;
}
contact {
margin-left: 15px;

14
src/sass/views/integrations/glidera.scss Normal file
View file

@ -0,0 +1,14 @@
#glidera {
.glidera-lead {
margin: 1rem;
color: $mid-gray;
font-size: 18px;
text-align: center;
}
.disclosure {
color: $mid-gray;
font-size: 12px;
text-align: left;
margin: 1rem;
}
}

2
src/sass/views/tab-receive.scss
View file

@ -36,7 +36,7 @@
}
.incomplete {
padding: 50px;
height: 350px;
height: 352px;
.title {
padding: 20px;
font-size: 25px;

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

@ -17,6 +17,10 @@
color: $mid-gray;
margin: 1rem 0;
}
&-description-disabled {
color: cadetblue;
text-decoration: none;
}
.setting-title, .setting-value {
display: block;
overflow: hidden;

6
src/sass/views/views.scss
View file

@ -12,11 +12,14 @@
@import "walletDetails";
@import "advancedSettings";
@import "bitpayCard";
@import "bitpayCardIntro";
@import "address-book";
@import "wallet-backup-phrase";
@import "zero-state";
@import "onboarding/onboarding";
@import "includes/actionSheet";
@import "export";
@import "import";
@import "includes/walletActivity";
@import "includes/wallets";
@import "includes/modals/modals";
@ -27,4 +30,5 @@
@import "includes/txp-details";
@import "includes/tx-status";
@import "includes/walletSelector";
@import "integrations/coinbase.scss";
@import "integrations/coinbase";
@import "integrations/glidera";