I prefer icons on header

4 files changed, 21 insertions, 138 deletions

diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss
index 09ff0747470..1f3d3d3d389 100644
--- a/app/assets/stylesheets/themes/ui_basic.scss
+++ b/app/assets/stylesheets/themes/ui_basic.scss
@@ -15,4 +15,22 @@
       color: $blue_link;
     }
   }
+
+  .app_logo {
+    .separator {
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+
+  .separator {
+    float: left;
+    height: 60px;
+    width: 1px;
+    background: white;
+    border-left: 1px solid #DDD;
+    margin-top: -10px;
+    margin-left: 10px;
+    margin-right: 10px;
+  }
 }
diff --git a/app/assets/stylesheets/themes/ui_color.scss b/app/assets/stylesheets/themes/ui_color.scss
index 4497892daa7..8c60fabb3a7 100644
--- a/app/assets/stylesheets/themes/ui_color.scss
+++ b/app/assets/stylesheets/themes/ui_color.scss
@@ -8,61 +8,16 @@
  *
  */
 .ui_color {
-
   /*
    *  Application Header
    *
    */
   header {
-
+    @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
         background: #657;
-        border-bottom: 1px solid #AAA;
-
-        .nav > li > a {
-          color: #fff;
-          text-shadow: 0 1px 0 #111;
-        }
       }
     }
-
-    .search {
-      float: right;
-      margin-right: 45px;
-      .search-input {
-        border: 1px solid #aaa;
-        background-color: #D2D5DA;
-        background-color: rgba(255, 255, 255, 0.5);
-
-        &:focus {
-          background-color: white;
-        }
-      }
-    }
-    .search-input::-webkit-input-placeholder {
-      color: #666;
-    }
-    .app_logo {
-      a {
-        h1 {
-          background: url('logo_white.png') no-repeat 0px 2px;
-          color:#fff;
-          text-shadow: 0 1px 1px #111;
-        }
-      }
-      .separator {
-        display:none;
-      }
-
-    }
-    .project_name {
-      color:#fff;
-      text-shadow: 0 1px 1px #111;
-    }
   }
-  /*
-   *  End of Application Header
-   *
-   */
 }
diff --git a/app/assets/stylesheets/themes/ui_gray.scss b/app/assets/stylesheets/themes/ui_gray.scss
index 5ee2b0ddfe3..e80137a69c8 100644
--- a/app/assets/stylesheets/themes/ui_gray.scss
+++ b/app/assets/stylesheets/themes/ui_gray.scss
@@ -8,61 +8,16 @@
  *
  */
 .ui_gray {
-
   /*
    *  Application Header
    *
    */
   header {
-
+    @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
         background: #708090;
-        border-bottom: 1px solid #AAA;
-
-        .nav > li > a {
-          color: #fff;
-          text-shadow: 0 1px 0 #111;
-        }
       }
     }
-
-    .search {
-      float: right;
-      margin-right: 45px;
-      .search-input {
-        border: 1px solid #aaa;
-        background-color: #D2D5DA;
-        background-color: rgba(255, 255, 255, 0.5);
-
-        &:focus {
-          background-color: white;
-        }
-      }
-    }
-    .search-input::-webkit-input-placeholder {
-      color: #666;
-    }
-    .app_logo {
-      a {
-        h1 {
-          background: url('logo_white.png') no-repeat 0px 2px;
-          color:#fff;
-          text-shadow: 0 1px 1px #111;
-        }
-      }
-      .separator {
-        display:none;
-      }
-
-    }
-    .project_name {
-      color:#fff;
-      text-shadow: 0 1px 1px #111;
-    }
   }
-  /*
-   *  End of Application Header
-   *
-   */
 }
diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss
index 0bb14cdd7d7..32b5ad7d968 100644
--- a/app/assets/stylesheets/themes/ui_modern.scss
+++ b/app/assets/stylesheets/themes/ui_modern.scss
@@ -8,61 +8,16 @@
  *
  */
 .ui_modern {
-
   /*
    *  Application Header
    *
    */
   header {
-
+    @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
         background: #567;
-        border-bottom: 1px solid #AAA;
-
-        .nav > li > a {
-          color: #fff;
-          text-shadow: 0 1px 0 #111;
-        }
       }
     }
-
-    .search {
-      float: right;
-      margin-right: 45px;
-      .search-input {
-        border: 1px solid #aaa;
-        background-color: #D2D5DA;
-        background-color: rgba(255, 255, 255, 0.5);
-
-        &:focus {
-          background-color: white;
-        }
-      }
-    }
-    .search-input::-webkit-input-placeholder {
-      color: #666;
-    }
-    .app_logo {
-      a {
-        h1 {
-          background: url('logo_white.png') no-repeat 0px 2px;
-          color:#fff;
-          text-shadow: 0 1px 1px #111;
-        }
-      }
-      .separator {
-        display:none;
-      }
-
-    }
-    .project_name {
-      color:#fff;
-      text-shadow: 0 1px 1px #111;
-    }
   }
-  /*
-   *  End of Application Header
-   *
-   */
 }