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

Fix Conflicts:

Browse source 
views/addresses.html
	views/send.html
	views/transactions.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-05 17:06:25 -03:00
commit 6a855b7ac1
18 changed files with 393 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

3
views/includes/sidebar.html
View file

@ -28,7 +28,7 @@
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{totalBalance || 0 |noFractionNumber}} {{$root.unitName}}
</span>
<br>
<div class="m10t" ng-show="lockedBalance">
Locked &nbsp;
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
@ -41,6 +41,7 @@
tooltip-trigger="mouseenter"
tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
</span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
</div>
</div>
<div class="line-sidebar"></div>
</header>