diff --git a/Gruntfile.js b/Gruntfile.js index 0bf495857..811946557 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,6 +55,10 @@ module.exports = function(grunt) { files: ['src/css/*.css'], tasks: ['concat:css'] }, + sass: { + files: ['src/sass/*.scss'], + tasks: ['sass', 'concat:css'] + }, main: { files: [ 'src/js/init.js', diff --git a/public/views/create.html b/public/views/create.html index 2a009d75a..1680bb34b 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -8,10 +8,10 @@
-
+
Personal Wallet
-
+
Shared Wallet
@@ -58,7 +58,7 @@
- + Show advanced options Hide advanced options @@ -134,19 +134,17 @@
- + + Testnet +
- + +
+ Single Address Wallet + For audit purposes +
+
diff --git a/public/views/import.html b/public/views/import.html index 8bca7f724..5ce29400c 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -21,93 +21,98 @@
-
-
-
Could not access the wallet at the server. Please check:
-
    -
  • The password of the recovery phrase (if set) -
    • -
  • The derivation path -
    • -
  • The wallet service URL -
-
- NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there.
-
-
-
- -
-
- {{import.error|translate}} -
-
- -
-
- -
- - -
- -
- - - Show advanced options - Hide advanced options - - - -
-
-
- - - -
- -
- - - -
- +
+
+
+
+
Could not access the wallet at the server. Please check:
+
    +
  • The password of the recovery phrase (if set) +
    • +
  • The derivation path +
    • +
  • The wallet service URL +
+
+ NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there.
-
+
- - +
+
+ {{import.error|translate}} +
+
+
+
+ +
+
+
+ +
+ + +
+ +
+ + + Show advanced options + Hide advanced options + + + +
+
+
+ + + +
+ +
+ + + +
+ + Testnet + +
+
+
+ + +
+
-
- - {{import.error|translate}} - -
-
+
+
+
+ + {{import.error|translate}} + +
@@ -133,7 +138,7 @@
- + Show advanced options Hide advanced options @@ -156,72 +161,74 @@ Import backup +
-
- - {{import.error|translate}} - -
-
+
+
+
+ + {{import.error|translate}} + +
-
-
-
- No hardware wallets supported on this device -
-
diff --git a/public/views/join.html b/public/views/join.html index c9e537578..c0b82078e 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -44,7 +44,7 @@
- + Show advanced options Hide advanced options diff --git a/public/views/preferences.html b/public/views/preferences.html index 47b0e3606..6aaab77f7 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -15,7 +15,7 @@
  • {{index.alias||index.walletName}} - +
    Alias
    • @@ -24,7 +24,7 @@
    Disabled {{index.preferences.email}} - +
    Email Notifications
    @@ -32,7 +32,7 @@
  • █ - +
    Color
    • diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html index 26a0c695f..0c552b8f4 100644 --- a/public/views/preferencesGlobal.html +++ b/public/views/preferencesGlobal.html @@ -9,7 +9,7 @@
  • {{currentLanguageName|translate}} - +
    Language
    • @@ -20,7 +20,7 @@
  • {{unitName}} - +
    Unit
    • @@ -28,7 +28,7 @@
  • {{selectedAlternative.name}} - +
    Alternative Currency
    • @@ -39,7 +39,7 @@
  • {{feeOpts[currentFeeLevel]|translate}} - +
    Bitcoin Network Fee Policy
    • @@ -81,7 +81,7 @@
    About Copay
    - +

    diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css index ef037078e..bd311bb26 100644 --- a/src/css/ionic-migration.css +++ b/src/css/ionic-migration.css @@ -61,24 +61,22 @@ .bct { background-color: transparent !important; - margin-top: -25px; - padding-bottom: 30px; - right: -24px !important; - border-width: 0px; + margin-bottom: 15px !important; } .r0 { right: 0px !important; } -.item-toggle .toggle { - right: 28px; +.item { + margin: 0; + border: none; + border-bottom: 1px solid #E9E9EC; } .toggle-label { color: rgb(41, 55, 68); font-size: 14px; - margin-left: 5px; } button, .button { diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 9ff8defdf..af5a44cd9 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -275,7 +275,6 @@ angular.module('copayApp.controllers').controller('importController', } account = account - 1; } - var isMultisig = form.isMultisig.$modelValue; switch (self.seedSourceId) { case ('ledger'): @@ -284,7 +283,7 @@ angular.module('copayApp.controllers').controller('importController', break; case ('trezor'): ongoingProcess.set('connectingtrezor', true); - self.importTrezor(account, isMultisig); + self.importTrezor(account, $scope.isMultisig); break; default: throw ('Error: bad source id'); diff --git a/src/js/routes.js b/src/js/routes.js index 7dae27585..55f1581ee 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -536,8 +536,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $ionicPlatform.ready(function() { if (platformInfo.isCordova) { - ionic.Platform.fullScreen(true, false); - $ionicPlatform.registerBackButtonAction(function(event) { event.preventDefault(); }, 100); diff --git a/src/sass/main.scss b/src/sass/main.scss index 1773dde88..b72e4d541 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -111,7 +111,7 @@ h4.title a { } .preferences ul li { - padding: 13px 20px; + padding: 16px 10px 16px 16px; border-bottom: 1px solid #E9E9EC; } @@ -715,6 +715,10 @@ ul.manage li { padding: 10px; } +.p10i { + padding: 10px !important; +} + .p10b { padding-bottom: 10px; }