diff --git a/css/src/main.css b/css/src/main.css index 4fba88f6a..c1f1c83ab 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -356,14 +356,10 @@ a:hover { background-color: #F8F8FB; } -.pin-main { - background-color: #2C3E50; -} - .logo-setup { text-align: center; - padding: 2rem 0; - color: #fff; + margin: 0 0 2rem 0; + color: #8597A7; } .box-setup { @@ -375,7 +371,7 @@ a:hover { .box-setup-footer { overflow: hidden; - margin-top: 2rem; + margin-top: 1rem; padding: 1rem 0 0; border-top: 1px solid #425467; font-size: 12px; @@ -1724,6 +1720,11 @@ a.text-warning:hover {color: #FD7262;} color: #fff; } +.home, .settings, .createProfile, .import-profile { + overflow: hidden; + padding: 2rem 0; +} + .tabbable { border: 2px solid #213140; border-radius: 3px; @@ -1793,6 +1794,8 @@ a.text-warning:hover {color: #FD7262;} z-index: 999; padding-top: 20%; text-align: center; + padding-left: 10%; + padding-right: 10%; } .clipo { diff --git a/css/src/mobile.css b/css/src/mobile.css index 9e7729659..5034328b9 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -7,12 +7,7 @@ @media (max-width: 1024px) { .logo-setup { - margin: 0; - padding: 1rem 0; - } - - .home, .open, .join, .waiting-copayers, .setup, .import, .settings { - margin-top: 0; + margin: 0 0 1rem 0; } .sidebar { @@ -48,6 +43,11 @@ background: #2C3E50; } + .home, .settings, .createProfile, .import-profile { + overflow: hidden; + padding: 1rem 0; + } + header { height: 45px; line-height: 110%; @@ -197,10 +197,6 @@ .button, button { padding: 1rem 1.2rem 1.0625rem; } - - .home form { - margin-bottom: 1rem; - } form { margin: 0; diff --git a/index.html b/index.html index 441edb926..bb651ad55 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,10 @@ - +
Loading... @@ -101,7 +104,7 @@ ng-class="{'dni':$root.hideNavigation}" >
-
+
diff --git a/js/controllers/home.js b/js/controllers/home.js index 8db396afe..9a2d99e17 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -72,6 +72,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc var credentials = pinService.get(pin, function(err, credentials) { if (err || !credentials) { $rootScope.starting = false; + $scope.loading = null; $scope.error = 'Wrong PIN'; return; } @@ -164,9 +165,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.askForPin = 1; $rootScope.starting = false; $rootScope.hideNavigation = true; - $timeout(function(){ - $rootScope.$digest(); - }); + $rootScope.$digest(); return; } // no mobile diff --git a/js/controllers/index.js b/js/controllers/index.js new file mode 100644 index 000000000..8a0d4b4ef --- /dev/null +++ b/js/controllers/index.js @@ -0,0 +1,12 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('IndexController', function($scope, go) { + $scope.init = function() { + + }; + + $scope.swipe = function(invert) { + go.swipe(invert); + }; + +}); diff --git a/js/services/go.js b/js/services/go.js index f0a71785d..ac9d9d85b 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -14,6 +14,32 @@ angular.module('copayApp.services').factory('go', function($window, $location) { elem.removeClass('move-left'); }; + var toggleSidebar = function(invert) { + if (typeof document === 'undefined') + return; + + var elem = angular.element(document.querySelector('#off-canvas-wrap')); + var leftbarActive = angular.element(document.getElementsByClassName('move-right')).length; + var rightbarActive = angular.element(document.getElementsByClassName('move-left')).length; + + if (invert) { + if (rightbarActive) { + hideSidebars(); + } + else { + elem.addClass('move-right'); + } + } + else { + if (leftbarActive) { + hideSidebars(); + } + else { + elem.addClass('move-left'); + } + } + }; + root.go = function(path) { var parts = path.split('#'); $location.path(parts[0]); @@ -22,5 +48,9 @@ angular.module('copayApp.services').factory('go', function($window, $location) { hideSidebars(); }; + root.swipe = function(invert) { + toggleSidebar(invert); + }; + return root; }); diff --git a/js/services/pinService.js b/js/services/pinService.js index f320f3a3c..726a2b4f4 100644 --- a/js/services/pinService.js +++ b/js/services/pinService.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.services') - .factory('pinService', function($rootScope, localstorageService) { + .factory('pinService', function($rootScope, $timeout, localstorageService) { var KEY = 'pinDATA'; var SALT = '4gllotIKguqi0EkIslC0'; @@ -57,8 +57,12 @@ angular.module('copayApp.services') set: function(newValue) { this['_' + name] = newValue; scope.error = null; + scope.loading = null; if (newValue && newValue.length == 4) { - return cb(newValue); + scope.loading = true; + $timeout(function() { + return cb(newValue); + }, 30); } }, enumerable: true, diff --git a/views/createProfile.html b/views/createProfile.html index 84a5c83c4..1d79d6622 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -114,16 +114,16 @@
- + Back
- Learn more about this option + + Learn more about this option
-
@@ -155,7 +155,7 @@
- + Back @@ -193,7 +193,7 @@
- + Back diff --git a/views/home.html b/views/home.html index 0b2c47ff0..ceb1f7bcc 100644 --- a/views/home.html +++ b/views/home.html @@ -23,7 +23,7 @@
Copay -
+
@@ -78,7 +78,7 @@
-
+

Enter your PIN

@@ -103,7 +103,9 @@
-
diff --git a/views/importProfile.html b/views/importProfile.html index ce54c3362..33dfef2ad 100644 --- a/views/importProfile.html +++ b/views/importProfile.html @@ -14,8 +14,8 @@
-
- Copay +
+ Copay
@@ -60,10 +60,12 @@
- - - Back - +
+ + + Back + +
diff --git a/views/settings.html b/views/settings.html index 23e42351c..d92320ab3 100644 --- a/views/settings.html +++ b/views/settings.html @@ -1,7 +1,7 @@
-
- Copay +
+ Copay

{{title|translate}}

@@ -71,11 +71,13 @@
- - - Back - -
+
+ + + Back + +
+
Reset settings