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

use new scan icon

This commit is contained in:
Javier 2016-11-24 16:17:01 -03:00
parent 1687669149
commit 4c42c72411
4 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controllers/confirm.js
View File

@ -146,7 +146,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
fee: resp.fee,
feePerKb: feePerKb,
};
toAmount = parseFloat((resp.amount * satToUnit).toFixed(unitDecimals));
txFormatService.formatAlternativeStr(resp.amount, function(v) {
$scope.alternativeAmountStr = v;
});
var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
fee: txFormatService.formatAmount(resp.fee) + ' ' + unitName

22
src/sass/views/tab-send.scss
View File

@ -1,7 +1,23 @@
#tab-send {
@extend .deflash-blue;
input {
width: 100%;
.input {
input {
width: 100%;
height: auto;
}
&.item {
height: 55px;
}
i {
&.left {
padding-left: 15px;
}
&.qr {
cursor: pointer;
cursor: hand;
padding-right: 5px;
}
}
}
.qr-scan-icon {
cursor: pointer;
@ -10,7 +26,7 @@
padding-left: 10px;
}
.qr-icon {
line-height: 45px;
line-height: 20px;
}
.zero-state-cta {
padding-bottom: 3vh;

24
www/img/scan-ico.svg Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="25px" height="15px" viewBox="0 0 25 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>scan-ico</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" opacity="0.5">
<g id="Send---initial" transform="translate(-326.000000, -139.000000)" stroke-width="1.5" stroke="#4A4A4A">
<g id="Send-to-(Field)" transform="translate(0.000000, 70.000000)">
<g id="scan-ico" transform="translate(326.000000, 68.000000)">
<g id="Icons/Tabs/Scan" transform="translate(0.233333, 0.551724)">
<g id="Scan">
<path d="M8.01713862,1.23032704 L4.65481836,1.23032704 M4.40485821,1.23032704 L4.40485821,4.48620728" id="Line-Copy-2" stroke-linejoin="round"></path>
<path d="M16.3666389,1.23032704 L19.7289592,1.23032704 M19.9789194,1.23032704 L19.9789194,4.48620728" id="Line-Copy-3" stroke-linejoin="round"></path>
<path d="M8.01713862,14.3286527 L4.65481836,14.3286527 M4.40485821,14.3286527 L4.40485821,11.0727724" id="Line-Copy-5" stroke-linejoin="round"></path>
<path d="M16.3666389,14.3286527 L19.7289592,14.3286527 M19.9789194,14.3286527 L19.9789194,11.0727724" id="Line-Copy-4" stroke-linejoin="round"></path>
<path d="M0.559999983,7.67196401 L23.8933334,7.67196401" id="Line"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

6
www/views/tab-send.html
View File

@ -32,10 +32,10 @@
</div>
</div> -->
<div class="item item-icon-left item-icon-right">
<i class="icon icon-svg placeholder-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
<div class="item item-icon-left item-icon-right input">
<i class="icon icon-svg left"><img src="img/icon-bitcoin-symbol.svg"></i>
<input type="text" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur>
<i class="icon icon-svg qr-scan-icon" on-tap="openScanner()"><img src="img/tab-icons/ico-scan.svg"/></i>
<i class="icon icon-svg qr" on-tap="openScanner()"><img src="img/scan-ico.svg"/></i>
</div>
<div class="card">