better proposal styling and fix confirming status on wallet master view

This commit is contained in:
Marty Alcala 2016-11-07 15:32:28 -05:00
commit 610d42caae
3 changed files with 4 additions and 20 deletions

View file

@ -48,30 +48,19 @@
</span>
</div>
<div class="wallet-details__tx-title" ng-if="tx.confirmations === 0">
<div class="ellipsis" style="color: #B4B4B4;">
Confirming
</div>
</div>
<span class="item-note text-right wallet-details__tx-amount">
<span class="wallet-details__tx-amount" ng-class="{'wallet-details__tx-amount--recent': tx.recent, 'wallet-details__tx-amount--received': tx.action == 'received', 'wallet-details__tx-amount--sent': tx.action == 'sent'}">
<span class="wallet-details__tx-amount wallet-details__tx-amount--sent">
<span ng-if="tx.action == 'sent'"></span>
<span class="size-12" ng-if="tx.action == 'invalid'" translate>
(possible double spend)
</span>
<span ng-if="tx.action != 'invalid'">
{{tx.amountStr}}
{{tx.amountStr}}
</span>
</span>
<div>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && !createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | date:'MMMM d, y'}}</time>
<!-- <span translate class="text-warning"
ng-show="!tx.time && (!tx.confirmations || tx.confirmations == 0)">
Unconfirmed
</span> -->
</div>
</span>
</div>