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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-11-10 18:18:25 -05:00
commit 26fcb27a58
8 changed files with 136 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/views/modals/search.html
View file

@ -18,7 +18,7 @@
</div>
<div class="list">
<div class="item" ng-repeat="btx in txHistorySearchResults track by btx.txid" ng-click="openTxModal(btx)">
<div class="item" ng-repeat="btx in txHistorySearchResults track by btx.txid" ng-click="openTx(btx)">
<span class="item-note text-right">
<span class="size-16" ng-class="{'text-bold': btx.recent}">

2
www/views/modals/tx-details.html → www/views/tx-details.html
View file

@ -53,7 +53,7 @@
{{btx.creatorName}} <time>{{ (btx.ts || btx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
<a class="item item-icon-right" ng-class="{'single-line': !btx.note.body && !btx.message}" ng-hide="insuffientFunds" ng-click="showCommentPopup()">
<a class="item item-icon-right" ng-class="{'single-line': !btx.note.body && !btx.message}" ng-click="showCommentPopup()">
<span class="label" translate>Memo</span>
<div class="item-note" style="display: block; float: none; margin-bottom: .25rem;">
{{btx.note.body || btx.message}}