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

Merge pull request #2656 from bechi/layout-details-13

Browse source 
Layout details 13
This commit is contained in:
Matias Alejo Garcia 2015-04-28 20:32:56 -03:00
commit d66c9f2ece
4 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
public/views/includes/transaction.html
View file

@ -1,12 +1,16 @@
<div class="last-transactions-content ng-animate-disabled"
ng-class="{'text-gray':!tx.pendingForUs}"
<div class="ng-animate-disabled row collapse last-transactions-content line-b"
ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="openTxModal(tx, index.copayers)">
<div class="m5b size-12 text-gray">
<time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
<div class="small-1 columns text-center" >
<i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
&nbsp;
</div>
<div class="row collapse">
<div class="ellipsis small-8 columns size-14">
<div class="small-10 columns">
<div ng-if="!$root.updatingBalance">
<span class="text-bold size-16">Send {{tx.amountStr}}</span>
<time class="right size-12 text-gray m5t">{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>
<div class="ellipsis size-14">
<span translate>To</span>:
<span ng-if="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
@ -14,12 +18,13 @@
</span>
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>
{{tx.toAddress}}
</div>
<div class="small-4 columns text-right">
<span class="text-bold size-14" ng-if="!$root.updatingBalance">
{{tx.amountStr}}
</span>
</div>
</div>
<div class="ellipsis text-gray size-14">
{{tx.message}}
</div>
</div>
<div class="small-1 columns text-right">
<br>
<i class="icon-arrow-right3 size-18"></i>
</div>
</div>

8
public/views/modals/tx-status.html
View file

@ -5,7 +5,7 @@
<span translate>Payment Sent</span>
</div>
<div class="text-center">
<a class="button outline white small-5 tiny" ng-click="cancel()" translate>OKAY</a>
<a class="button outline white small-5" ng-click="cancel()" translate>OKAY</a>
</div>
</div>
@ -15,7 +15,7 @@
{{statusStr|translate}}
</div>
<div class="text-center">
<a class="button outline light-gray small-5 tiny" ng-click="cancel()" translate>OKAY</a>
<a class="button outline light-gray small-5" ng-click="cancel()" translate>OKAY</a>
</div>
</div>
@ -25,8 +25,6 @@
{{statusStr|translate}}
</div>
<div class="text-center">
<a class="button outline light-gray small-5 tiny" ng-click="cancel()" translate>OKAY</a>
<a class="button outline light-gray small-5" ng-click="cancel()" translate>OKAY</a>
</div>
</div>

6
public/views/modals/txp-details.html
View file

@ -132,14 +132,14 @@
</div>
<div class="row column m20t" ng-if="tx.couldRemove">
<div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
* Only transactions created by yourself with no peer signatures can be removed
</div>
<button class="tiny expand outline dark-gray" ng-click="remove(tx)"
ng-disabled="loading" ng-show="tx.couldRemove">
<i class="fi-trash size-14 m5r"></i>
<span translate>Remove transaction</span>
</button>
<div class="text-gray size-12 text-center" show="tx.couldRemove" translate>
* Only transactions created by yourself with no peer signatures can be removed
</div>
</div>
</div>

6
src/css/main.css
View file

@ -470,6 +470,11 @@ input[type=number]::-webkit-outer-spin-button {
padding: 0.3rem 0.4rem;
}
.label.outline {
background: transparent;
border: 1px solid #4B6178;
}
.label.success {background-color: #1ABC9C;}
.label.alert {background-color: #ED4A43;}
.label.gray {background-color: #4B6178;}
@ -545,6 +550,7 @@ label {
font-weight: 700;
font-size: 11px;
color: #34495E;
margin-bottom: 2px;
}
button.radius, .button.radius {