zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #267 from cmgustavo/bug/#254 

fix layout: unconfirm txs message is too big
This commit is contained in:
Manuel Aráoz 2014-02-12 14:00:13 -02:00
parent 72438e78ef 1f2b2be6b7
commit 6867272056
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/src/css/common.css
View File

@ -302,27 +302,40 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
border: 2px solid #6C0000; border: 2px solid #6C0000;
} }
.label { .txvalues {
display: inline-block;
padding: .7em 2em; padding: .7em 2em;
font-size: 13px; font-size: 13px;
text-transform: uppercase; text-transform: uppercase;
font-weight:100; font-weight:100;
color: #fff;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em;
} }
.label-primary { @media (max-width: 768px) {
.txvalues {
display: block;
margin: 5px;
}
}
.txvalues-primary {
background-color: #8DC429; background-color: #8DC429;
} }
.label-default { .txvalues-default {
background-color: #ffffff; background-color: #ffffff;
color: #333; color: #333;
} }
.label-success { .txvalues-success {
background-color: #2FA4D7; background-color: #2FA4D7;
} }
.label-danger { .txvalues-danger {
background-color: #AC0015; background-color: #AC0015;
} }

12
public/views/transaction/tx.html
View File

@ -135,12 +135,12 @@
</div> </div>
</div> </div>
<div class="line-top row"> <div class="line-top row">
<div class="col-xs-4 col-md-6"> <div class="col-xs-12 col-sm-4 col-md-4">
<span data-ng-show="!tx.isCoinBase && !isNaN(parseFloat(tx.fees))" class="label label-default">Fees: {{$root.currency.getConvertion(tx.fees)}} </span> <span data-ng-show="!tx.isCoinBase && !isNaN(parseFloat(tx.fees))" class="txvalues txvalues-default">Fees: {{$root.currency.getConvertion(tx.fees)}} </span>
</div> </div>
<div class="col-xs-8 col-md-6 text-right"> <div class="col-xs-12 col-sm-8 col-md-8 text-right">
<span data-ng-show="tx.confirmations" class="label label-success">{{tx.confirmations}} Confirmations</span> <span data-ng-show="tx.confirmations" class="txvalues txvalues-success">{{tx.confirmations}} Confirmations</span>
<span data-ng-show="!tx.confirmations" class="label label-danger">Unconfirmed Transaction!</span> <span data-ng-show="!tx.confirmations" class="txvalues txvalues-danger">Unconfirmed Transaction!</span>
<span class="label label-primary">{{$root.currency.getConvertion(tx.valueOut)}}</span> <span class="txvalues txvalues-primary">{{$root.currency.getConvertion(tx.valueOut)}}</span>
</div> </div>
</div> </div>