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

Merge pull request #198 from JDonadio/design/import

Browse source 
Fix Import UI
This commit is contained in:
Matias Alejo Garcia 2016-08-18 17:50:27 -03:00 • committed by GitHub
commit d8100b8cf7
3 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
public/views/import.html
View file

@ -56,15 +56,22 @@
<form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate> <form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
<div class="list"> <div class="list">
<qr-scanner class="button button-clear button-positive" on-scan="processWalletInfo(data)"></qr-scanner>
<label class="item item-input item-stacked-label"> <div class="row">
<span class="input-label" translate>Type the Recovery Phrase (usually 12 words)</span> <div class="col col-90">
<textarea name="words" <label class="item item-input item-stacked-label no-border">
ng-model="words" <span class="input-label" translate>Type the Recovery Phrase (usually 12 words)</span>
rows="3" <textarea name="words"
autocapitalize="off" ng-model="words"
spellcheck="false"></textarea> rows="3"
</label> autocapitalize="off"
spellcheck="false"></textarea>
</label>
</div>
<div class="col text-center">
<qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
</div>
</div>
<ion-toggle ng-model="showAdv" toggle-class="toggle-stable"> <ion-toggle ng-model="showAdv" toggle-class="toggle-stable">
<span translate ng-show="!showAdv">Show advanced options</span> <span translate ng-show="!showAdv">Show advanced options</span>
@ -116,12 +123,15 @@
<form name="importForm" ng-submit="importBlob(importForm)" novalidate> <form name="importForm" ng-submit="importBlob(importForm)" novalidate>
<div class="list"> <div class="list">
<label class="item item-input item-stacked-label" ng-show="!index.isSafari && !index.isCordova">
<span class="input-label" translate>Choose a backup file from your computer</span> <label class="item item-input item-stacked-label no-border" ng-show="!index.isSafari && !index.isCordova">
<input type="file" <div class="input-label" translate>Choose a backup file from your computer</div>
placeholder="{{'Select a backup file'|translate}}" <div >
name="backupFile" <input type="file"
ng-model="backupFile" ng-file-select> placeholder="{{'Select a backup file'|translate}}"
name="backupFile"
ng-model="backupFile" ng-file-select>
</div>
</label> </label>
<label class="item item-input item-stacked-label" ng-show="index.isSafari || index.isCordova"> <label class="item item-input item-stacked-label" ng-show="index.isSafari || index.isCordova">

4
public/views/join.html
View file

@ -18,7 +18,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<label class="item item-input item-stacked-label item-border-off"> <label class="item item-input item-stacked-label no-border">
<span class="input-label" translate>Your nickname</span> <span class="input-label" translate>Your nickname</span>
<input type="text" <input type="text"
placeholder="{{'John'|translate}}" placeholder="{{'John'|translate}}"
@ -31,7 +31,7 @@
<div class="row"> <div class="row">
<div class="col col-90"> <div class="col col-90">
<label class="item item-input item-stacked-label item-border-off"> <label class="item item-input item-stacked-label no-border">
<span class="input-label" translate>Wallet Invitation</span> <span class="input-label" translate>Wallet Invitation</span>
<i class="icon ion-checkmark-circled balanced" ng-show="joinForm.secret.$valid && <i class="icon ion-checkmark-circled balanced" ng-show="joinForm.secret.$valid &&
!joinForm.secret.$pristine && secret"></i> !joinForm.secret.$pristine && secret"></i>

8
src/sass/main.scss
View file

@ -934,10 +934,16 @@ ul.wallet-selection.wallets {
line-height: 45px; line-height: 45px;
} }
.item-border-off { .no-border {
border-style: none; border-style: none;
} }
input[type=file] {
margin-top: 10px;
margin-bottom: -10px;
line-height: 0px;
}
/* /*
* Calculator * Calculator
*/ */