5 files changed, 32 insertions, 64 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index 9b1e2f2c728..c8cc9a70678 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -63,7 +63,7 @@
   color: $style_color;
   text-shadow: 0 1px 1px #FFF;
   font-family: 'Yanone', sans-serif;
-  font-size: 26px;
-  line-height: 42px;
+  font-size: 24px;
+  line-height: 36px;
   font-weight: normal;
 }
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 8b93287ed1e..a389a9baa84 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -29,7 +29,7 @@
     a{
       color: $style_color;
     }
-    
+
     > span {
       font-family: $monospace_font;
       font-size: 14px;
@@ -124,7 +124,7 @@
     .wrap{
       display: inline-block;
     }
-    
+
     .frame {
       display: inline-block;
       background-color: #fff;
@@ -149,7 +149,7 @@
 
     .view.swipe{
       position: relative;
-      
+
       .swipe-frame{
         display: block;
         margin: auto;
@@ -228,7 +228,7 @@
         bottom: 0px;
         left: 50%;
         margin-left: -150px;
-        
+
         .drag-track{
           display: block;
           position: absolute;
@@ -237,7 +237,7 @@
           width: 276px;
           background: url('onion_skin_sprites.gif') -4px -20px repeat-x;
         }
-        
+
         .dragger {
           display: block;
           position: absolute;
@@ -248,7 +248,7 @@
           background: url('onion_skin_sprites.gif') 0px -34px repeat-x;
           cursor: pointer;
         }
-        
+
         .transparent {
           display: block;
           position: absolute;
@@ -258,7 +258,7 @@
           width: 10px;
           background: url('onion_skin_sprites.gif') -2px 0px no-repeat;
         }
-        
+
         .opaque {
           display: block;
           position: absolute;
@@ -275,19 +275,19 @@
 
     padding: 10px;
     text-align: center;
-    
+
     background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
     background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
     background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
     background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
-    
+
     ul, li{
       list-style: none;
       margin: 0;
       padding: 0;
       display: inline-block;
     }
-    
+
     li{
       color: grey;
       border-left: 1px solid #c1c1c1;
@@ -322,12 +322,12 @@
 }
 .commit-author, .commit-committer{
   display: block;
-  color: #999; 
-  font-weight: normal; 
+  color: #999;
+  font-weight: normal;
   font-style: italic;
 }
 .commit-author strong, .commit-committer strong{
-  font-weight: bold; 
+  font-weight: bold;
   font-style: normal;
 }
 
@@ -337,7 +337,6 @@
  */
 .commit {
   .browse_code_link_holder {
-    @extend .span2;
     float: right;
   }
 
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 5fe18131828..a219c59eed8 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -5,15 +5,16 @@
 header {
   &.navbar-gitlab {
     .navbar-inner {
-      height: 45px;
-      padding: 5px;
+      height: 40px;
+      padding: 3px;
       background: #F1F1F1;
+      filter: none;
 
       .nav > li > a {
         color: $style_color;
         text-shadow: 0 1px 0 #fff;
-        font-size: 18px;
-        padding: 12px;
+        font-size: 16px;
+        padding: 10px;
       }
 
       /** NAV block with links and profile **/
@@ -25,7 +26,6 @@ header {
   }
 
   z-index: 10;
-  /*height: 60px;*/
 
   /**
    *
@@ -34,7 +34,7 @@ header {
    */
   .app_logo {
     float: left;
-    margin-right: 15px;
+    margin-right: 9px;
     position: relative;
     top: -5px;
     padding-top: 5px;
@@ -42,10 +42,10 @@ header {
     a {
       float: left;
       padding: 0px;
-      margin: 0 10px;
+      margin: 0 6px;
 
       h1 {
-        background: url('logo_dark.png') no-repeat 0px 2px;
+        background: url('logo_dark.png') no-repeat 0px 1px;
         float: left;
         height: 40px;
         width: 40px;
@@ -79,7 +79,6 @@ header {
   .search {
     margin-right: 45px;
     margin-left: 10px;
-    margin-top: 2px;
 
     .search-input {
       @extend .span2;
@@ -105,7 +104,7 @@ header {
   .account-box {
     position: absolute;
     right: 0;
-    top: 6px;
+    top: 4px;
     z-index: 10000;
     width: 128px;
     font-size: 11px;
@@ -240,7 +239,7 @@ header {
     .app_logo {
       a {
         h1 {
-          background: url('logo_white.png') no-repeat center center;
+          background: url('logo_white.png') no-repeat center 1px;
           color: #fff;
           text-shadow: 0 1px 1px #111;
         }
@@ -261,11 +260,11 @@ header {
 
   .separator {
     float: left;
-    height: 60px;
+    height: 46px;
     width: 1px;
     background: white;
     border-left: 1px solid #DDD;
-    margin-top: -10px;
+    margin-top: -3px;
     margin-left: 10px;
     margin-right: 10px;
   }
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index 0a78c5c09f5..afe22270180 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -8,28 +8,20 @@
  *
  */
 .ui_mars {
-
   /*
    *  Application Header
    *
    */
   header {
-
+    @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
         background: #474D57 url('bg-header.png') repeat-x bottom;
         border-bottom: 1px solid #444;
-
-        .nav > li > a {
-          color: #eee;
-          text-shadow: 0 1px 0 #444;
-        }
       }
     }
 
     .search {
-      float: right;
-      margin-right: 45px;
       .search-input {
         border: 1px solid rgba(0, 0, 0, 0.7);
         background-color: #D2D5DA;
@@ -43,31 +35,9 @@
     .search-input::-webkit-input-placeholder {
       color: #666;
     }
-    .app_logo {
-      a {
-        h1 {
-          background: url('logo_white.png') no-repeat center center;
-          color: #eee;
-          text-shadow: 0 1px 1px #111;
-        }
-      }
-      &:hover {
-        background-color: #41464e;
-      }
-    }
-    .project_name {
-      color: #eee;
-      text-shadow: 0 1px 1px #111;
+    .separator {
+      background: #31363E;
+      border-left: 1px solid #666;
     }
   }
-
-  .separator {
-    background: #31363E;
-    border-left: 1px solid #666;
-  }
-
-  /*
-   *  End of Application Header
-   *
-   */
 }
diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml
index eb0312d01e1..66307927db6 100644
--- a/app/views/commits/_commit.html.haml
+++ b/app/views/commits/_commit.html.haml
@@ -6,7 +6,7 @@
     = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
     = commit.author_link avatar: true, size: 24
      
-    = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title"
+    = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "row_title"
 
     %span.committed_ago
       = time_ago_in_words(commit.committed_date)