diff --git a/css/src/main.css b/css/src/main.css index 9740b1f9c..df285847f 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -167,6 +167,7 @@ a:hover { .join input, .setup input, .import input, +.import textarea, .settings input { background: #2C3E50 !important; -moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; @@ -269,7 +270,6 @@ a:hover { .box-setup { padding: 20px 30px; background: #34495E; - margin-bottom: 20px; } .box-setup label small.has-error { @@ -420,7 +420,8 @@ table.last-transactions-content { .m5b {margin-bottom: 5px;} .m5r {margin-right: 5px;} .m10b {margin-bottom: 10px;} -.m15b {margin-bottom: 20px;} +.m15b {margin-bottom: 15px;} +.m20b {margin-bottom: 20px;} .m10r {margin-right: 10px;} .m15l {margin-left: 15px;} .m15t {margin-top: 15px;} @@ -487,7 +488,7 @@ table.last-transactions-content { } .line-dashed { - border-top: 1px dashed #ccc; + border-top: 1px dashed #3C5269; margin: 1rem 0; padding: 1rem 0; overflow: hidden; @@ -926,10 +927,6 @@ button.gray:focus, color: #2C3E50; } -button, .button, p { - margin: 0; -} - .side-nav {padding: 0;} .side-nav li { diff --git a/css/src/mobile.css b/css/src/mobile.css index 158b9f5b4..b36b42fbe 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -171,5 +171,21 @@ margin-bottom: 0; } + .button, button { + padding: 1rem 1.2rem 1.0625rem; + } + + form { + margin: 0; + } + + .box-setup { + margin-bottom: 50px; + } + + .footer-setup { + margin-bottom: 50px; + } + } diff --git a/js/controllers/import.js b/js/controllers/import.js index 58b3227f9..4c10279e4 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -1,12 +1,13 @@ 'use strict'; angular.module('copayApp.controllers').controller('ImportController', - function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) { + function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification, isMobile) { controllerUtils.redirIfLogged(); $scope.title = 'Import a backup'; $scope.importStatus = 'Importing wallet - Reading backup...'; $scope.hideAdv = true; + $scope.is_iOS = isMobile.iOS(); var reader = new FileReader(); @@ -69,10 +70,6 @@ angular.module('copayApp.controllers').controller('ImportController', $scope.choosefile = !$scope.choosefile; }; - $scope.openPasteArea = function() { - $scope.pastetext = !$scope.pastetext; - }; - $scope.getFile = function() { // If we use onloadend, we need to check the readyState. reader.onloadend = function(evt) { @@ -93,9 +90,10 @@ angular.module('copayApp.controllers').controller('ImportController', } var backupFile = $scope.file; + var backupText = form.backupText.$modelValue; var password = form.password.$modelValue; - if (!backupFile) { + if (!backupFile && !backupText) { $scope.loading = false; notification.error('Error', 'Please, select your backup file'); $scope.loading = false; @@ -105,5 +103,8 @@ angular.module('copayApp.controllers').controller('ImportController', if (backupFile) { reader.readAsBinaryString(backupFile); } + else { + _importBackup(backupText); + } }; }); diff --git a/views/addresses.html b/views/addresses.html index 688f3d628..4f5ee7c23 100644 --- a/views/addresses.html +++ b/views/addresses.html @@ -25,9 +25,9 @@ -

+ {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} -

+
Show QR @@ -40,12 +40,12 @@ change
-

+ -

-

+ + {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} -

+
diff --git a/views/create.html b/views/create.html index 7ad74334c..b2eef27ed 100644 --- a/views/create.html +++ b/views/create.html @@ -12,8 +12,10 @@
- Step 1 - Step 2 + Step 1 + Step 2

Create new wallet

- + Show Hide advanced options @@ -54,7 +56,6 @@ -

@@ -79,7 +80,7 @@

(*) The limits are imposed by the bitcoin network.

-
+
« Back « Back
-

{{tx.createdTs | amCalendar}}

+ {{tx.createdTs | amCalendar}}
@@ -88,11 +88,9 @@ -
-

+

{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -

-
+
diff --git a/views/join.html b/views/join.html index 8242595c2..47a290ed4 100644 --- a/views/join.html +++ b/views/join.html @@ -13,7 +13,7 @@

Join a Wallet in Creation

-