diff --git a/css/src/main.css b/css/src/main.css index d0c4b7fc1..b984e347b 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -128,11 +128,15 @@ header .alt-currency { border-bottom-left-radius: 3px; position: absolute; right: 14px; - width: 180px; + width: 220px; list-style-type: none; top: 47px;nt } +.head .menu ul li.divider { + border-bottom: 1px solid #eee; +} + .head .menu ul.hover { background: #FFFFFF; -moz-box-shadow: 0px 1px 2px 0px rgba(0,0,0,0.25); diff --git a/js/controllers/create.js b/js/controllers/create.js index 0f7cd7593..5a96adf46 100644 --- a/js/controllers/create.js +++ b/js/controllers/create.js @@ -9,7 +9,7 @@ angular.module('copayApp.controllers').controller('CreateController', $scope.isMobile = !!window.cordova; $scope.hideAdv = true; $scope.networkName = config.networkName; - $rootScope.title = 'Create a wallet'; + $rootScope.title = 'Add new wallet'; // ng-repeat defined number of times instead of repeating over array? $scope.getNumber = function(num) { diff --git a/js/controllers/join.js b/js/controllers/join.js index 392c43701..0a97826b1 100644 --- a/js/controllers/join.js +++ b/js/controllers/join.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('JoinController', $rootScope.fromSetup = false; $scope.loading = false; $scope.isMobile = !!window.cordova; - $rootScope.title = 'Join a wallet'; + $rootScope.title = 'Join an existent wallet'; // QR code Scanner var cameraInput; diff --git a/js/routes.js b/js/routes.js index f1747c928..7cccf70aa 100644 --- a/js/routes.js +++ b/js/routes.js @@ -76,10 +76,6 @@ angular .when('/profile', { templateUrl: 'views/profile.html', logged: true - }) - .when('/createWallet', { - templateUrl: 'views/createWallet.html', - logged: true }); if (config.developmentFeatures) { diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 24a4c57f8..b4f59e995 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -231,7 +231,7 @@ angular.module('copayApp.services') if (w) { root.setFocusedWallet(w); } else { - $location.path('/createWallet'); + $location.path('/create'); } $timeout(function() { $rootScope.$digest() diff --git a/views/create.html b/views/create.html index 592f47a36..85396b9b0 100644 --- a/views/create.html +++ b/views/create.html @@ -57,10 +57,6 @@