diff --git a/css/main.css b/css/main.css index f2b13e3ba..c81640c30 100644 --- a/css/main.css +++ b/css/main.css @@ -103,7 +103,10 @@ a:hover { color: #2980b9; } -.signin input, .setup input { +.signin input, +.setup input, +.import input, +.settings input { background: #2C3E50 !important; -moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; @@ -111,7 +114,10 @@ a:hover { color: #7A8C9E !important; } -.signin select, .setup select { +.signin select, +.setup select, +.import select, +.settings select { background: #2C3E50 !important; border: 0 !important; color: #7A8C9E !important; @@ -180,19 +186,24 @@ a:hover { .signin, .setup, .import, .settings { margin-top: 15%; + color: #fff; } -.import fieldset { +.import fieldset, .settings fieldset { border: 1px solid #3C5269; } -.import fieldset legend { +.import fieldset legend, .settings fieldset legend { background: transparent; color: #fff; font-weight: normal; } -.import input[type="file"], .import label, .import label small { +.import input[type="file"], +.import label, +.import label small, +.settings label, +.settings label small { color: #fff; } diff --git a/js/controllers/settings.js b/js/controllers/settings.js index cb1c7852c..bb4d6bcbd 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -74,7 +74,7 @@ angular.module('copayApp.controllers').controller('SettingsController', unitToSatoshi: $scope.selectedUnit.value, })); - var target = ($window.location.origin !== 'null' ? $window.location.origin : '') + $window.location.pathname; + var target = ($window.location.origin !== 'null' ? $window.location.origin : '') + '/signin'; $window.location.href = target; }; diff --git a/views/import.html b/views/import.html index 38c522b44..cc3c16745 100644 --- a/views/import.html +++ b/views/import.html @@ -20,7 +20,7 @@