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

Merge pull request #9 from JDonadio/andy/feat/balance-modal

Browse source 
show timer icon properly
This commit is contained in:
Andy Phillipson 2016-12-13 16:58:38 -05:00 • committed by GitHub
commit 23e1eb21f9
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,7 @@
} }
&__status-icon { &__status-icon {
font-size: 18px; font-size: 18px;
margin-left: 5px;
position: relative; position: relative;
top: 1px; top: 1px;
color: $light-gray; color: $light-gray;

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

@ -191,10 +191,6 @@
line-height: 36px; line-height: 36px;
} }
strong {
line-height: 100%;
}
&__button-balance { &__button-balance {
background-color: transparent; background-color: transparent;
border: 1px solid rgba(255,255,255,0.25); border: 1px solid rgba(255,255,255,0.25);

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

@ -80,12 +80,11 @@
Incomplete Incomplete
</span> </span>
<span ng-if="wallet.isComplete()"> <span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.totalBalanceStr}} <span ng-if="!wallet.balanceHidden">{{wallet.status.totalBalanceStr}}</span>
<i ng-if="!wallet.balanceHidden && (status.totalBalanceSat != status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span> <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1"> <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
{{wallet.m}}-of-{{wallet.n}} {{wallet.m}}-of-{{wallet.n}}
<i ng-if="!wallet.balanceHidden && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
</span> </span>
<span class="assertive" ng-if="wallet.error">{{wallet.error}}</span> <span class="assertive" ng-if="wallet.error">{{wallet.error}}</span>
</span> </span>