Merge pull request #407 from bechi/feature/04-layout-details

fix new layout
This commit is contained in:
Mario Colque 2014-02-25 20:04:35 -02:00
commit baa0170e53
7 changed files with 73 additions and 55 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -94,6 +94,7 @@ margin-left: 0;
.navbar-default {
background-color: #8DC429;
margin: 0;
border: 0;
}
.navbar-default .navbar-nav>li>a {
@ -654,7 +655,7 @@ margin-left: 0;
}
.transaction-vin-vout {
line-height: 1.8em;
}
.v_highlight {
@ -674,19 +675,37 @@ a.v_highlight_more {
position: fixed;
top: 64px;
left: 0;
border: 1px solid #eee;
padding: 10px;
text-align: center;
z-index: 1000;
margin: 0 auto;
-moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.20);
-webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.20);
box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.20);
}
.secondary_navbar .container {
margin: 0 auto;
padding: 1.8em 0;
}
.secondary_navbar h3, .secondary_navbar p, .secondary_navbar .lead {
margin: 0;
}
.secondary_navbar p {
line-height: 1.9em;
}
.hide_snavbar {
border-bottom-right-radius: 0.3em;
border-bottom-left-radius: 0.3em;
position: absolute;
right: 10px;
border: 1px solid #eee;
right: 25px;
padding: 5px 10px;
margin-top: 10px;
background: #fff;
-moz-box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.20);
-webkit-box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.20);
box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.20);
}

View File

@ -1,12 +1,10 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="AddressController" data-ng-init="findOne()">
<div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="address.addrStr" data-ng-init="hideSNavbar=0">
<div class="row" data-ng-if="!hideSNavbar">
<div class="col-md-8 text-center">
<span class="ellipsis txvalues txvalues-normal">
<strong>Address</strong> {{address.addrStr}}
<div class="secondary_navbar hidden-xs hidden-sm" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="address.addrStr" data-ng-init="hideSNavbar=0">
<div class="container" data-ng-if="!hideSNavbar">
<div class="col-md-8 text-left">
<h3>Address</h3> {{address.addrStr}}
<span class="btn-copy" clip-copy="address.addrStr"></span>
</span>
</div>
<div class="col-md-4">
<span class="txvalues txvalues-primary"><strong>Final Balance</strong> {{$root.currency.getConvertion(address.balance) || address.balance + ' BTC' }}</span>
@ -14,8 +12,8 @@
</div>
<div class="hide_snavbar">
<a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<span data-ng-show="hideSNavbar">Show</span>
<span data-ng-show="!hideSNavbar">Hide</span>
<span data-ng-show="hideSNavbar"><span class="text-muted glyphicon glyphicon-chevron-down"></span></span>
<span data-ng-show="!hideSNavbar"><span class="text-muted glyphicon glyphicon-chevron-up"></span></span>
</a>
</div>
</div>

View File

@ -1,29 +1,33 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="BlocksController" data-ng-init="findOne()">
<div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="block.hash" data-ng-init="hideSNavbar=0">
<div class="row" data-ng-if="!hideSNavbar">
<div class="col-md-2 text-right">
<span class="ellipsis txvalues txvalues-normal">
<a href="/block/{{block.previousblockhash}}">&larr; Previous Block</a>
</span>
</div>
<div class="col-md-8 text-center">
<div class="ellipsis txvalues txvalues-normal">
<strong>Block</strong> #{{block.height}} &middot;
<strong>Hash</strong> {{block.hash}}
<span class="btn-copy" clip-copy="block.hash"></span>
<div class="secondary_navbar hidden-xs hidden-sm" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="block.hash" data-ng-init="hideSNavbar=0">
<div class="container" data-ng-if="!hideSNavbar">
<div class="row">
<div class="col-md-1">
<a href="/block/{{block.previousblockhash}}"><span class="lead glyphicon glyphicon-chevron-left"></span></a>
</div>
<div class="col-md-10">
<div class="row">
<div class="col-md-5">
<h3 class="text-left">Block #{{block.height}}</h3>
</div>
<p class="col-md-6 ellipsis text-left">
<strong>Hash</strong> {{block.hash}}
</p>
<div class="col-md-1 text-left">
<span class="btn-copy" clip-copy="block.hash"></span>
</div>
</div>
</div>
<div class="col-md-1">
<a href="/block/{{block.nextblockhash}}"><span class="lead glyphicon glyphicon-chevron-right"></span></a>
</div>
</div>
<div class="col-md-2 text-left">
<span class="ellipsis txvalues txvalues-normal">
<a href="/block/{{block.nextblockhash}}">Next Block &rarr;</a>
</span>
</div>
</div>
</div> <!-- END OF CONTAINER -->
<div class="hide_snavbar">
<a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<span data-ng-show="hideSNavbar">Show</span>
<span data-ng-show="!hideSNavbar">Hide</span>
<span data-ng-show="hideSNavbar"><span class="text-muted glyphicon glyphicon-chevron-down"></span></span>
<span data-ng-show="!hideSNavbar"><span class="text-muted glyphicon glyphicon-chevron-up"></span></span>
</a>
</div>
</div>

