BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix locked balance places

This commit is contained in:
bechi 2015-01-30 16:36:55 -03:00
parent 6feb67fe10
commit 3ce975c0c2
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/src/main.css
View File

@ -4,6 +4,11 @@
* *
*/ */
.panel h1, .panel h2, .panel h3, .panel h4, .panel h5, .panel h6, .panel p {
color: #2C3E50;
}
body, div, .row { body, div, .row {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
}; };
@ -987,7 +992,7 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e
background: #F2F5F8; background: #F2F5F8;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
border: none; border: 1px solid #CED5DC;
padding-left: 0.5rem; padding-left: 0.5rem;
font-size: 13px; font-size: 13px;
} }

2
css/src/mobile.css
View File

@ -103,7 +103,7 @@
position: fixed; position: fixed;
width: 100%; width: 100%;
z-index: 5; z-index: 5;
background: #3C4E60; background: #2C3E50;
} }
.bottom-bar { .bottom-bar {

20
views/send.html
View File

@ -1,4 +1,16 @@
<div class="send" ng-controller="SendController" ng-init="init()"> <div class="send" ng-controller="SendController" ng-init="init()">
<div class="columns" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<div class="panel">
<div class="left">
<i class="fi-info size-42 m10r"></i>
</div>
<div>
<p class="m0 size-14 text-bold">Available Balance: {{$root.wallet.balanceInfo.availableBalance}} {{$root.wallet.settings.unitName}}</p>
<span class="size-12 text-gray">{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} in pending transactions</span>
</div>
</div>
</div>
<div class="row show-for-large-up"> <div class="row show-for-large-up">
<div class="large-8 large-centered columns"> <div class="large-8 large-centered columns">
<h1>{{$root.title}}</h1> <h1>{{$root.title}}</h1>
@ -37,9 +49,8 @@
<div class="row" ng-show="!fetchingURL && !creatingTX"> <div class="row" ng-show="!fetchingURL && !creatingTX">
<div class="large-8 large-centered columns"> <div class="large-8 small-11 small-centered large-centered columns">
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate> <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<div class="panel">
<div class="box-notification" ng-show="error && !hideForWP "> <div class="box-notification" ng-show="error && !hideForWP ">
<div class="box-icon error"> <div class="box-icon error">
<i class="fi-x size-24"></i> <i class="fi-x size-24"></i>
@ -162,9 +173,8 @@
<a ng-click="resetForm()" class="button expand warning m0" ng-show="_merchantData || lockAddress" ng-disabled="loading">Cancel</a> <a ng-click="resetForm()" class="button expand warning m0" ng-show="_merchantData || lockAddress" ng-disabled="loading">Cancel</a>
</div> </div>
</div> </div>
</div>
</form> </form>
<div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection"> <!-- <div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<i class="fi-lock"></i> <i class="fi-lock"></i>
<span> <span>
{{'Locked'|translate}} &nbsp; {{'Locked'|translate}} &nbsp;
@ -174,7 +184,7 @@
<b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b> <b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b>
- {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} - {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
</span> </span>
</div> </div> -->
</div> </div>
</div> </div>
<!-- end of row --> <!-- end of row -->