From 3a1129e1f8901410428361f9f1ff81c985e5c2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 26 Sep 2016 11:26:10 -0300 Subject: [PATCH 1/5] add incomplete wallets to receive tab --- public/views/includes/wallets.html | 4 -- public/views/tab-receive.html | 74 +++++++++++++++++++----------- src/js/controllers/tab-receive.js | 22 +++++++-- src/sass/views/tab-receive.scss | 14 ++++++ 4 files changed, 78 insertions(+), 36 deletions(-) diff --git a/public/views/includes/wallets.html b/public/views/includes/wallets.html index 1c2a7a569..75f8b9efc 100644 --- a/public/views/includes/wallets.html +++ b/public/views/includes/wallets.html @@ -8,10 +8,6 @@ {{wallet.m}}-of-{{wallet.n}} - - Incomplete - - diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index 7a1283d4b..c445a2624 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -8,42 +8,62 @@ -
-
-
- -
- ... +
+
+
+
+ Incomplete wallet
-
- Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup. +
+ All signing devices must be added to this multisig wallet before bitcoin addresses can be created. +
+
+
-
-
-
-
- - Share +
+
+
+ + address not yet available +
-
-
- - Next Address +
+
+
+
+ +
+ ... +
-
-
-
-
- - ... - {{addr}} +
+
+
+ + Share +
+
+
+
+ + Next Address +
-
-
+
+
+
+ + ... + {{addr}} +
+
+
+ +
No Wallet diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 5849cd77b..5cb57dcb2 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, $ionicModal, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) { +angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, $ionicModal, $state, $ionicHistory, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) { $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; @@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }; $scope.setAddress = function(forceNew) { - if ($scope.generatingAddress) return; + if ($scope.generatingAddress || !$scope.wallet.isComplete()) return; $scope.addr = null; $scope.generatingAddress = true; @@ -46,9 +46,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.$on("$ionicView.beforeEnter", function(event, data) { if (!$scope.isCordova) $scope.checkTips(); - $scope.wallets = profileService.getWallets({ - onlyComplete: true - }); + $scope.wallets = profileService.getWallets(); $scope.$on('Wallet/Changed', function(event, wallet) { if (!wallet) { $log.debug('No wallet provided'); @@ -59,4 +57,18 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.setAddress(); }); }); + + $scope.goCopayers = function() { + $ionicHistory.removeBackView(); + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.home'); + $timeout(function() { + $state.transitionTo('tabs.copayers', { + walletId: $scope.wallet.credentials.walletId + }); + }, 100); + }; + }); diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index aa66bc642..baa2099d0 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -9,6 +9,20 @@ } #address { background: #fff; + .incomplete { + padding: 50px; + .title { + padding: 20px; + font-size: 25px; + color: #444; + } + .subtitle { + padding: 20px; + color: #444; + } + .button { + } + } .item { border: none; font-size: .8rem; From 7969a40645cb6e15bcd8215b8da3796a84064e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 26 Sep 2016 13:05:15 -0300 Subject: [PATCH 2/5] backup needed modal --- public/views/includes/backupNeededPopup.html | 27 ++++++++++++++++++++ public/views/tab-receive.html | 7 ++++- src/js/controllers/backup.js | 10 +------- src/js/controllers/tab-receive.js | 24 +++++++++++++++++ src/js/routes.js | 20 +++++++++++++-- src/sass/views/includes/modals/modals.scss | 20 +++++++++++++-- src/sass/views/tab-receive.scss | 10 ++++++++ 7 files changed, 104 insertions(+), 14 deletions(-) create mode 100644 public/views/includes/backupNeededPopup.html diff --git a/public/views/includes/backupNeededPopup.html b/public/views/includes/backupNeededPopup.html new file mode 100644 index 000000000..c74742e06 --- /dev/null +++ b/public/views/includes/backupNeededPopup.html @@ -0,0 +1,27 @@ + diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index c445a2624..3ab6158aa 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -31,7 +31,12 @@
-
+
+
+ Wallet not backed up +
+
+
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index ea28fdaad..62170a6c7 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -49,15 +49,6 @@ angular.module('copayApp.controllers').controller('backupController', }, 10); }; - $scope.goBack = function() { - if ($scope.step == 1) { - if ($stateParams.fromOnboarding) $state.go('onboarding.backupRequest'); - else $state.go('wallet.preferences'); - } else { - $scope.goToStep($scope.step - 1); - } - }; - var backupError = function(err) { ongoingProcess.set('validatingWords', false); $log.debug('Failed to verify backup: ', err); @@ -198,6 +189,7 @@ angular.module('copayApp.controllers').controller('backupController', walletId: $stateParams.walletId, fromOnboarding: true }); + else if ($stateParams.fromReceive) $state.go('tabs.receive'); else $state.go('tabs.preferences', { walletId: $stateParams.walletId }); diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 5cb57dcb2..b17468ae5 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -71,4 +71,28 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }, 100); }; + $scope.openBackupNeededPopup = function() { + $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', { + scope: $scope, + backdropClickToClose: false, + hardwareBackButtonClose: false + }).then(function(modal) { + $scope.BackupNeededPopup = modal; + $scope.BackupNeededPopup.show(); + }); + }; + + $scope.closeBackupNeededModal = function() { + $scope.BackupNeededPopup.hide(); + $scope.BackupNeededPopup.remove(); + }; + + $scope.goToBackupFlow = function() { + $scope.BackupNeededPopup.hide(); + $scope.BackupNeededPopup.remove(); + $state.go('tabs.receive.backup', { + fromReceive: true, + walletId: $scope.wallet.credentials.walletId + }); + }; }); diff --git a/src/js/routes.js b/src/js/routes.js index dea85a6e8..6dde26bca 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -236,7 +236,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('tabs.send.amount', { + .state('tabs.send.amount', { url: '/amount/:isWallet/:toAddress/:toName/:toEmail', views: { 'tab-send@tabs': { @@ -551,7 +551,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr /* * - *TO DO + * Copayers * */ @@ -565,6 +565,22 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) + /* + * + * Back flow from receive + * + */ + + .state('tabs.receive.backup', { + url: '/backup/:fromReceive/:walletId', + views: { + 'tab-receive@tabs': { + controller: 'backupController', + templateUrl: 'views/backup.html' + } + } + }) + /* * * Onboarding diff --git a/src/sass/views/includes/modals/modals.scss b/src/sass/views/includes/modals/modals.scss index 63b8af5fe..7c3aca25f 100644 --- a/src/sass/views/includes/modals/modals.scss +++ b/src/sass/views/includes/modals/modals.scss @@ -9,7 +9,12 @@ transform: translate(-50%, -50%); border-radius: .25rem; &-header { - background: rgb(1, 209, 162); + &-success { + background: rgb(1, 209, 162); + } + &-warning { + background: orange; + } padding: 1rem; border-radius: .25rem .25rem 0 0; min-height: 120px; @@ -26,6 +31,12 @@ background-size: contain; margin-top: .3rem; } + &-img-warning { + background-image: url('../img/onboarding-success.svg'); + height: 6rem; + background-size: contain; + margin-top: .3rem; + } } &-content { padding: .5rem .8rem; @@ -42,11 +53,16 @@ font-weight: 200; } } - &-content-success{ + &-content-success { button{ color:rgb(23, 174, 140) !important; } } + &-content-warning { + button{ + color: orange !important; + } + } } .modal-backdrop.active { diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index baa2099d0..e24ba8739 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -43,6 +43,16 @@ } &-gen-address {} } + .qr { + padding: 30px; + } + .backup { + background-color: orange; + color: #fff; + i { + padding: 10px; + } + } } #wallets { position: relative; From 82211a5812a179cf4a0777f0c078773b1abfeadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 26 Sep 2016 14:16:17 -0300 Subject: [PATCH 3/5] fixes --- src/js/controllers/tab-receive.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index b17468ae5..aec3c8b20 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -34,14 +34,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.addr = null; $scope.generatingAddress = true; - $timeout(function() { - walletService.getAddress($scope.wallet, forceNew, function(err, addr) { - $scope.generatingAddress = false; - if (err) popupService.showAlert(gettextCatalog.getString('Error'), err); - $scope.addr = addr; - $scope.$apply(); - }); - }, 1); + walletService.getAddress($scope.wallet, forceNew, function(err, addr) { + $scope.generatingAddress = false; + if (err) popupService.showAlert(gettextCatalog.getString('Error'), err); + $scope.addr = addr; + }); }; $scope.$on("$ionicView.beforeEnter", function(event, data) { @@ -52,9 +49,12 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $log.debug('No wallet provided'); return; } - $scope.wallet = wallet; - $log.debug('Wallet changed: ' + wallet.name); - $scope.setAddress(); + $timeout(function() { + $scope.wallet = wallet; + $log.debug('Wallet changed: ' + wallet.name); + $scope.setAddress(); + $scope.$apply(); + }); }); }); From 33c7e2b297a843f7ff0092264530bbfb4c17b47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 26 Sep 2016 16:11:45 -0300 Subject: [PATCH 4/5] add backup warning view to backup flow --- ...-backup-warning.svg => backup-warning.svg} | 0 ...ng-no-screenshot.svg => no-screenshot.svg} | 0 public/views/backup.html | 12 +++--- .../views/{onboarding => }/backupWarning.html | 6 +-- public/views/includes/backupNeededPopup.html | 4 +- public/views/onboarding/backupRequest.html | 2 +- public/views/preferences.html | 2 +- public/views/tab-receive.html | 2 +- src/js/controllers/backup.js | 25 ++++-------- .../controllers/onboarding/backupWarning.js | 33 ++++++++++------ src/js/controllers/tab-receive.js | 27 +++++++------ src/js/routes.js | 38 +++++++++++++------ src/js/services/profileService.js | 20 ++++++++++ src/js/services/storageService.js | 8 ++++ ...ackup-warning.scss => backup-warning.scss} | 8 ++-- .../modals/screenshot-warning-model.scss | 4 +- src/sass/views/onboarding/onboarding.scss | 4 +- 17 files changed, 123 insertions(+), 72 deletions(-) rename public/img/{onboarding-backup-warning.svg => backup-warning.svg} (100%) rename public/img/{onboarding-no-screenshot.svg => no-screenshot.svg} (100%) rename public/views/{onboarding => }/backupWarning.html (75%) rename src/sass/views/{onboarding/onboard-backup-warning.scss => backup-warning.scss} (89%) diff --git a/public/img/onboarding-backup-warning.svg b/public/img/backup-warning.svg similarity index 100% rename from public/img/onboarding-backup-warning.svg rename to public/img/backup-warning.svg diff --git a/public/img/onboarding-no-screenshot.svg b/public/img/no-screenshot.svg similarity index 100% rename from public/img/onboarding-no-screenshot.svg rename to public/img/no-screenshot.svg diff --git a/public/views/backup.html b/public/views/backup.html index ab45d0ec0..4453e17d7 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,10 +1,10 @@ - + - - - + + {{viewTitle}} + + +
diff --git a/public/views/onboarding/backupWarning.html b/public/views/backupWarning.html similarity index 75% rename from public/views/onboarding/backupWarning.html rename to public/views/backupWarning.html index d588060bc..55464baac 100644 --- a/public/views/onboarding/backupWarning.html +++ b/public/views/backupWarning.html @@ -1,7 +1,7 @@ - + - @@ -18,7 +18,7 @@

- +

diff --git a/public/views/includes/backupNeededPopup.html b/public/views/includes/backupNeededPopup.html index c74742e06..dc9747b55 100644 --- a/public/views/includes/backupNeededPopup.html +++ b/public/views/includes/backupNeededPopup.html @@ -10,14 +10,14 @@

diff --git a/public/views/onboarding/backupRequest.html b/public/views/onboarding/backupRequest.html index df33a168e..a76125f41 100644 --- a/public/views/onboarding/backupRequest.html +++ b/public/views/onboarding/backupRequest.html @@ -19,7 +19,7 @@
+ ui-sref="onboarding.backupWarning({from: 'onboarding.backupRequest', walletId: walletId})" translate>Backup wallet
diff --git a/public/views/preferences.html b/public/views/preferences.html index c147ef54b..41319fa36 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -40,7 +40,7 @@
Security
- + Backup diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index 3ab6158aa..d8f43983b 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -31,7 +31,7 @@
-
+
Wallet not backed up
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 62170a6c7..01eeae6ec 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -84,13 +84,15 @@ angular.module('copayApp.controllers').controller('backupController', $scope.closeBackupResultModal = function() { $scope.confirmBackupModal.hide(); + $scope.confirmBackupModal.remove(); - if ($stateParams.fromOnboarding) { - $state.go('onboarding.disclaimer'); - } else { - $ionicHistory.removeBackView(); - $state.go('tabs.home'); - } + profileService.isDisclaimerAccepted(function(val) { + if (val) { + $ionicHistory.removeBackView(); + $state.go('tabs.home'); + } + else $state.go('onboarding.disclaimer'); + }); }; var confirm = function(cb) { @@ -184,17 +186,6 @@ angular.module('copayApp.controllers').controller('backupController', $scope.selectComplete = false; }; - $scope.backupGoBack = function() { - if ($stateParams.fromOnboarding) $state.go('onboarding.backupWarning', { - walletId: $stateParams.walletId, - fromOnboarding: true - }); - else if ($stateParams.fromReceive) $state.go('tabs.receive'); - else $state.go('tabs.preferences', { - walletId: $stateParams.walletId - }); - }; - $scope.$on("$ionicView.enter", function(event, data) { $scope.deleted = isDeletedSeed(); if ($scope.deleted) { diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js index 6b83ee964..260c5eebd 100644 --- a/src/js/controllers/onboarding/backupWarning.js +++ b/src/js/controllers/onboarding/backupWarning.js @@ -5,20 +5,31 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun $scope.walletId = $stateParams.walletId; $scope.openPopup = function() { $ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', { - scope: $scope, - backdropClickToClose: false, - hardwareBackButtonClose: false - }).then(function(modal) { - $scope.warningModal = modal; - $scope.warningModal.show(); - }); + scope: $scope, + backdropClickToClose: false, + hardwareBackButtonClose: false + }).then(function(modal) { + $scope.warningModal = modal; + $scope.warningModal.show(); + }); $scope.close = function() { $scope.warningModal.hide(); - $state.go('onboarding.backup', { - walletId: $stateParams.walletId, - fromOnboarding: true - }); + if ($stateParams.from == 'onboarding.backupRequest') + $state.go('onboarding.backup', { + walletId: $stateParams.walletId + }); + else + $state.go($stateParams.from + '.backup', { + walletId: $stateParams.walletId + }); }; } + + $scope.goBack = function() { + $state.go($stateParams.from, { + walletId: $stateParams.walletId + }); + }; + }); diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index aec3c8b20..73d670693 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -53,6 +53,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.wallet = wallet; $log.debug('Wallet changed: ' + wallet.name); $scope.setAddress(); + if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal(); $scope.$apply(); }); }); @@ -71,28 +72,32 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }, 100); }; - $scope.openBackupNeededPopup = function() { + $scope.openBackupNeededModal = function() { $ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', { scope: $scope, backdropClickToClose: false, hardwareBackButtonClose: false }).then(function(modal) { - $scope.BackupNeededPopup = modal; - $scope.BackupNeededPopup.show(); + $scope.BackupNeededModal = modal; + $scope.BackupNeededModal.show(); }); }; - $scope.closeBackupNeededModal = function() { - $scope.BackupNeededPopup.hide(); - $scope.BackupNeededPopup.remove(); + $scope.close = function() { + $scope.BackupNeededModal.hide(); + $scope.BackupNeededModal.remove(); + profileService.setBackupNeededModalFlag($scope.wallet.credentials.walletId); + }; + + $scope.doBackup = function() { + $scope.close(); + $scope.goToBackupFlow(); }; $scope.goToBackupFlow = function() { - $scope.BackupNeededPopup.hide(); - $scope.BackupNeededPopup.remove(); - $state.go('tabs.receive.backup', { - fromReceive: true, + $state.go('tabs.receive.backupWarning', { + from: 'tabs.receive', walletId: $scope.wallet.credentials.walletId }); - }; + } }); diff --git a/src/js/routes.js b/src/js/routes.js index 6dde26bca..9b37ce0a9 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -432,6 +432,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('tabs.preferences.backupWarning', { + url: '/backupWarning/:from', + views: { + 'tab-settings@tabs': { + templateUrl: 'views/backupWarning.html' + } + } + }) .state('tabs.preferences.backup', { url: '/backup', views: { @@ -571,15 +579,23 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('tabs.receive.backup', { - url: '/backup/:fromReceive/:walletId', - views: { - 'tab-receive@tabs': { - controller: 'backupController', - templateUrl: 'views/backup.html' + .state('tabs.receive.backupWarning', { + url: '/backupWarning/:from/:walletId', + views: { + 'tab-receive@tabs': { + templateUrl: 'views/backupWarning.html' + } } - } - }) + }) + .state('tabs.receive.backup', { + url: '/backup/:walletId', + views: { + 'tab-receive@tabs': { + controller: 'backupController', + templateUrl: 'views/backup.html' + } + } + }) /* * @@ -633,15 +649,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('onboarding.backupWarning', { - url: '/backupWarning/:walletId', + url: '/backupWarning/:from/:walletId', views: { 'onboarding': { - templateUrl: 'views/onboarding/backupWarning.html' + templateUrl: 'views/backupWarning.html' } } }) .state('onboarding.backup', { - url: '/backup/:walletId/:fromOnboarding', + url: '/backup/:walletId', views: { 'onboarding': { templateUrl: 'views/backup.html', diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index c6bc0d3d0..bb1e15084 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -38,6 +38,22 @@ angular.module('copayApp.services') }); } + root.setBackupNeededModalFlag = function(walletId) { + storageService.setBackupNeededModalFlag(walletId, true, function(err) { + if (err) $log.error(err); + $log.debug('Backup warning modal flag stored'); + root.wallet[walletId].showBackupNeededModal = false; + }); + }; + + function _showBackupNeededModal(wallet, cb) { + storageService.getBackupNeededModalFlag(wallet.credentials.walletId, function(err, val) { + if (err) $log.error(err); + if (val) return cb(false); + return cb(true); + }); + }; + root.setBackupFlag = function(walletId) { storageService.setBackupFlag(walletId, function(err) { if (err) $log.error(err); @@ -101,6 +117,10 @@ angular.module('copayApp.services') wallet.balanceHidden = val; }); + _showBackupNeededModal(wallet, function(val) { + wallet.showBackupNeededModal = val; + }); + wallet.removeAllListeners(); wallet.on('report', function(n) { diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 4df36dab1..a1daeb36e 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -365,6 +365,14 @@ angular.module('copayApp.services') storage.get('receiveTips', cb); }; + root.setBackupNeededModalFlag = function(walletId, val, cb) { + storage.set('showBackupNeededModal-' + walletId, val, cb); + }; + + root.getBackupNeededModalFlag = function(walletId, cb) { + storage.get('showBackupNeededModal-' + walletId, cb); + }; + root.setAmazonGiftCards = function(network, gcs, cb) { storage.set('amazonGiftCards-' + network, gcs, cb); }; diff --git a/src/sass/views/onboarding/onboard-backup-warning.scss b/src/sass/views/backup-warning.scss similarity index 89% rename from src/sass/views/onboarding/onboard-backup-warning.scss rename to src/sass/views/backup-warning.scss index af09d351f..ee1017bcc 100644 --- a/src/sass/views/onboarding/onboard-backup-warning.scss +++ b/src/sass/views/backup-warning.scss @@ -1,4 +1,4 @@ -#onboarding-backup-warning{ +#backup-warning{ .warning{ margin:4rem auto 1rem; height: 11rem; @@ -21,7 +21,7 @@ } @media (max-width: 400px){ - #onboarding-backup-warning{ + #backup-warning{ .warning{ margin: 2rem auto 1rem; height: 8rem; @@ -45,10 +45,10 @@ } } @media (max-height: 540px){ - #onboarding-backup-warning{ + #backup-warning{ .cta-buttons{ float:left; position: relative; } } -} \ No newline at end of file +} diff --git a/src/sass/views/includes/modals/screenshot-warning-model.scss b/src/sass/views/includes/modals/screenshot-warning-model.scss index e979e9ff8..64662f0ef 100644 --- a/src/sass/views/includes/modals/screenshot-warning-model.scss +++ b/src/sass/views/includes/modals/screenshot-warning-model.scss @@ -1,7 +1,7 @@ #screenshot-warning-modal{ .popup-modal-header{ &-img{ - background-image: url('../img/onboarding-no-screenshot.svg'); + background-image: url('../img/no-screenshot.svg'); } } -} \ No newline at end of file +} diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index c44f79878..7dad89ace 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -101,7 +101,7 @@ max-width: 600px !important; } button{ - max-width: 400px !important; + max-width: 400px !important; } } } @@ -112,6 +112,6 @@ @import "onboard-tour"; @import "onboard-collect-email"; @import "onboard-backup-request"; -@import "onboard-backup-warning"; +@import "../backup-warning"; @import "onboard-disclaimer"; @import "onboard-push-notifications"; From 3c5022cb6a6af698747492f16dcc5d073fc422d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 26 Sep 2016 16:19:26 -0300 Subject: [PATCH 5/5] fix --- public/views/includes/screenshotWarningModal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/includes/screenshotWarningModal.html b/public/views/includes/screenshotWarningModal.html index 0994ea628..bd7f2abba 100644 --- a/public/views/includes/screenshotWarningModal.html +++ b/public/views/includes/screenshotWarningModal.html @@ -1,5 +1,5 @@