View File

@ -1,12 +1,10 @@
<div data-ng-include src="'/views/includes/connection.html'"></div>
<section data-ng-controller="transactionsController" data-ng-init="findThis()">
<div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="tx.txid" data-ng-init="hideSNavbar=0">
<div class="row" data-ng-if="!hideSNavbar">
<div class="col-md-8 text-center">
<span class="ellipsis txvalues txvalues-normal">
<strong>Transaction</strong> {{tx.txid}}
<div class="secondary_navbar hidden-xs hidden-sm" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="tx.txid" data-ng-init="hideSNavbar=0">
<div class="container" data-ng-if="!hideSNavbar">
<div class="col-md-8 text-left">
<h3>Transaction</h3> {{tx.txid}}
<span class="btn-copy" clip-copy="tx.txid"></span>
</span>
</div>
<div class="col-md-4">
<span data-ng-show="tx.confirmations" class="txvalues txvalues-success">{{tx.confirmations}} Confirmations</span>
@ -16,8 +14,8 @@
</div>
<div class="hide_snavbar">
<a href="#" data-ng-click="hideSNavbar=!hideSNavbar">
<span data-ng-show="hideSNavbar">Show</span>
<span data-ng-show="!hideSNavbar">Hide</span>
<span data-ng-show="hideSNavbar"><span class="text-muted glyphicon glyphicon-chevron-down"></span></span>
<span data-ng-show="!hideSNavbar"><span class="text-muted glyphicon glyphicon-chevron-up"></span></span>
</a>
</div>
</div>

View File

@ -34,7 +34,9 @@
<div data-ng-if="!itemsExpanded" data-ng-init="currentInNoExpanded=0; sizeInNoExpanded=5">
<div data-ng-repeat="vin in tx.vinSimple| startFrom:currentInNoExpanded*sizeInNoExpanded | limitTo:sizeInNoExpanded">
<div class="col-md-12 transaction-vin-vout">
<div class="pull-right btc-value" data-ng-class="{'text-danger': $root.currentAddr == vin.addr}"><p>{{$root.currency.getConvertion(vin.value) || vin.value + ' BTC'}}</p></div>
<div class="pull-right btc-value" data-ng-class="{'text-danger': $root.currentAddr == vin.addr}">
<p>{{$root.currency.getConvertion(vin.value) || vin.value + ' BTC'}}</p>
</div>
<div class="ellipsis">
<span data-ng-show="vin.notAddr">{{vin.addr}}</span>
<span class="text-muted" title="Current Bitcoin Address" data-ng-show="vin.addr == $root.currentAddr">{{vin.addr}}</span>
@ -105,12 +107,9 @@
<div data-ng-repeat="vout in tx.voutSimple| startFrom:currentOutNoExpanded*sizeOutNoExpanded | limitTo:sizeOutNoExpanded">
<div class="col-md-12 transaction-vin-vout">
<div class="pull-right btc-value" data-ng-class="{'text-success': $root.currentAddr == vout.addr}">
<p>
{{$root.currency.getConvertion(vout.value) || vout.value + ' BTC' }}
<span class="text-danger" data-ng-show="vout.isSpent" tooltip="Output is spent" tooltip-placement="left">(S)</span>
<span class="text-success" data-ng-show="!vout.isSpent" tooltip="Output is unspent" tooltip-placement="left">(U)</span>
</p>
</div>
<div class="ellipsis">