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

This commit is contained in:
Jamal Jackson 2016-09-08 15:42:47 -04:00
commit 4af098764d
23 changed files with 690 additions and 421 deletions

View file

@ -21,6 +21,10 @@
padding-left: 74px;
}
.item-no-bottom-border + .item {
border-top: 0;
}
.icon.big-icon-svg {
padding: 0 7px;
> img {
@ -30,7 +34,7 @@
box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
}
}
.overlay{
.overlay {
position: absolute;
top:0;
left:0;
@ -72,3 +76,7 @@ ion-header-bar{
border:none;
}
}
.border-top{
border-top:1px solid rgb(228,228,228);
}

View file

@ -772,6 +772,10 @@ ul.wallet-selection.wallets {
margin: 30px 0;
}
.m15v {
margin: 15px 0;
}
.m10h {
margin: 0 10px;
}
@ -897,44 +901,6 @@ input[type=file] {
font-size: 16px;
}
/*
* Calculator
*/
.calculator .header-calc {
position: absolute;
width: 100%;
text-align: center;
}
.calculator .button-calc {
position: absolute;
width: 100%;
bottom: 0;
}
.calculator .button-calc .row {
padding: 0 !important;
}
.calculator .button-calc .columns {
cursor: pointer;
text-align: center;
}
.calculator .button-calc .operator {
color: #2C3E50;
background-color: #eee;
}
.calculator .button-calc .columns:active {
background-color: #eee;
}
.calculator .button-calc .operator:active {
background-color: #f8f8f8;
}
// No looks likes locked
input[type="number"] {
&[readonly] {
@ -994,8 +960,12 @@ input[type=number] {
@import "forms";
@import 'mixins/mixins';
@import "views/add";
@import "views/amount";
@import "views/tab-home";
@import "views/tab-receive";
@import "views/tab-send";
@import "views/walletDetails";
@import "views/bitpayCard";
@import 'views/onboarding/onboarding';
@import "views/includes/walletActivity";
@import "views/includes/wallets";

View file

@ -0,0 +1,88 @@
#view-amount {
@media(max-width: 480px) {
.bitcoin-address {
.icon {
left: 8px;
font-size: 24px;
}
font-size: 11px;
padding-left: 48px;
}
}
.amount-pane {
position: absolute;
top: 125px;
bottom: 0;
width: 100%;
background-color: #fff;
padding: 0 16px;
.amount-bar {
padding: 24px 0;
font-size: 18px;
.title {
float: left;
padding-top: 10px;
}
}
.amount {
display: flex;
flex-direction: column;
justify-content: center;
flex-grow: 1;
position: absolute;
bottom: 254px;
top: 66px;
}
}
.keypad {
text-align: center;
font-size: 24px;
font-weight: lighter;
position: absolute;
bottom: 0;
width: 100%;
.row {
padding: 0 !important;
margin: 0 !important;
}
.col {
line-height: 40px;
}
.operator {
background-color: #eaeaea;
font-weight: normal;
cursor: pointer;
&:active {
background-color: #f8f8f8;
}
}
.operator-send {
font-weight: bolder;
background-color: #f7f7f7;
font-size: 36px;
cursor: pointer;
&:active {
background-color: #eaeaea;
}
}
.digit{
cursor: pointer;
border-top: 1px solid #eaeaea;
border-left: 1px solid #eaeaea;
&:active {
background-color: #eaeaea;
}
}
}
}

View file

@ -0,0 +1,33 @@
.wallets{
.slides{
.swiper-container{
width:75% !important;
overflow:visible;
}
.card{
padding: .7rem;
padding-left:.25rem;
padding-right:.25rem;
border-radius: .25rem;
}
.swiper-slide{
width:100% !important;
&.swiper-slide-prev, &.swiper-slide-next{
opacity: .2;
}
&.swiper-slide-prev{
left:-5%;
}
&.swiper-slide-next{
left:4%;
}
span{
float:right;
clear:both;
}
}
}
.swiper-pagination{
visibility: hidden;
}
}

View file

@ -0,0 +1,91 @@
#tab-receive {
ion-header-bar{
button{
i{
color:#fff;
font-size: 1.1rem;
}
}
}
#address {
background: #fff;
.item {
border: none;
font-size: .8rem;
i {
font-size: 1.3rem;
&.ion-social-bitcoin-outline {
border-right: 1px solid rgb(228, 228, 228);
}
}
}
.bit-address {
font-size: .8rem;
.item {
padding-top: 5px;
padding-bottom: 5px;
}
&-gen-address {}
}
}
#wallets {
position: relative;
&:before {
content: "";
display: inline-block;
width: 0;
height: 0;
border-style: solid;
border-width: 0 20px 20px 20px;
border-color: transparent transparent #f5f5f5 transparent;
top: -9px;
position: absolute;
left: 45%;
}
}
#first-time-tip {
background: rgba(30, 49, 134, 1);
background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(30, 49, 134, 0) 88%, rgba(30, 49, 134, 0) 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(88%, rgba(30, 49, 134, 0)), color-stop(100%, rgba(30, 49, 134, 0)));
background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(30, 49, 134, 0) 88%, rgba(30, 49, 134, 0) 100%);
background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(30, 49, 134, 0) 88%, rgba(30, 49, 134, 0) 100%);
background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(30, 49, 134, 0) 88%, rgba(30, 49, 134, 0) 100%);
background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(30, 49, 134, 0) 88%, rgba(30, 49, 134, 0) 100%);
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
opacity: 0;
animation-name: fadeIn;
animation-iteration-count: 1;
animation-timing-function: ease-in;
animation-duration: .4s;
animation-delay: 2s;
animation-fill-mode: forwards;
z-index: 10;
text-align: center;
color: #fff;
padding-top: 3rem;
.close {
top: .5rem;
right: 1rem;
position: absolute;
font-size: 1.5rem;
opacity: .5;
}
h3 {
color: #fff;
margin-bottom:1rem;
}
}
}
@keyframes fadeIn {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}

View file

@ -0,0 +1,14 @@
#tab-send {
.bitcoin-address {
@media(max-width: 480px) {
input {
font-size: 12px;
}
}
.icon {
line-height: 31px;
padding-top: 2px;
padding-bottom: 1px;
}
}
}