Merge pull request #3457 from tanojaja/fix/scan-icon-addressbook

fix design on addressbook add page
This commit is contained in:
Gustavo Maximiliano Cortez 2015-11-16 09:46:40 -03:00
commit a20ffd8824

View file

@ -19,6 +19,9 @@
<h1 ng-show="(editAddressbook || !wallets[0]) && !addAddressbookEntry" class="title ellipsis" translate> <h1 ng-show="(editAddressbook || !wallets[0]) && !addAddressbookEntry" class="title ellipsis" translate>
Addressbook Addressbook
</h1> </h1>
<h1 ng-show="addAddressbookEntry" class="title ellipsis" translate>
Add a new entry
</h1>
</section> </section>
<section class="right-small" ng-show="!selectedWalletsOpt" ng-click="toggleEditAddressbook()"> <section class="right-small" ng-show="!selectedWalletsOpt" ng-click="toggleEditAddressbook()">
@ -28,14 +31,10 @@
<a ng-show="editAddressbook && !addAddressbookEntry" href class="p10"> <a ng-show="editAddressbook && !addAddressbookEntry" href class="p10">
<span class="text-close" translate>Done</span> <span class="text-close" translate>Done</span>
</a> </a>
<qr-scanner ng-show="addAddressbookEntry"
on-scan="onQrCodeScanned(data, addressbookForm)"
before-scan="beforeQrCodeScann()"></qr-scanner>
</section> </section>
</nav> </nav>
<div class="modal-content fix-modals-touch"> <div class="modal-content fix-modals-touch">
<div ng-show="selectedWalletsOpt"> <div ng-show="selectedWalletsOpt">
<div class="onGoingProcess" ng-if="gettingAddress"> <div class="onGoingProcess" ng-if="gettingAddress">
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}"> <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
@ -91,7 +90,6 @@
</ul> </ul>
<div ng-show="addAddressbookEntry"> <div ng-show="addAddressbookEntry">
<h4 class="title m0" translate>Add a new entry</h4>
<form name="addressbookForm" class="p10" no-validate> <form name="addressbookForm" class="p10" no-validate>
<div class="text-warning size-12 m10b" ng-show="error">{{error|translate}}</div> <div class="text-warning size-12 m10b" ng-show="error">{{error|translate}}</div>
<span ng-hide="addressbookForm.address.$pristine"> <span ng-hide="addressbookForm.address.$pristine">
@ -103,8 +101,15 @@
<i class="icon-checkmark-circle size-14"></i> <i class="icon-checkmark-circle size-14"></i>
</small> </small>
</span> </span>
<label translate>Address</label> <label translate>Address</label>
<input type="text" id="address" name="address" ng-model="addressbook.address" valid-address required> <div class="input">
<input type="text" id="address" name="address" ng-model="addressbook.address" valid-address required>
<div class="qr-scanner-input">
<qr-scanner on-scan="onQrCodeScanned(data, addressbookForm)" before-scan="beforeQrCodeScann()"></qr-scanner>
</div>
</div>
<label translate>Label</label> <label translate>Label</label>
<input type="text" id="label" name="label" ng-model="addressbook.label" required> <input type="text" id="label" name="label" ng-model="addressbook.label" required>
<div class="row"> <div class="row">