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-10-27 11:44:03 -04:00
commit d4513ba46b
53 changed files with 263 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sass/views/includes/modals/modals.scss
View file

@ -69,5 +69,9 @@
}
}
.modal-backdrop.active {
background: rgba(0, 0, 0, .8);
}
@import "backup-needed-modal";
@import "screenshot-warning-model";

5
src/sass/views/integrations/glidera.scss
View file

@ -19,4 +19,9 @@
text-align: left;
margin: 1rem;
}
.item-img-buy,
.item-img-sell {
vertical-align: middle;
margin-right: 10px;
}
}

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

@ -103,4 +103,19 @@
}
}
}
.release {
cursor: pointer;
cursor: hand;
background-color: #E9E9EC;
padding-top: 30px;
padding-bottom: 20px;
text-align: center;
color: #444;
i {
margin-top: 1px;
font-size: 20px;
margin-left: 10px;
position: absolute;
}
}
}

1
src/sass/views/tab-send.scss
View file

@ -71,4 +71,5 @@
}
}
}
.scroll{height: 100%;}
}

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

@ -3,7 +3,7 @@
color: $dark-gray;
border-color: rgba(221, 221, 221, 0.3);
}
&-explaination, &-button-group {
&-explanation, &-button-group {
padding: 0 1rem;
margin: 1rem 0;
}

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

@ -61,6 +61,12 @@
.tx-search:before {
font-size: 22px !important;
}
.description {
background-color: #f2f2f2;
text-align: center;
font-size: 13px;
color: $mid-gray;
}
}
.wallet-details-wallet-info {