7 files changed, 43 insertions, 16 deletions
diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee
index 2e3f5608257..fb08016fbae 100644
--- a/app/assets/javascripts/sidebar.js.coffee
+++ b/app/assets/javascripts/sidebar.js.coffee
@@ -4,6 +4,7 @@ $(document).on("click", '.toggle-nav-collapse', (e) ->
   expanded = 'page-sidebar-expanded'
 
   $('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
+  $('header').toggleClass("header-collapsed header-expanded")
   $('.toggle-nav-collapse i').toggleClass("fa-angle-right fa-angle-left")
   $.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' })
 )
diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index 72870d2ff96..a86c01d4ce5 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -36,12 +36,6 @@ header {
       }
 
       .app_logo {
-        @media (max-width: $screen-md-max) {
-          width: 52px;
-          h3 {
-            display: none;
-          }
-        }
         border-bottom: 1px solid transparent;
         margin-bottom: -1px;
 
@@ -229,3 +223,26 @@ header {
     right: 35px !important;
   }
 }
+
+@media (max-width: $screen-md-max) {
+  .header-collapsed, .header-expanded {
+    width: 52px;
+
+    h3 {
+      display: none;
+    }
+  }
+}
+
+@media(min-width: $screen-md-max) {
+  .header-collapsed {
+    width: 52px;
+
+    h3 {
+      display: none;
+    }
+  }
+
+  .header-expanded {
+  }
+}
diff --git a/app/assets/stylesheets/generic/nav_sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 36552083851..36552083851 100644
--- a/app/assets/stylesheets/generic/nav_sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 20457572a08..5c77af729d0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -314,12 +314,4 @@ module ApplicationHelper
       profile_key_path(key)
     end
   end
-
-  def nav_sidebar_class
-    if nav_menu_collapsed?
-      "page-sidebar-collapsed"
-    else
-      "page-sidebar-expanded"
-    end
-  end
 end
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 2b03269800e..9b1dd8b8e54 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -2,4 +2,20 @@ module NavHelper
   def nav_menu_collapsed?
     cookies[:collapsed_nav] == 'true'
   end
+
+  def nav_sidebar_class
+    if nav_menu_collapsed?
+      "page-sidebar-collapsed"
+    else
+      "page-sidebar-expanded"
+    end
+  end
+
+  def nav_header_class
+    if nav_menu_collapsed?
+      "header-collapsed"
+    else
+      "header-expanded"
+    end
+  end
 end
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 6851dd64df5..281ce31fe9c 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab
+%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
   .navbar-inner
     .container
       %div.app_logo
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 3d6d2bfc00a..98a87a39bd4 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -1,9 +1,10 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab
+%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
   .navbar-inner
     .container
       %div.app_logo
         = link_to explore_root_path, class: "home" do
           = brand_header_logo
+          %h3 GitLab
       %h1.title= title
 
       %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}