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

Merge pull request #2523 from bechi/layout-details-01

Browse source 
fix some details
This commit is contained in:
Matias Alejo Garcia 2015-04-16 09:44:00 -03:00
commit ebf096854d
5 changed files with 42 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/history.html
View file

@ -18,7 +18,7 @@
<div ng-show="index.txHistory[0]" class="scroll">
<div ng-repeat="btx in index.txHistory"
ng-click="history.openTxModal(btx)"
class="row last-transactions-content">
class="row collapse last-transactions-content">
<div class="large-3 medium-3 small-3 columns">
<span class="label tu" ng-show="btx.action == 'received'"
ng-style="{'background-color':index.backgroundColor}">Received</span>
@ -27,7 +27,7 @@
</div>
<div class="large-5 medium-5 small-5 columns">
<span class="size-18">
<span class="size-16">
<span ng-if="btx.action == 'received'">+</span>
<span ng-if="btx.action == 'sent'">-</span>
{{btx.amountStr}}

7
public/views/send.html
View file

@ -137,15 +137,16 @@
<div class="row" ng-show="!send.onGoingProcess">
<div class="large-6 medium-6 small-6 columns" ng-show="!send.blockUx && (send._paypro || send.lockAddress)">
<a ng-click="send.resetForm(sendForm)" class="button expand outline dark-gray" translate>Cancel</a>
</div>
<div class="columns" ng-class="{'small-6 medium-6 large-6':(send._paypro || send.lockAddress)}">
<button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx"
ng-style="{'background-color':index.backgroundColor}" translate>
Send
</button>
</div>
<div class="large-6 medium-6 small-6 columns" ng-show="!send.blockUx && (send._paypro || send.lockAddress)">
<a ng-click="send.resetForm(sendForm)" class="button expand warning" translate>Cancel</a>
</div>
</div>
</form>
</div>