mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #3566 from bechi/feat/style-03
fix subheader & camera on send
This commit is contained in:
commit
373d7c4286
|
@ -1,15 +1,10 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="left" ng-show="index.lockedBalanceSat">
|
<span class="db text-bold">
|
||||||
<i class="fi-info size-24 m10r"></i>
|
<span translate>Available Balance</span>:
|
||||||
</div>
|
{{index.availableBalanceStr }}
|
||||||
<div class="size-10">
|
</span>
|
||||||
<span class="db text-bold">
|
<span class="text-gray" ng-show="index.lockedBalanceSat">
|
||||||
<span translate>Available Balance</span>:
|
{{index.lockedBalanceStr}}
|
||||||
{{index.availableBalanceStr }}
|
<span translate>locked by pending payments</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="text-gray" ng-show="index.lockedBalanceSat">
|
|
||||||
{{index.lockedBalanceStr}}
|
|
||||||
<span translate>locked by pending payments</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -265,20 +265,21 @@
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<div id="send" class="send tab-view">
|
<div id="send" class="send tab-view">
|
||||||
<div>
|
<div class="pr">
|
||||||
<h4 class="title m0">
|
<h4 class="title m0">
|
||||||
|
<available-balance></available-balance>
|
||||||
<a class="right lh"
|
<a class="db"
|
||||||
ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
|
ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
|
||||||
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr, index.feeRateToSendMax, index.currentFeeLevel)"
|
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr, index.feeRateToSendMax, index.currentFeeLevel)"
|
||||||
translate> Send All
|
translate> Send All
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<available-balance></available-balance>
|
|
||||||
</h4>
|
</h4>
|
||||||
|
<div class="camera-icon" ng-show="index.isComplete">
|
||||||
|
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row m20t">
|
<div class="row m20t">
|
||||||
<div class="large-12 large-centered columns">
|
<div class="large-12 large-centered columns m20t">
|
||||||
<form name="sendForm" ng-submit="home.submitForm()" ng-disabled="home.blockUx || home.onGoingProcess" novalidate>
|
<form name="sendForm" ng-submit="home.submitForm()" ng-disabled="home.blockUx || home.onGoingProcess" novalidate>
|
||||||
<div class="box-notification" ng-show="home.error" ng-click="home.resetError()">
|
<div class="box-notification" ng-show="home.error" ng-click="home.resetError()">
|
||||||
<span class="text-warning">
|
<span class="text-warning">
|
||||||
|
|
|
@ -49,17 +49,17 @@ h4 {
|
||||||
box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.10);
|
box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.10);
|
||||||
background: #fff;
|
background: #fff;
|
||||||
padding: 0.8rem;
|
padding: 0.8rem;
|
||||||
text-transform: uppercase;
|
color: #4B6178;
|
||||||
color: #2C3E50;
|
font-weight: 500;
|
||||||
font-weight: 700;
|
font-size: 0.75rem;
|
||||||
font-size: 0.7rem;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
line-height: 1.5;
|
||||||
|
min-height: 62px;
|
||||||
}
|
}
|
||||||
|
|
||||||
h4.title a {
|
h4.title a {
|
||||||
text-transform: none;
|
text-transform: none;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
padding: 7px;
|
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -219,16 +219,19 @@ _:-ms-fullscreen, :root .main {
|
||||||
}
|
}
|
||||||
|
|
||||||
.camera-icon a {
|
.camera-icon a {
|
||||||
|
background: #4B6178;
|
||||||
|
box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.50);
|
||||||
color: #fff;
|
color: #fff;
|
||||||
display: block;
|
display: block;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background: #333;
|
|
||||||
border: 1px solid #666;
|
|
||||||
padding: 15px 17px;
|
padding: 15px 17px;
|
||||||
border-radius: 100%;
|
border-radius: 100%;
|
||||||
top: -43px;
|
top: -40px;
|
||||||
right: 15px;
|
right: 15px;
|
||||||
opacity: 0.7;
|
}
|
||||||
|
|
||||||
|
.send .camera-icon a {
|
||||||
|
top: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.copayers {
|
.copayers {
|
||||||
|
|
Loading…
Reference in New Issue