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

Merge pull request #196 from JDonadio/design/join

Browse source 
Fix Join UI
This commit is contained in:
Matias Alejo Garcia 2016-08-18 13:33:03 -03:00 • committed by GitHub
commit b3fe66aeaf
2 changed files with 41 additions and 25 deletions
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"> <div class="list">
<label class="item item-input item-stacked-label"> <div class="row">
<span class="input-label" translate>Your nickname</span> <div class="col">
<input type="text" <label class="item item-input item-stacked-label item-border-off">
placeholder="{{'John'|translate}}" <span class="input-label" translate>Your nickname</span>
name="myName" <input type="text"
ng-model="myName" placeholder="{{'John'|translate}}"
ng-required="true"> name="myName"
</label> ng-model="myName"
ng-required="true">
</label>
</div>
</div>
<qr-scanner class="button button-clear button-positive" on-scan="join.onQrCodeScanned(data)"></qr-scanner> <div class="row">
<label class="item item-input item-stacked-label"> <div class="col col-90">
<span class="input-label"> <label class="item item-input item-stacked-label item-border-off">
Wallet Invitation <span class="input-label" translate>Wallet Invitation</span>
</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> <i class="icon ion-close-circled assertive" ng-show="joinForm.secret.$invalid &&
<i class="icon ion-close-circled assertive" ng-show="joinForm.secret.$invalid && !joinForm.secret.$pristine && secret"></i>
!joinForm.secret.$pristine && secret"></i> <input id="secret"
<input id="secret" type="text"
type="text" placeholder="{{'Paste invitation here'|translate}}"
placeholder="{{'Paste invitation here'|translate}}" name="secret"
name="secret" ng-model="secret"
ng-model="secret" wallet-secret required>
wallet-secret required> </label>
</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>

8
src/sass/main.scss
View file

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