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

Merge pull request #2269 from cmgustavo/ux/addressbook-icons

Browse source 
Ux/addressbook icons - Scan QR button
This commit is contained in:
Matias Alejo Garcia 2015-01-05 15:01:27 -03:00
commit e9c4373e4d
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
views/modals/address-book.html
View file

@ -64,7 +64,6 @@
<div class="input">
<input type="text" name="newaddress"
placeholder="{{'Address'|translate}}" ng-model="newaddress" valid-address required>
<i class="fi-address-book"></i>
</div>
<label for="newlabel"><span translate>Label</span>
@ -72,7 +71,6 @@
<div class="input">
<input type="text" name="newlabel"
placeholder="{{'Label'|translate}}" ng-model="newlabel" required>
<i class="icon-pricetag"></i>
</div>
</label>
<a translate class="m0 button secondary small default" ng-click="cancel(addressBookForm)">Back</a>

2
views/send.html
View file

@ -160,7 +160,7 @@
</button>
</div>
<div class="large-4 medium-4 small-12 columns text-left">
<div class="show-for-large-up" ng-show="!lockAddress && !_merchantData">
<div class="show-for-large-up text-right" ng-show="!lockAddress && !_merchantData">
<div ng-hide="showScanner || disableScanner">
<a class="button radius black size-12" ng-click="openScanner()"><i class="fi-camera size-18 vm m5r"></i> Scan QR </a>
</div>