From 25d779a321e1859e89c00a27e1f025c6f77ea2e4 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 22 Mar 2017 17:30:52 -0500
Subject: [PATCH] remove jobs page hack to make subnav 100% width

---
 app/assets/stylesheets/pages/builds.scss     | 6 ------
 app/views/layouts/_page.html.haml            | 3 ++-
 app/views/projects/builds/show.html.haml     | 2 +-
 app/views/projects/pipelines/_head.html.haml | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index a24292a7c8c..969fc75c6eb 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -366,9 +366,3 @@
   right: 0;
   margin-top: -17px;
 }
-
-@media (min-width: $screen-md-min) {
-  .sub-nav.build {
-    width: calc(100% + #{$gutter_width});
-  }
-}
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index cbb15d4e576..b7df11681d3 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -3,8 +3,9 @@
     .layout-nav
       .container-fluid
         = render "layouts/nav/#{nav}"
-  .content-wrapper{ class: layout_nav_class }
+  - if content_for?(:sub_nav)
     = yield :sub_nav
+  .content-wrapper{ class: layout_nav_class }
     .alert-wrapper
       = render "layouts/broadcast"
       = render "layouts/flash"
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 307010edb58..d5fe771613c 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 - page_title "#{@build.name} (##{@build.id})", "Jobs"
-= render "projects/pipelines/head", build_subnav: true
+= render "projects/pipelines/head"
 
 %div{ class: container_class }
   .build-page
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index a5acb7ac4a5..b02fef638ff 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -1,7 +1,7 @@
 = content_for :sub_nav do
   .scrolling-tabs-container.sub-nav-scroll
     = render 'shared/nav_scroll'
-    .nav-links.sub-nav.scrolling-tabs{ class: ('build' if local_assigns.fetch(:build_subnav, false)) }
+    .nav-links.sub-nav.scrolling-tabs
       %ul{ class: (container_class) }
         - if project_nav_tab? :pipelines
           = nav_link(path: 'pipelines#index', controller: :pipelines) do