mirror of https://github.com/BTCPrivate/copay.git
Merge branch 'ref/design' of github.com:matiu/copay into ref/design
This commit is contained in:
commit
84d1bd81bc
|
@ -56,8 +56,10 @@
|
|||
|
||||
<form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
|
||||
<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">
|
||||
<div class="col col-90">
|
||||
<label class="item item-input item-stacked-label no-border">
|
||||
<span class="input-label" translate>Type the Recovery Phrase (usually 12 words)</span>
|
||||
<textarea name="words"
|
||||
ng-model="words"
|
||||
|
@ -65,6 +67,11 @@
|
|||
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">
|
||||
<span translate ng-show="!showAdv">Show advanced options</span>
|
||||
|
@ -116,12 +123,15 @@
|
|||
<form name="importForm" ng-submit="importBlob(importForm)" novalidate>
|
||||
|
||||
<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">
|
||||
<div class="input-label" translate>Choose a backup file from your computer</div>
|
||||
<div >
|
||||
<input type="file"
|
||||
placeholder="{{'Select a backup file'|translate}}"
|
||||
name="backupFile"
|
||||
ng-model="backupFile" ng-file-select>
|
||||
</div>
|
||||
</label>
|
||||
|
||||
<label class="item item-input item-stacked-label" ng-show="index.isSafari || index.isCordova">
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
<div class="row">
|
||||
<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>
|
||||
<input type="text"
|
||||
placeholder="{{'John'|translate}}"
|
||||
|
@ -31,7 +31,7 @@
|
|||
|
||||
<div class="row">
|
||||
<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>
|
||||
<i class="icon ion-checkmark-circled balanced" ng-show="joinForm.secret.$valid &&
|
||||
!joinForm.secret.$pristine && secret"></i>
|
||||
|
|
|
@ -934,10 +934,16 @@ ul.wallet-selection.wallets {
|
|||
line-height: 45px;
|
||||
}
|
||||
|
||||
.item-border-off {
|
||||
.no-border {
|
||||
border-style: none;
|
||||
}
|
||||
|
||||
input[type=file] {
|
||||
margin-top: 10px;
|
||||
margin-bottom: -10px;
|
||||
line-height: 0px;
|
||||
}
|
||||
|
||||
/*
|
||||
* Calculator
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue