From 46e3d13eac8f679044e4fcf16262346ccb8064df Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 1 Jun 2015 16:36:26 +0200
Subject: More fixes to header css

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/generic/header.scss      | 6 ++++--
 app/assets/stylesheets/generic/mobile.scss      | 2 +-
 app/assets/stylesheets/generic/sidebar.scss     | 2 --
 app/assets/stylesheets/themes/gitlab-theme.scss | 2 --
 app/views/layouts/_empty_head_panel.html.haml   | 2 +-
 app/views/layouts/errors.html.haml              | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index 5da4d14b3ba..3a227d11ee0 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -5,7 +5,8 @@
 $header-height: 46px;
 
 header {
-  &.empty-header .container {
+  &.navbar-empty {
+    background: #FFF;
     border-bottom: 1px solid #EEE;
   }
 
@@ -17,9 +18,9 @@ header {
     width: 100%;
 
     .container {
+      background: #FFF;
       width: 100% !important;
       padding: 0;
-      background: #FFF;
       filter: none;
 
       .nav > li > a {
@@ -96,6 +97,7 @@ header {
     border-bottom: 1px solid #EEE;
     padding-right: 35px;
     height: $header-height;
+    overflow: hidden;
 
     .title {
       position: relative;
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss
index b7f6fac5223..74108c1f086 100644
--- a/app/assets/stylesheets/generic/mobile.scss
+++ b/app/assets/stylesheets/generic/mobile.scss
@@ -57,7 +57,7 @@
   }
 
   .container .title {
-    margin-left: 6px !important;
+    margin-left: 15px !important;
     max-width: 70% !important;
   }
 }
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 5d4dee5691a..69bddc6f59e 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -1,6 +1,4 @@
 .page-with-sidebar {
-  background: $background-color;
-
   .sidebar-wrapper {
     position: fixed;
     top: 0;
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index a52c847da69..1b06b4aa925 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -20,8 +20,6 @@
   }
 
   .page-with-sidebar {
-    background: $color-darker;
-
     .collapse-nav a {
       color: #FFF;
       background: $color;
diff --git a/app/views/layouts/_empty_head_panel.html.haml b/app/views/layouts/_empty_head_panel.html.haml
index 4939634dec9..16fbf6d4020 100644
--- a/app/views/layouts/_empty_head_panel.html.haml
+++ b/app/views/layouts/_empty_head_panel.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab.empty-header
+%header.navbar.navbar-fixed-top.navbar-empty
   .container
     %h4.center
       = image_tag 'logo-white.png', width: 32, height: 32
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index aa0f3f0a819..25cce11990a 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body{class: "#{app_theme}  application"}
-    = render "layouts/head_panel", title: "" if current_user
+    = render "layouts/empty_head_panel"
     .container.navless-container
       = render "layouts/flash"
       .error-page
-- 
cgit v1.2.1