Css/views cleanup after layout restyle

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

14 files changed, 38 insertions, 93 deletions

diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 5dcaee2fa02..eda37f8237a 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -2,10 +2,8 @@
   .navbar-inner
     .container
       %div.app_logo
-        %span.separator
         = link_to root_path, class: "home has_bottom_tooltip", title: "Dashboard" do
           %h1 GITLAB
-        %span.separator
       %h1.title= title
 
       %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
new file mode 100644
index 00000000000..621365fa6aa
--- /dev/null
+++ b/app/views/layouts/_page.html.haml
@@ -0,0 +1,16 @@
+- if defined?(sidebar)
+  .page-with-sidebar
+    .sidebar-wrapper
+      = render(sidebar)
+    .content-wrapper
+      .container-fluid
+        .content
+          = render "layouts/flash"
+          .clearfix
+            = yield
+- else
+  .container.navless-container
+    .content
+      = yield
+
+= yield :embedded_scripts
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 7c6bfd643d8..7d25d9a4290 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,16 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: "Admin area"
-  %body{class: "#{app_theme} sidenav admin", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} admin", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Admin area"
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/admin'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            .clearfix
-              = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/admin'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ddae02bbb45..ec53c4b1508 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,16 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: "Dashboard"
-  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page }
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page }
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Dashboard"
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/dashboard'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            .clearfix
-              = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/dashboard'
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index dcc7962830d..d023846c5eb 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -2,7 +2,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: page_title
-  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     - if current_user
       = render "layouts/head_panel", title: page_title
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index c5d8568b41a..04ccfd6e563 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -4,13 +4,4 @@
   %body{class: "#{app_theme} application sidenav", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: @group.name
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/group'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            .clearfix
-              = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/group'
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index c9ae3f5ffff..d634d39bfdf 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -61,5 +61,6 @@
         %i.fa.fa-cogs
         Settings
         %i.fa.fa-angle-down
-  - if defined?(settings) && settings
+
+  - if @project_settings_nav
     = render 'projects/settings_nav'
diff --git a/app/views/layouts/navless.html.haml b/app/views/layouts/navless.html.haml
index 7f452e84b01..2c5fffe384f 100644
--- a/app/views/layouts/navless.html.haml
+++ b/app/views/layouts/navless.html.haml
@@ -1,7 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: @title
-  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: @title
     .container.navless-container
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index f20f4ea1283..b387ea907b3 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,16 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: "Profile"
-  %body{class: "#{app_theme} sidenav profile", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} profile", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Profile"
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/profile'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            .clearfix
-              = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/profile'
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 47bc007fc6a..b8f4e92fff8 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -1,19 +1,12 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: @project.name_with_namespace
-  %body{class: "#{app_theme} sidenav project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
+  %body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: project_title(@project)
     = render "layouts/init_auto_complete"
     - if can?(current_user, :download_code, @project)
       = render 'shared/no_ssh'
 
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/project', settings: true
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            = yield
-    = yield :embedded_scripts
+    - @project_settings_nav = true
+    = render 'layouts/page', sidebar: 'layouts/nav/project'
diff --git a/app/views/layouts/projects.html.haml b/app/views/layouts/projects.html.haml
index 644187b0998..84c53a36cbd 100644
--- a/app/views/layouts/projects.html.haml
+++ b/app/views/layouts/projects.html.haml
@@ -1,19 +1,10 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: project_head_title
-  %body{class: "#{app_theme} sidenav project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
+  %body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: project_title(@project)
     = render "layouts/init_auto_complete"
     - if can?(current_user, :download_code, @project)
       = render 'shared/no_ssh'
-
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/project'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/project'
diff --git a/app/views/layouts/public_group.html.haml b/app/views/layouts/public_group.html.haml
index 99c29dc78dc..2bb52eeca86 100644
--- a/app/views/layouts/public_group.html.haml
+++ b/app/views/layouts/public_group.html.haml
@@ -1,16 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: group_head_title
-  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: "group: #{@group.name}"
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/group'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            .clearfix
-              = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/group'
diff --git a/app/views/layouts/public_projects.html.haml b/app/views/layouts/public_projects.html.haml
index 343bddcf0b2..b96a28d4ea5 100644
--- a/app/views/layouts/public_projects.html.haml
+++ b/app/views/layouts/public_projects.html.haml
@@ -1,15 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: @project.name_with_namespace
-  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: project_title(@project)
-    .page-with-sidebar
-      .sidebar-wrapper
-        = render 'layouts/nav/project'
-      .content-wrapper
-        .container-fluid
-          .content
-            = render "layouts/flash"
-            = yield
-    = yield :embedded_scripts
+    = render 'layouts/page', sidebar: 'layouts/nav/project'
diff --git a/app/views/layouts/public_users.html.haml b/app/views/layouts/public_users.html.haml
index 18b856b10e1..6780701061d 100644
--- a/app/views/layouts/public_users.html.haml
+++ b/app/views/layouts/public_users.html.haml
@@ -1,8 +1,7 @@
 !!! 5
 %html{ lang: "en"}
   = render "layouts/head", title: @title
-  %body{class: "#{app_theme} sidenav application", :'data-page' => body_data_page}
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: @title
-    .container.navless-container
-      .content= yield
+    = render 'layouts/page'