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

Merge branch 'ref/design' of github.com:matiu/copay into ref/design

This commit is contained in:
Matias Alejo Garcia 2016-08-18 14:57:00 -03:00
parent 2b5a3bb5a2 b3fe66aeaf
commit 7b42c2e11a
No known key found for this signature in database
GPG Key ID: 02470DB551277AB3
2 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
public/views/join.html
View File

@ -16,31 +16,39 @@
<div class="list">
<label class="item item-input item-stacked-label">
<span class="input-label" translate>Your nickname</span>
<input type="text"
placeholder="{{'John'|translate}}"
name="myName"
ng-model="myName"
ng-required="true">
</label>
<div class="row">
<div class="col">
<label class="item item-input item-stacked-label item-border-off">
<span class="input-label" translate>Your nickname</span>
<input type="text"
placeholder="{{'John'|translate}}"
name="myName"
ng-model="myName"
ng-required="true">
</label>
</div>
</div>
<qr-scanner class="button button-clear button-positive" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
<label class="item item-input item-stacked-label">
<span class="input-label">
Wallet Invitation
</span>
<i class="icon ion-checkmark-circled balanced" ng-show="joinForm.secret.$valid &&
!joinForm.secret.$pristine && secret"></i>
<i class="icon ion-close-circled assertive" ng-show="joinForm.secret.$invalid &&
!joinForm.secret.$pristine && secret"></i>
<input id="secret"
type="text"
placeholder="{{'Paste invitation here'|translate}}"
name="secret"
ng-model="secret"
wallet-secret required>
</label>
<div class="row">
<div class="col col-90">
<label class="item item-input item-stacked-label item-border-off">
<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>
<i class="icon ion-close-circled assertive" ng-show="joinForm.secret.$invalid &&
!joinForm.secret.$pristine && secret"></i>
<input id="secret"
type="text"
placeholder="{{'Paste invitation here'|translate}}"
name="secret"
ng-model="secret"
wallet-secret required>
</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>

8
src/sass/main.scss
View File

@ -930,6 +930,14 @@ ul.wallet-selection.wallets {
font-weight: 700;
}
.qr-icon {
line-height: 45px;
}
.item-border-off {
border-style: none;
}
/*
* Calculator
*/