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

improve spend proposal pending

Browse source
This commit is contained in:
bechi 2015-04-28 18:15:25 -03:00
commit 7b99f50784
2 changed files with 25 additions and 14 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" <div class="ng-animate-disabled row collapse last-transactions-content line-b"
ng-class="{'text-gray':!tx.pendingForUs}" ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="openTxModal(tx, index.copayers)"> ng-click="openTxModal(tx, index.copayers)">
<div class="m5b size-12 text-gray"> <div class="small-1 columns text-center" >
<time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time> <i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
&nbsp;
</div> </div>
<div class="row collapse"> <div class="small-10 columns">
<div class="ellipsis small-8 columns size-14"> <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 translate>To</span>:
<span ng-if="tx.merchant"> <span ng-if="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span> <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
@ -14,12 +18,13 @@
</span> </span>
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact> <contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>
{{tx.toAddress}} {{tx.toAddress}}
</div> </div>
<div class="ellipsis text-gray size-14">
<div class="small-4 columns text-right"> {{tx.message}}
<span class="text-bold size-14" ng-if="!$root.updatingBalance"> </div>
{{tx.amountStr}} </div>
</span> <div class="small-1 columns text-right">
</div> <br>
<i class="icon-arrow-right3 size-18"></i>
</div> </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; padding: 0.3rem 0.4rem;
} }
.label.outline {
background: transparent;
border: 1px solid #4B6178;
}
.label.success {background-color: #1ABC9C;} .label.success {background-color: #1ABC9C;}
.label.alert {background-color: #ED4A43;} .label.alert {background-color: #ED4A43;}
.label.gray {background-color: #4B6178;} .label.gray {background-color: #4B6178;}
@ -545,6 +550,7 @@ label {
font-weight: 700; font-weight: 700;
font-size: 11px; font-size: 11px;
color: #34495E; color: #34495E;
margin-bottom: 2px;
} }
button.radius, .button.radius { button.radius, .button.radius {