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

Merge pull request #5902 from JDonadio/bug/proposal-label

Browse source 
Fix label and icon size
This commit is contained in:
Gabriel Edgardo Bazán 2017-04-20 17:43:27 +02:00 • committed by GitHub
commit 4d7dcf6411
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sass/views/walletDetails.scss
View file

@ -13,6 +13,7 @@
}
}
&__tx-time {
white-space: nowrap;
color: $v-light-gray;
font-size: 12.5px;
}

24
www/views/includes/txp.html
View file

@ -1,33 +1,29 @@
<div class="wallet-details__item__marker"></div>
<img class="wallet-details__tx-icon" src="img/icon-proposal-pending.svg" width="40">
<div style="padding-right: 25px">
<img src="img/icon-proposal-pending.svg" width="40">
</div>
<div class="wallet-details__tx-content" ng-class="{'no-border': $last}">
<div class="wallet-details__tx-title">
<span ng-show="!tx.merchant">
<span ng-show="addressbook[tx.toAddress] && !tx.message">
{{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}}
</span>
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
{{tx.message}}
</span>
<span ng-show="!addressbook[tx.toAddress] && !tx.message" translate>
Sending
</span>
<span ng-if="tx.message" class="ellipsis">{{tx.message}}</span>
<span ng-if="!tx.message && addressbook[tx.toAddress]" class="ellipsis">{{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}}</span>
<span ng-if="!tx.message && !addressbook[tx.toAddress]" class="ellipsis" translate>Sending</span>
</span>
<span ng-show="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
<span ng-show="tx.merchant.pr.ca" class="ellipsis"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca" class="ellipsis"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
</div>
<span class="item-note text-right wallet-details__tx-amount">
<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>
<span class="size-12" ng-if="tx.action == 'invalid'" translate>
(possible double spend)
</span>
<span ng-if="tx.action != 'invalid'">
<span ng-if="tx.action != 'invalid'">
– {{tx.amountStr}}
</span>
</span>

6
www/views/modals/txp-details.html
View file

@ -78,7 +78,7 @@
</i>
<div>{{wallet.name}}</div>
</div>
</div>
</div>
<div class="item single-line" ng-if="isShared">
<span class="label" translate>Created by</span>
<span class="item-note">
@ -90,10 +90,10 @@
<span class="item-note">
<time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
</div>
<div class="item single-line" ng-show="tx.message">
<span class="label" translate>Memo</span>
<span class="item-note">
<span class="m15l item-note">
{{tx.message}}
</span>
</div>