Import and settings

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;
 }
 

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;
     };

views/import.html

@@ -20,7 +20,7 @@
           <input type="password" class="form-control" placeholder="Your wallet password" name="password" ng-model="password" required>
 
           <div class="text-right">
-            <a class="back-button m20r" href="/signin">&laquo; Back</a>
+            <a class="back-button text-white m20r" href="/signin">&laquo; Back</a>
             <button type="submit" class="button primary m0" ng-disabled="importForm.$invalid" loading="Importing">
               Import backup
             </button>

views/settings.html

@@ -1,8 +1,11 @@
-<div class="settings" ng-controller="SettingsController">
-  <form name="settingsForm">
-    <div class="row">
-      <div class="small-12 medium-8 medium-centered large-6 large-centered columns">
-        <h3>{{title}}</h3>
+<div class="row settings" ng-controller="SettingsController">
+  <div class="large-4 columns logo-setup text-center">
+    <img src="../img/logo-negative-beta.svg" alt="Copay">
+  </div>
+  <div class="large-8 columns line-dashed-setup-v">
+    <div class="box-setup">
+      <h1 class="text-white line-sidebar-b">{{title}}</h1>
+      <form name="settingsForm">
         <fieldset>
           <legend>Bitcoin Network</legend>
           <input id="network-name" type="checkbox" ng-model="networkName"
@@ -36,9 +39,12 @@
           <label for="insight-secure">Use SSL</label>
 
           <p class="small">
-          Insight API server is open-source software.  You can run your own instance, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
+          Insight API server is open-source software.  You can run your own
+          instance, check <a href="http://insight.is" target="_blank">Insight
+            API Homepage</a></p>
 
         </fieldset>
+
         <fieldset>
           <legend>PeerJS server</legend>
           <label for="peerjs-key">Key</label>
@@ -50,22 +56,19 @@
           <input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control">
           <label for="peerjs-secure">Use SSL</label>
 
-
           <p class="small">
           PeerJS Server is open-source software.  You can run your own instance, or use PeerJS Server cloud. Check <a href="http://peerjs.com" target="_blank">PeerJS Server</a>
+          </p>
         </fieldset>
-      </div>
-    </div>
-    <div class="row">
-      <div class="large-6 medium-8 small-12 large-centered medium-centered columns">
-        <div class="line-dashed">
-          <a class="back-button" href="/signin" ng-hide="$root.wallet">&laquo; Back</a>
-          <button type="submit" class="button primary radius right ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
+
+        <div class="text-right">
+          <a class="back-button text-white m20r" href="/signin" ng-hide="$root.wallet">&laquo; Back</a>
+          <button type="submit" class="button primary m0 ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
             Save
           </button>
         </div>
-      </div>
+      </form>
     </div>
-  </form>
+  </div>
 </div>