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

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

View file

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

View file

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