Work on themes a bit

9 files changed, 26 insertions, 25 deletions

diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index ba92e8554cb..98c010ed72d 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -120,7 +120,7 @@ header {
         border-bottom: 1px solid #AAA;
 
         .nav > li > a {
-          color: #DDD;
+          color: #AAA;
           text-shadow: 0 1px 0 #444;
 
           &:hover {
@@ -130,6 +130,10 @@ header {
       }
     }
 
+    .turbolink-spinner {
+      color: #FFF;
+    }
+
     .search {
       .search-input {
         background-color: #D2D5DA;
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index fc1f1bc79b4..7d09f548589 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -1,4 +1,5 @@
 .main-nav {
+  background: #f5f5f5;
   margin: 30px 0;
   margin-top: 0;
   padding-top: 4px;
diff --git a/app/assets/stylesheets/sections/themes.scss b/app/assets/stylesheets/sections/themes.scss
index 4e5eaf575ae..c5487f9f40c 100644
--- a/app/assets/stylesheets/sections/themes.scss
+++ b/app/assets/stylesheets/sections/themes.scss
@@ -27,15 +27,15 @@
       }
 
       &.modern {
-        background: #567;
+        background: #345;
       }
 
       &.gray {
-        background: #708090;
+        background: #373737;
       }
 
       &.violet {
-        background: #657;
+        background: #547;
       }
     }
   }
diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss
index b0ee94ef34a..30f0bbaf4c8 100644
--- a/app/assets/stylesheets/themes/ui_basic.scss
+++ b/app/assets/stylesheets/themes/ui_basic.scss
@@ -8,4 +8,8 @@
     background: #F9F9F9;
     border-left: 1px solid #DDD;
   }
+
+  .main-nav {
+    background: #FFF;
+  }
 }
diff --git a/app/assets/stylesheets/themes/ui_color.scss b/app/assets/stylesheets/themes/ui_color.scss
index d7a554ff9e5..07e854b73d8 100644
--- a/app/assets/stylesheets/themes/ui_color.scss
+++ b/app/assets/stylesheets/themes/ui_color.scss
@@ -16,15 +16,15 @@
     @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
-        background: #657;
+        background: #547;
         .app_logo {
           &:hover {
-            background-color: #6A5A7A;
+            background-color: #435;
           }
         }
         .separator {
-          background: #546;
-          border-left: 1px solid #706080;
+          background: #435;
+          border-left: 1px solid #658;
         }
       }
     }
diff --git a/app/assets/stylesheets/themes/ui_gray.scss b/app/assets/stylesheets/themes/ui_gray.scss
index f0547c72157..4f88c631e4d 100644
--- a/app/assets/stylesheets/themes/ui_gray.scss
+++ b/app/assets/stylesheets/themes/ui_gray.scss
@@ -16,15 +16,15 @@
     @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
-        background: #708090;
+        background: #373737;
         .app_logo {
           &:hover {
-            background-color: #6A7A8A;
+            background-color: #272727;
           }
         }
         .separator {
-          background: #607080;
-          border-left: 1px solid #8090A0;
+          background: #272727;
+          border-left: 1px solid #474747;
         }
       }
     }
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index d40a02206e7..a2b8c21ea11 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -23,20 +23,12 @@
             background-color: #373D47;
           }
         }
-        .nav > li > a { color: #AAA; }
       }
     }
-    .turbolink-spinner {
-      color: #FFF;
-    }
 
     .separator {
       background: #31363E;
       border-left: 1px solid #666;
     }
   }
-
-  .main-nav {
-    background: #f5f5f5;
-  }
 }
diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss
index a5bf414c443..68318f93016 100644
--- a/app/assets/stylesheets/themes/ui_modern.scss
+++ b/app/assets/stylesheets/themes/ui_modern.scss
@@ -16,15 +16,15 @@
     @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
-        background: #567;
+        background: #345;
         .app_logo {
           &:hover {
-            background-color: #516171;
+            background-color: #234;
           }
         }
         .separator {
-          background: #456;
-          border-left: 1px solid #678;
+          background: #234;
+          border-left: 1px solid #456;
         }
       }
     }
diff --git a/app/views/profiles/design.html.haml b/app/views/profiles/design.html.haml
index 9ada69c9d5d..9b6cace4e89 100644
--- a/app/views/profiles/design.html.haml
+++ b/app/views/profiles/design.html.haml
@@ -24,7 +24,7 @@
       = label_tag do
         .prev.gray
         = f.radio_button :theme_id, 4
-        SlateGray
+        Gray
 
       = label_tag do
         .prev.violet