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

fix check/uncheck icon - show input file

Browse source
This commit is contained in:
Javier 2016-08-19 10:08:52 -03:00
commit 1bcaffdfe2
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"> <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 class="input-label" translate>Choose a backup file from your computer</div>
<div > <div>
<input type="file" <input type="file"
placeholder="{{'Select a backup file'|translate}}" placeholder="{{'Select a backup file'|translate}}"
name="backupFile" name="backupFile"

6
public/views/join.html
View file

@ -33,10 +33,8 @@
<div class="col col-90"> <div class="col col-90">
<label class="item item-input item-stacked-label no-border"> <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> <i class="icon ion-close-circled assertive" ng-show="joinForm.secret.$invalid && !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" <input id="secret"
type="text" type="text"
placeholder="{{'Paste invitation here'|translate}}" placeholder="{{'Paste invitation here'|translate}}"

2
src/js/controllers/import.js
View file

@ -8,6 +8,8 @@ angular.module('copayApp.controllers').controller('importController',
var reader = new FileReader(); var reader = new FileReader();
var defaults = configService.getDefaults(); var defaults = configService.getDefaults();
var errors = bwcService.getErrors(); var errors = bwcService.getErrors();
$scope.isSafari = platformInfo.isSafari;
$scope.isCordova = platformInfo.isCordova;
$scope.bwsurl = defaults.bws.url; $scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default; $scope.derivationPath = derivationPathHelper.default;
$scope.account = 1; $scope.account = 1;

5
src/sass/main.scss
View file

@ -976,6 +976,11 @@ input[type=file] {
text-align: left; text-align: left;
} }
.input-label {
max-width: none;
width: inherit;
}
/* /*
* Calculator * Calculator
*/ */