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

Fix sidebar selector

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-10-23 12:29:38 -03:00 • committed by Matias Alejo Garcia
commit 6af23a995e
2 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

16
css/src/main.css
View file

@ -140,7 +140,8 @@ header .alt-currency {
float: left; float: left;
} }
.col3 { .col3 a {
display: block;
height: 62px; height: 62px;
width: 30px; width: 30px;
float: right; float: right;
@ -148,14 +149,12 @@ header .alt-currency {
padding: 19px 12px; padding: 19px 12px;
} }
.col3:hover { .col3 a.selected, .col3 a.selected:hover {
cursor: pointer; background-color: #213140;
background-color: #16A085;
} }
.col3:active { .col3 a:hover {
cursor: pointer; background-color: #16A085;
background-color: #213140;
} }
.off-canvas-wrap, .inner-wrap{ .off-canvas-wrap, .inner-wrap{
@ -246,7 +245,6 @@ a:hover {
color: #fff; color: #fff;
} }
.button.small.side-bar { .button.small.side-bar {
padding: 0rem 0.4rem; padding: 0rem 0.4rem;
} }
@ -518,7 +516,7 @@ a.button-setup {
.name-wallet { .name-wallet {
font-size: 14px; font-size: 14px;
width: 75%; width: 72%;
float: left; float: left;
color: #fff; color: #fff;
} }

59
views/includes/sidebar.html
View file

@ -1,33 +1,46 @@
<div ng-controller="SidebarController"> <div ng-controller="SidebarController">
<header ng-click="toggleWalletSelection()" ng-show="$root.wallet"> <header ng-show="$root.wallet">
<a ng-click="refresh()"> <div class="col1">
<div class="col1"> <div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
<div class="avatar-wallet">P</div> </div>
<div class="col2">
<div class="oh m5t m10r">
<div class="right size-10">[ {{$root.wallet.totalCopayers}} of {{$root.wallet.requiredCopayers}} ]</div>
<div class="name-wallet">
<a ng-click="refresh()">
<i class="fi-refresh right"></i>
</a>
<div class="ellipsis">{{$root.wallet.getName()}}</div>
</div>
</div> </div>
<div class="col2"> <div class="founds size-12">
<div class="oh m5t m10r"> <!-- {{'Balance'|translate}} -->
<div class="right size-10">[ {{$root.wallet.totalCopayers}} of {{$root.wallet.requiredCopayers}} ]</div> <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<div class="ellipsis name-wallet">{{$root.wallet.getName()}}</div> <div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
<b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<span class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
</div> </div>
<div class="founds size-12"> <div class="m10t" ng-show="lockedBalance">
<!-- {{'Balance'|translate}} --> {{'Locked'|translate}} &nbsp;
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span> <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true"> <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}}
<b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b> </span> &nbsp;
<span class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span> <i class="fi-info medium" tooltip="{{'Balance locked in pending transaction proposals'|translate}}" tooltip-placement="bottom"></i>
</div>
<div class="m10t" ng-show="lockedBalance">
{{'Locked'|translate}} &nbsp;
<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>
</div>
</div> </div>
</div> </div>
</a> </div>
<div class="col3"> <div class="col3">
<a class="side-bar" title="{{'Manual Update'|translate}}" ng-disabled="$root.loading" ng-click="refresh()"> v </a> <a class="side-bar"
ng-class="{'selected':walletSelection}"
title="{{'Manual Update'|translate}}"
ng-click="toggleWalletSelection()">
<span ng-show="!walletSelection">
<i class="fi-arrow-down"></i>
</span>
<span ng-show="walletSelection">
<i class="fi-arrow-up"></i>
</span>
</a>
</div> </div>
</header> </header>