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

Merge pull request #1426 from bechi/bugs/ui-02

Browse source 
fix problem in complete tx proposal
This commit is contained in:
Ivan Socolsky 2014-09-18 16:22:08 -03:00
commit cf4f663fb0
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
css/src/main.css
View file

@ -280,7 +280,6 @@ a:hover {
.last-transactions-header {
padding: 1rem 0;
height: 50px;
}
.last-transactions-footer {

10
views/includes/transaction.html
View file

@ -1,4 +1,4 @@
<div class="last-transactions-header">
<div class="last-transactions-header oh">
<div class="hide-for-small-only large-1 medium-1 columns">
<a class="text-black" ng-show="tx.comment">
<i class="fi-comment-quotes size-24" Popover-animation="true" popover="{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}" popover-title="{{tx.comment}}" popover-placement="right" popover-trigger="mouseenter"></i>
@ -9,12 +9,12 @@
</div>
<div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment">
<p class="size-14 label">
{{tx.comment}} - {{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}
{{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong>
</p>
</div>
<div class="large-8 medium-8 small-8 columns">
<div class="large-8 medium-8 small-9 columns">
<div ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-3 columns">
<div class="large-3 medium-3 small-4 columns">
<p class="size-14 hide-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
<p class="size-12 show-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
</div>
@ -24,7 +24,7 @@
</div>
</div>
</div>
<div class="large-3 medium-3 small-4 columns text-right">
<div class="large-3 medium-3 small-3 columns text-right">
<p class="size-12">{{tx.createdTs | amCalendar}}</p>
</div>
</div>

2
views/transactions.html
View file

@ -29,7 +29,7 @@
<div translate ng-if="!blockchain_txs[0].txid && !loading">
<em><strong>No transactions yet.</strong></em> </div>
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
<div class="last-transactions-header size-14">
<div class="last-transactions-header oh size-14">
<div class="large-8 medium-7 small-4 columns ellipsis">
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
{{btx.txid}}