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

Merge pull request #181 from Bitcoin-com/wallet/task/384

Browse source 
Improvement 384 - New Wallet headers design
This commit is contained in:
Sebastiaan Pasma 2018-06-19 16:32:11 +02:00 • committed by GitHub
commit ced143b86f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sass/views/includes/walletSelector.scss
View file

@ -12,6 +12,14 @@ wallet-selector {
font-weight: bold; font-weight: bold;
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
&.compact-subtitle {
padding-bottom: 0;
}
.subtitle {
color: $v-mid-gray;
font-size: $font-size-small;
font-weight: 300;
}
.wallet-coin-logo { .wallet-coin-logo {
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;

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

@ -37,6 +37,9 @@
padding-top: 1.5rem; padding-top: 1.5rem;
padding-bottom: 1.5rem; padding-bottom: 1.5rem;
} }
&.compact-subtitle {
padding-bottom: 0;
}
} }
.item-sub { .item-sub {
&:first-child:before { &:first-child:before {

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

@ -43,6 +43,11 @@
.icon { .icon {
color: $v-mid-gray; color: $v-mid-gray;
} }
.subtitle {
color: $v-mid-gray;
font-size: $font-size-small;
font-weight: 300;
}
} }
} }
} }

12
www/views/includes/walletSelector.html
View file

@ -7,9 +7,9 @@
<div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div> <div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
<div class="subheader" ng-if="walletsBch[0] && walletsBtc[0]"> <div class="subheader compact-subtitle" ng-if="walletsBch[0] && walletsBtc[0]">
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22"> <div translate>Bitcoin Cash (BCH)</div>
<span translate>Bitcoin Cash (BCH)</span> <div translate class="subtitle">Instant transactions with low fees</div>
</div> </div>
<a <a
ng-repeat="wallet in walletsBch track by $index" ng-repeat="wallet in walletsBch track by $index"
@ -39,9 +39,9 @@
</div> </div>
</a> </a>
<div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate> <div class="subheader compact-subtitle" ng-if="walletsBtc[0] && walletsBch[0]" translate>
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18"> <div translate>Bitcoin Core (BTC)</div>
<span translate>Bitcoin Core (BTC)</span> <div translate class="subtitle">Slow transactions with high fees</div>
</div> </div>
<a <a
ng-repeat="wallet in walletsBtc track by $index" ng-repeat="wallet in walletsBtc track by $index"

12
www/views/tab-home.html
View file

@ -56,9 +56,9 @@
</div> </div>
<div class="list card"> <div class="list card">
<div class="item item-icon-right item-heading"> <div class="item item-icon-right item-heading compact-subtitle">
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22"> <div translate>Bitcoin Cash (BCH)</div>
<span translate>Bitcoin Cash (BCH)</span> <div translate class="subtitle">Instant transactions with low fees</div>
<a ui-sref="tabs.add({coin:'bch'})"><i class="icon ion-ios-plus-empty list-add-button"></i></a> <a ui-sref="tabs.add({coin:'bch'})"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div> </div>
<div> <div>
@ -71,9 +71,9 @@
</div> </div>
<div class="list card"> <div class="list card">
<div class="item item-icon-right item-heading"> <div class="item item-icon-right item-heading compact-subtitle">
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18"> <div translate>Bitcoin Core (BTC)</div>
<span translate>Bitcoin Core (BTC)</span> <div translate class="subtitle">Slow transactions with high fees</div>
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a> <a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div> </div>
<div> <div>