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

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

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-19 10:22:58 -03:00
commit f7f027ddbe
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/import.html
View file

@ -124,9 +124,9 @@
<div class="list">
<label class="item item-input item-stacked-label no-border" ng-show="!index.isSafari && !index.isCordova">
<label class="item item-input item-stacked-label no-border" ng-show="!isSafari && !isCordova">
<div class="input-label" translate>Choose a backup file from your computer</div>
<div >
<div>
<input type="file"
placeholder="{{'Select a backup file'|translate}}"
name="backupFile"

6
public/views/join.html
View file

@ -33,10 +33,8 @@
<div class="col col-90">
<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>
<i class="icon ion-close-circled assertive" ng-show="joinForm.secret.$invalid &&
!joinForm.secret.$pristine && secret"></i>
<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}}"