Fix .container position on navbar (reloaded)

6 files changed, 73 insertions, 80 deletions

diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index b861646191f..df1553d8594 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -10,7 +10,10 @@ header {
     border: none;
     width: 100%;
 
-    .navbar-inner {
+    .container {
+      width: 100% !important;
+      padding: 0;
+
       background: #FFF;
       border-bottom: 1px solid #DDD;
       filter: none;
@@ -123,11 +126,6 @@ header {
     }
   }
 
-  .container {
-    width: 100% !important;
-    padding: 0px;
-  }
-
   /**
    *
    * Logo holder
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss
index c9bbacd7348..b7f6fac5223 100644
--- a/app/assets/stylesheets/generic/mobile.scss
+++ b/app/assets/stylesheets/generic/mobile.scss
@@ -56,7 +56,7 @@
     }
   }
 
-  .navbar-inner .title {
+  .container .title {
     margin-left: 6px !important;
     max-width: 70% !important;
   }
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index ee75fe61881..139b3cc1ac4 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -1,19 +1,17 @@
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   header {
     &.navbar-gitlab {
-      .navbar-inner {
-        .app_logo {
-          background-color: $color-darker;
+      .app_logo {
+        background-color: $color-darker;
 
-          a {
-            color: $color-light;
-          }
+        a {
+          color: $color-light;
+        }
 
-          &:hover {
-            background-color: $color-dark;
-            a {
-              color: #FFF;
-            }
+        &:hover {
+          background-color: $color-dark;
+          a {
+            color: #FFF;
           }
         }
       }
diff --git a/app/views/layouts/_empty_head_panel.html.haml b/app/views/layouts/_empty_head_panel.html.haml
index b81c2d0364b..358caa3868b 100644
--- a/app/views/layouts/_empty_head_panel.html.haml
+++ b/app/views/layouts/_empty_head_panel.html.haml
@@ -1,5 +1,4 @@
 %header.navbar.navbar-fixed-top.navbar-gitlab
-  .navbar-inner
-    .container
-      %h4.center
-        = image_tag 'logo-white.png', width: 32, height: 32
+  .container
+    %h4.center
+      = image_tag 'logo-white.png', width: 32, height: 32
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 8d4c7b39b19..3329a712430 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -1,48 +1,47 @@
 %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
-  .navbar-inner
-    .container
-      %div.app_logo
-        = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
-          = brand_header_logo
-          %h3 GitLab
-      %h1.title= title
+  .container
+    %div.app_logo
+      = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
+        = brand_header_logo
+        %h3 GitLab
+    %h1.title= title
 
-      %button.navbar-toggle{type: 'button', data: {target: '.navbar-collapse', toggle: 'collapse'}}
-        %span.sr-only Toggle navigation
-        = icon('bars')
+    %button.navbar-toggle{type: 'button', data: {target: '.navbar-collapse', toggle: 'collapse'}}
+      %span.sr-only Toggle navigation
+      = icon('bars')
 
-      .navbar-collapse.collapse
-        %ul.nav.navbar-nav
-          %li.hidden-sm.hidden-xs
-            = render 'layouts/search'
-          %li.visible-sm.visible-xs
-            = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('search')
+    .navbar-collapse.collapse
+      %ul.nav.navbar-nav
+        %li.hidden-sm.hidden-xs
+          = render 'layouts/search'
+        %li.visible-sm.visible-xs
+          = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = icon('search')
+        %li
+          = link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = icon('question-circle')
+        %li
+          = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = icon('globe')
+        %li
+          = link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = icon('clipboard')
+        - if current_user.is_admin?
           %li
-            = link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('question-circle')
+            = link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
+              = icon('cogs')
+        - if current_user.can_create_project?
           %li
-            = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('globe')
-          %li
-            = link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('clipboard')
-          - if current_user.is_admin?
-            %li
-              = link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
-                = icon('cogs')
-          - if current_user.can_create_project?
-            %li
-              = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
-                = icon('plus')
-          %li
-            = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('user')
-          %li
-            = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('sign-out')
-          %li.hidden-xs
-            = link_to current_user, class: 'profile-pic', id: 'profile-pic', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = image_tag avatar_icon(current_user.email, 60), alt: 'User activity'
+            = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
+              = icon('plus')
+        %li
+          = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = icon('user')
+        %li
+          = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = icon('sign-out')
+        %li.hidden-xs
+          = link_to current_user, class: 'profile-pic', id: 'profile-pic', data: {toggle: 'tooltip', placement: 'bottom'} do
+            = image_tag avatar_icon(current_user.email, 60), alt: 'User activity'
 
 = render 'shared/outdated_browser'
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 98a87a39bd4..8a297566d6c 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -1,23 +1,22 @@
 %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
+  .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"}
-        %span.sr-only Toggle navigation
-        %i.fa.fa-bars
+    %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
+      %span.sr-only Toggle navigation
+      %i.fa.fa-bars
 
-      - unless current_controller?('sessions')
-        .pull-right.hidden-xs
-          = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
+    - unless current_controller?('sessions')
+      .pull-right.hidden-xs
+        = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
 
-        .navbar-collapse.collapse
-          %ul.nav.navbar-nav
-            %li.visible-xs
-              = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
+      .navbar-collapse.collapse
+        %ul.nav.navbar-nav
+          %li.visible-xs
+            = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
 
 = render 'shared/outdated_browser'