Skip to content

Commit

Permalink
Merge pull request #498 from cmgustavo/bug/minor-details
Browse files Browse the repository at this point in the history
Fixes: removed white spaces. Changed loader gif
  • Loading branch information
Mario Colque committed May 30, 2014
2 parents f55ece0 + 58b7b67 commit fca0ccc
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion public/css/main.min.css

Large diffs are not rendered by default.

Binary file modified public/img/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h3 class="modal-title">Scan Code</h3>
</div>
<div id="footer" role="navigation">
<div class="container" data-ng-controller="FooterController">
<a class="insight m10v pull-right" href="/">insight <small>API v{{version}}</small></a>
<a class="insight m10v pull-right" target="_blank" href="http://insight.is">insight <small>API v{{version}}</small></a>
</div>
</div>
<script src="/socket.io/socket.io.js"></script>
Expand Down
8 changes: 8 additions & 0 deletions public/src/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@ margin-left: 0;
padding-left: 25px;
}

.loader-gif {
display: inline-block;
width: 16px;
height: 11px;
background: transparent url(../img/loading.gif) no-repeat;
margin-left: 5px;
}

#search::-webkit-input-placeholder {
color: #BCDF7E;
font-family: 'Ubuntu', sans-serif;
Expand Down
2 changes: 1 addition & 1 deletion public/views/address.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h3>Address</h3> {{address.addrStr}}
</div>
<h1>Address <small data-ng-show="address.addrStr">{{$root.currency.getConvertion(address.balance) || address.balance + ' BTC'}}</small></h1>
<div class="text-muted" data-ng-if="!address.addrStr">
<span>Loading Address Information...</span>
<span>Loading Address Information <span class="loader-gif"></span>
</div>
<div data-ng-if="address.addrStr">
<div class="well well-sm ellipsis">
Expand Down
2 changes: 1 addition & 1 deletion public/views/block.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3 class="text-left">Block #{{block.height}}</h3>
</div>
<h1>Block #{{block.height}}</h1>
<div class="text-muted" data-ng-if="!block.hash">
<span>Loading Block Information...</span>
<span>Loading Block Information <span class="loader-gif"></span>
</div>
<div data-ng-if="block.hash">
<div class="well well-sm ellipsis">
Expand Down
2 changes: 1 addition & 1 deletion public/views/block_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h1>
</thead>
<tbody>
<tr data-ng-show="loading">
<td colspan="4">Waiting for blocks...</td>
<td colspan="5">Waiting for blocks <span class="loader-gif"></span></td>
</tr>
<tr class="fader" data-ng-repeat='b in blocks'>
<td><a href="/block/{{b.hash}}">{{b.height}}</a></td>
Expand Down
2 changes: 1 addition & 1 deletion public/views/transaction.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h1>Transaction
</h1>
<div class="progress progress-striped active" data-ng-if="!tx.txid">
<div class="progress-bar progress-bar-info" style="width: 100%">
<span>Loading Transaction Details...</span>
<span>Loading Transaction Details <span class="loader-gif"></span>
</div>
</div>
<div data-ng-if="tx.txid">
Expand Down
4 changes: 2 additions & 2 deletions public/views/transaction/tx.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{{$root.currency.getConvertion(vin.value) || vin.value + ' BTC'}}
</div>
<div class="ellipsis">
<a class="glyphicon glyphicon-chevron-right" href="/tx/{{vin.txid}}/>/{{vin.vout}}" title="Outpoint: {{vin.txid}},{{vin.vout}}"></a>&nbsp;&nbsp;
<a class="glyphicon glyphicon-chevron-right" href="/tx/{{vin.txid}}/>/{{vin.vout}}" title="Outpoint: {{vin.txid}},{{vin.vout}}"></a>
<span data-ng-show="vin.notAddr">{{vin.addr}}</span>
<a href="/address/{{vin.addr}}" data-ng-show="!vin.notAddr">{{vin.addr}}</a>
</div>
Expand Down Expand Up @@ -144,7 +144,7 @@
<div class="pull-right btc-value">
<span>{{$root.currency.getConvertion(vout.value) || vout.value + ' BTC'}}
<span class="text-success" data-ng-show="!vout.spentTxId" tooltip="Output is unspent" tooltip-placement="left">(U)</span>
<a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spentTxId" href="/tx/{{vout.spentTxId}}/</{{vout.spentIndex}}" title="Spent at: {{vout.spentTxId}},{{vout.spentIndex}}"></a>&nbsp;&nbsp;
<a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spentTxId" href="/tx/{{vout.spentTxId}}/</{{vout.spentIndex}}" title="Spent at: {{vout.spentTxId}},{{vout.spentIndex}}"></a>
</span>
</div>
<div class="ellipsis">
Expand Down

0 comments on commit fca0ccc

Please sign in to comment.