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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-11-15 11:01:30 -05:00
commit 64d81c55ba
47 changed files with 1035 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,15 @@
#bitpayCardPreferences {
.item {
.item-title {
display: block;
}
.item-subtitle {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: $light-gray;
font-size: 14px;
}
}
}

22
src/sass/views/feedback/thanks.scss → src/sass/views/feedback/complete.scss
View file

@ -1,4 +1,4 @@
#thanks-feedback {
#complete {
background-color: #ffffff;
.item-heading {
border-style: none;
@ -19,10 +19,22 @@
}
.subtitle {
padding: 10px 30px 20px 40px;
.image {
text-align: center;
padding: 30px;
}
}
.icon-svg > img {
height: 16rem;
width: 16rem;
margin: 10px;
}
.socialsharing-icon {
display: inline-block;
width: 50px;
height: 50px;
border-radius: 50%;
}
.addressbook-icon-svg {
display: inline-block;
width: 50px;
height: 50px;
}
.share-buttons {
bottom: 0;

9
src/sass/views/feedback/rateAppStore.scss → src/sass/views/feedback/rateApp.scss
View file

@ -1,14 +1,19 @@
#rate-app-store {
#rate-app {
background-color: #ffffff;
.skip {
margin: 10px;
color: #667;
}
.icon-svg > img {
width: 80px;
height: 80px;
margin-top: 15px;
}
.title {
font-size: 20px;
font-weight: bold;
color: $dark-gray;
margin: 40px 10px;
margin: 40px 50px 10px;
text-align: center;
}
.subtitle {

24
src/sass/views/feedback/rateCard.scss
View file

@ -1,20 +1,12 @@
#rate-card {
.stars {
display: flex;
border-bottom: none;
.button {
background-color: #fff;
outline: none;
border: none;
height:10px;
width:10px;
}
.gold {
color: #ffd700;
}
.subtle-gray {
color: $subtle-gray;
}
.row {
border: none;
}
.row.row-margin{
margin: 20px 0px 20px 0px;
}
.item-icon-right {
margin: 0;
}
.feedback-flow-button {
padding: 20px;

15
src/sass/views/feedback/sendFeedBack.scss → src/sass/views/feedback/send.scss
View file

@ -1,5 +1,8 @@
#send-feedback {
background-color: #ffffff;
.row {
border: none;
}
.skip {
margin: 20px 20px 10px;
color: #667;
@ -11,18 +14,6 @@
font-weight: bold;
color: $dark-gray;
}
.star {
a {
font-size: 25px;
padding: 20px;
.gold {
color: #ffd700;
}
.subtle-gray {
color: $subtle-gray;
}
}
}
.comment {
padding: 20px;
font-size: 1rem;

7
src/sass/views/includes/wallets.scss
View file

@ -9,6 +9,7 @@
box-shadow:$subtle-box-shadow;
padding:0;
border-radius: 6px;
margin: 0 auto;
@media (min-width: 500px) {
& {
width: 350px;
@ -32,7 +33,7 @@
visibility: hidden;
}
&.visible{
visibility: visible !important;
visibility: visible !important;
}
}
.big-icon-svg{
@ -64,10 +65,10 @@
transform: scale(.8);
}
&.swiper-slide-prev {
left: 10vw;
left: 5vw;
}
&.swiper-slide-next {
left: -10vw;
left: -5vw;
}
}
}

1
src/sass/views/onboarding/onboarding.scss
View file

@ -49,6 +49,7 @@
%cta-buttons {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
}

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

@ -13,7 +13,7 @@
.scroll{height:100%;}
#address {
background: #fff;
height: calc(100vh - 33vh);
height: calc(100vh - 34vh);
display: flex;
align-items: center;
justify-content: center;
@ -22,14 +22,26 @@
@media(max-height: 600px){
height: calc(100vh - 36vh);
}
&-info{
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
}
article{
flex:1;
width: 100%;
}
#bit-address{
position: absolute;
bottom:0;
width:100%;
width: 100%;
align-self: flex-end;
margin-top: auto;
justify-content: center;
align-content: center;
position: relative;
min-height: 40px;
#next-address{
color:$light-gray;
}
@ -58,6 +70,31 @@
}
.bit-address {
font-size: .8rem;
// left:10%;
position: absolute;
transition: all .4s ease;
width:100%;
height: 100%;
z-index: 0;
position: absolute;
top:50%;
&, &.next{
left:100%;
transform: translate(100%, -40%);
}
&.next, &.prev{
z-index:2;
}
&.current, &.prev{
left:50%;
}
&.current{
transform: translate(-50%, -40%);
z-index: 3;
}
&.prev{
transform: translate(-150%, -40%);
}
.item {
padding-top: 5px;
padding-bottom: 5px;
@ -67,6 +104,32 @@
}
.qr {
padding: calc(100vh - 85vh) 0 calc(100vh - 96vh);
align-self: center;
margin-top: auto;
height: 220px;
position: relative;
justify-content: center;
flex: 1;
div{
transition: all .4s ease;
&.current, &.prev, &.next{
position: absolute;
top:50%;
}
&.current, &.prev{
left:50%;
}
&.current{
transform: translate(-50%, -40%);
}
&.prev{
transform: translate(-150%, -40%);
}
&.next{
left:100%;
transform: translate(100%, -40%);
}
}
@media(max-height: 700px){
padding: calc(100vh - 90vh) 0 calc(100vh - 96vh);
}
@ -74,13 +137,13 @@
display: flex;
justify-content: center;
align-items: center;
position: relative;
min-height: 220px;
}
}
#qr-options{
display: flex;
flex-direction: row;
justify-content: center;
align-content: center;
align-self: flex-end;
.item{
i{left:25px;}
}
@ -90,6 +153,8 @@
color: #fff;
position: absolute;
top: 0;
left:0;
z-index: 2;
i {
padding: 10px;
}
@ -122,7 +187,7 @@
left: 50%;
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
z-index: 2;
z-index: 4;
}
}
#first-time-tip {
@ -165,6 +230,9 @@
border-right: 1px solid rgb(228, 228, 228);
padding-right: 10px;
}
#wallets{
#sidebar-wallet{display: none;}
}
.wallets{
position: relative;
height: calc(100vh - 83vh);
@ -175,6 +243,17 @@
top: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
max-width: 450px;
.swiper-slide{
text-align: center;
.card{
margin-top:2vh;
display: inline-block;
width:80%;
}
&-next{left:-25%;}
&-prev{left:25%;}
}
@media (max-height: 600px){
&{
-webkit-transform: translate(-50%, -58%);
@ -184,23 +263,107 @@
}
}
}
// @media(min-width: 700px) and (min-height: 700px){
// .wallets{display: none;}
// #address{
// height:90vh;
// width:75%;
// .qr{
// height: 70%;
// div{
// transform: scale(1.5);
// }
// }
// #bit-address{
// height: 10%;
// padding: calc(100vh - 99vh);
// }
// }
// }
@media(min-width: 700px) and (min-height: 700px){
.wallets{display: none;}
#address{
float:left;
height:90vh;
width:65%;
&-info{
height: 100%;
}
.qr{
height: 70%;
div{
opacity: 0;
transition: none;
&.current{
opacity: 1;
}
}
}
.bit-address{
opacity: 0;
transition: none;
&.current{
opacity: 1;
}
}
.backup, #bit-address{left:0;}
#bit-address{
height: 10%;
padding: calc(100vh - 99vh);
}
}
#wallets{
float:left;
width:35%;
height: 100%;
display: flex;
flex-direction: column;
overflow: visible;
#sidebar-wallet{display: block;}
.list{height: 100%;overflow: visible;}
#wallet-list{
position: absolute;
width: 100%;
overflow-y: scroll;
height: 100%;
left: -6%;
}
.wallet{
position: relative;
&.current{
&:before {
right: 93%;
top: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-right-color: #f2f2f2;
border-width: 20px;
margin-top: -20px;
}
}
}
.card {
max-width: 350px;
box-shadow:$subtle-box-shadow;
padding:0;
border-radius: 6px;
padding:2px;
width: 80%;
position: relative;
margin: 1.5rem auto 0;
.item{
padding: 6% 10% 6% 8%;
i{left:auto;}
span{
clear:both;
width: 100%;
display: inline-block;
&.wallet-name{
margin-top:10px;
margin-bottom:5px;
font-size:13px;
}
&.wallet-number{
visibility: hidden;
}
&.visible{
visibility: visible !important;
}
}
.big-icon-svg{
& > .bg{padding:.3rem;width: 40px;height:40px;}
}
}
}
}
}
}
@keyframes fadeIn {

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

@ -13,14 +13,15 @@
@import "advancedSettings";
@import "bitpayCard";
@import "bitpayCardIntro";
@import "bitpayCardPreferences";
@import "address-book";
@import "wallet-backup-phrase";
@import "zero-state";
@import "onboarding/onboarding";
@import "feedback/rateCard";
@import "feedback/sendFeedback";
@import "feedback/thanks";
@import "feedback/rateAppStore";
@import "feedback/send";
@import "feedback/complete";
@import "feedback/rateApp";
@import "includes/actionSheet";
@import "export";
@import "import";