1 files changed, 40 insertions, 45 deletions

diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 8328a5ab9a7..1ad10f98b3d 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -3,18 +3,27 @@
  *
  */
 header {
-  width:100%;
-  padding:0;
-  margin:0;
-  top:1px;
-  left:0;
-  background: #F1F1F1; /* for non-css3 browsers */
-  border-bottom: 1px solid #ccc;
-  box-shadow: 0 -1px 0 white inset;
-  -moz-box-shadow: 0 -1px 0 white inset;
-  -webkit-box-shadow: 0 -1px 0 white inset;
+  &.navbar-gitlab {
+    .navbar-inner {
+      height:45px;
+      padding: 5px;
+      background: #F1F1F1;
+
+      .nav > li > a {
+        color: $style_color;
+        text-shadow: 0 1px 0 #fff;
+      }
+
+      /** NAV block with links and profile **/
+      .nav {
+        float: right;
+        margin-right: 0;
+      }
+    }
+  }
+
   z-index:10;
-  height:60px;
+  /*height:60px;*/
 
   /**
    *
@@ -22,21 +31,19 @@ header {
    *
    */
   .app_logo {
-    width:200px;
+    width:170px;
     float:left;
-    position:relative;
-    top:-5px;
     a {
       float:left;
+      padding: 0px;
 
       h1 {
-        padding-top: 5px;
         width:90px;
         background: url('logo_dark.png') no-repeat 0px -3px;
         float:left;
         margin-left:5px;
-        font-size:36px;
-        line-height:36px;
+        font-size:30px;
+        line-height:48px;
         font-weight:normal;
         color:$style_color;
         text-shadow: 0 1px 1px #FFF;
@@ -47,7 +54,6 @@ header {
 
     }
     .separator {
-      margin-left:20px;
       float: left;
       height: 60px;
       width: 1px;
@@ -56,13 +62,6 @@ header {
       margin-top: -10px;
     }
   }
-  .container {
-    .top_panel_content {
-      margin:auto;
-      position:relative;
-      padding:15px 0;
-    }
-  }
 
   /**
    *
@@ -74,33 +73,23 @@ header {
     float:left;
     margin:0;
     margin-right:30px;
-    font-size:36px;
-    line-height:36px;
+    font-size:30px;
+    line-height:48px;
     font-weight:normal;
     color:$style_color;
     text-shadow: 0 1px 1px #FFF;
     font-family: 'Korolev', sans-serif;
   }
 
-  .fbtn {
-    float: right;
-    margin-right:10px;
-    .btn {
-      margin-left:7px;
-      background: #F1F1F1;
-      border: 1px solid #CCC;
-    }
-  }
-
-
   /**
    *
    * Search box
    *
    */
   .search {
-    float: right;
     margin-right: 45px;
+    margin-left:10px;
+    margin-top: 2px;
 
     .search-input {
       @extend .span2;
@@ -108,8 +97,13 @@ header {
       background-repeat: no-repeat;
       background-position: 10px;
       padding-left:25px;
-      @include border-radius(5px);
-      border:1px solid #ccc;
+      font-size: 13px;
+      @include border-radius(2px);
+      border:1px solid #c6c6c6;
+      box-shadow:none;
+      &:focus {
+        @extend .span3;
+      }
     }
   }
 
@@ -121,7 +115,7 @@ header {
   .account-box {
     position: absolute;
     right: 0;
-    top: 13px;
+    top: 6px;
     z-index: 10000;
     width: 128px;
     font-size: 11px;
@@ -129,13 +123,13 @@ header {
     display: block;
     cursor: pointer;
     img {
-      @include border-radius(4px);
+      @include border-radius(2px);
       right: 5px;
       position: absolute;
       width: 28px;
       height: 28px;
       display: block;
-      top: 2px;
+      top:1px;
       &:after {
         content: " ";
         display: block;
@@ -186,7 +180,7 @@ header {
     background: #333;
     display: none;
     z-index: 100000;
-    border-radius: 5px;
+    @include border-radius(4px);
     width: 100px;
     position: absolute;
     right: 10px;
@@ -200,6 +194,7 @@ header {
       display: block;
       text-shadow: none;
       border-bottom: 1px solid #555;
+      font-size: 12px;
       &:hover {
         color:#eee;
         background: #444;