sidebar balance locked

This commit is contained in:
bechi 2014-10-30 14:26:11 -03:00
parent 4f1205a4f5
commit 9d798a2547
2 changed files with 28 additions and 8 deletions

View File

@ -175,7 +175,7 @@ header .alt-currency {
right: 14px;
width: 100px;
list-style-type: none;
top: 47px;
top: 47px;nt
}
.head .menu ul.hover {
@ -612,6 +612,19 @@ a.button-setup {
color: #B6E9DF;
}
.founds .locked {
font-size: 11px;
z-index: -99999;
background-color: #213140;
position: absolute;
top: 52px;
width: 250px;
left: 0;
padding: 0.3rem 0.7rem;
color: white;
border-bottom: 1px solid #374756;
}
.hidden {
visibility: hidden;
}
@ -1118,7 +1131,7 @@ a:hover .photo-container {
color: #fff;
}
.side-nav {padding-top: 38px;}
.side-nav {padding-top: 50px;}
.side-nav li {
font-size: 16px;
@ -1127,6 +1140,10 @@ a:hover .photo-container {
margin-bottom: 10px;
}
.side-nav li>a:first-child:not(.button) {
padding-left: 40px;
}
.side-nav li.active>a:first-child:not(.button) {
color: #2C3E50;
background-color: #F8F8FB;
@ -1134,7 +1151,6 @@ a:hover .photo-container {
.side-nav li>a:first-child:not(.button), .side-nav li a:not(.button) {
color: #fff;
padding-left: 40px;
}
.side-nav li>a:first-child:not(.button) i {

View File

@ -20,12 +20,16 @@
<b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<span class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
</div>
<div class="m10t" ng-show="lockedBalance">
{{'Locked'|translate}} &nbsp;
<div class="m10t locked" ng-show="lockedBalance">
<span class="text-gray">
<i class="fi-lock"></i> {{'Locked'|translate}} &nbsp;
</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<span ng-if="$root.wallet && !$root.updatingBalance" class="has-tip" data-options="disable_for_touch:true" tooltip-popup-delay='500' tooltip="{{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}" tooltip-trigger="mouseenter" tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
</span> &nbsp;
<i class="fi-info medium" tooltip="{{'Balance locked in pending transaction proposals'|translate}}" tooltip-placement="bottom"></i>
<span ng-if="$root.wallet && !$root.updatingBalance" class="text-gray"><b>{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} </b> - {{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}
</span>
<i class="fi-info medium right text-gray size-14" tooltip="{{'Balance locked in pending transaction proposals'|translate}}" tooltip-placement="bottom"></i>
</div>
</div>
</div>