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

Merge pull request #1905 from bechi/rate-service

Browse source 
Rate service
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-01 16:59:03 -03:00
commit 48efef0103
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
css/src/main.css
View file

@ -90,10 +90,27 @@ header .alt-currency {
}
.alt-currency {
background: #2C3E50;
padding: 0.05rem 0.2rem;
border-radius: 2px;
font-size: 10px;
color: #fff;
font-weight: 700;
}
.alt-currency.green {
background: #1ABC9C;
}
.alt-currency.red {
background: #A02F23;
}
.alt-currency.black {
background: #213140;
}
.alt-currency.gray {
background: #7A8C9E;
}
.head {

11
views/history.html
View file

@ -40,13 +40,18 @@
</div>
</div>
<div class="large-2 medium-3 small-5 columns text-right">
<div class="large-3 medium-3 small-5 columns text-right">
<div class="tx-amount" ng-class="{
'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<b>{{btx.amount}} {{$root.wallet.settings.unitName}}</b>
<b ng-show="btx.alternativeAmount != null">{{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}</b>
<span class="alt-currency" ng-class="{
'green' : btx.action == 'received',
'red': btx.action == 'sent',
'gray': btx.action == 'moved'}" ng-show="btx.alternativeAmount != null">
{{btx.alternativeAmount| noFractionNumber}} {{$root.wallet.settings.alternativeIsoCode}}
</span>
</div>
</div>
@ -67,7 +72,7 @@
<span class="ellipsis">{{btx.labelTo || btx.addressTo}}</span>
</div>
<div class="large-3 medium-3 small-12 columns text-gray">
<div class="large-2 medium-2 small-12 columns text-gray">
<div class="tx-comment" ng-show="btx.comment">
<i class="fi-comment-quotes"></i> {{btx.comment}}</div>
</div>

4
views/includes/transaction.html
View file

@ -9,8 +9,8 @@
<div class="row" ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-4 columns">
<div class="size-12">
<span>{{out.value}} {{$root.wallet.settings.unitName}}</span>
<span class="label secondary round">
<b>{{out.value}} {{$root.wallet.settings.unitName}}</b>
<span class="alt-currency gray">
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
</div>