Merge pull request #7864 from cmgustavo/v4-43

[v4] WalletDetails: Align note to end
This commit is contained in:
Gabriel Edgardo Bazán 2018-01-16 16:38:35 -03:00 committed by GitHub
commit f114ac7a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View File

@ -147,7 +147,9 @@
<div class="action" *ngIf="tx.confirmations == 0 && tx.action == 'received'">{{'Receiving' | translate}}</div>
<div class="action" *ngIf="tx.confirmations > 0">{{tx.action}}</div>
<ion-note item-end>
<div class="amount" [ngClass]="{'received': tx.action == 'received'}">{{tx.amount | satToUnit: wallet.coin}}</div>
<div class="amount">
<span [ngClass]="{'received': tx.action == 'received'}">{{tx.amount | satToUnit: wallet.coin}}</span>
</div>
<div class="date">
<span *ngIf="tx.time && createdWithinPastDay(tx.time * 1000)">{{tx.time * 1000 | amTimeAgo}}</span>
<span *ngIf="tx.time && !createdWithinPastDay(tx.time * 1000)">{{tx.time * 1000 | amDateFormat:'MMM D, YYYY'}}</span>

View File

@ -1,7 +1,4 @@
page-wallet-details {
.received {
color: color($colors, primary) !important;
}
.balance-card {
background: color($colors, primary);
}
@ -46,8 +43,14 @@ page-wallet-details {
}
.action {
}
ion-note {
text-align: end;
}
.amount {
color: color($colors, dark);
.received {
color: color($colors, primary);
}
}
.date {
font-size: 12.5px;