remove jobs page hack to make subnav 100% width

This commit is contained in:
Mike Greiling 2017-03-22 17:30:52 -05:00
parent 3f8dbf300d
commit 25d779a321
4 changed files with 4 additions and 9 deletions

View File

@ -366,9 +366,3 @@
right: 0; right: 0;
margin-top: -17px; margin-top: -17px;
} }
@media (min-width: $screen-md-min) {
.sub-nav.build {
width: calc(100% + #{$gutter_width});
}
}

View File

@ -3,8 +3,9 @@
.layout-nav .layout-nav
.container-fluid .container-fluid
= render "layouts/nav/#{nav}" = render "layouts/nav/#{nav}"
.content-wrapper{ class: layout_nav_class } - if content_for?(:sub_nav)
= yield :sub_nav = yield :sub_nav
.content-wrapper{ class: layout_nav_class }
.alert-wrapper .alert-wrapper
= render "layouts/broadcast" = render "layouts/broadcast"
= render "layouts/flash" = render "layouts/flash"

View File

@ -1,6 +1,6 @@
- @no_container = true - @no_container = true
- page_title "#{@build.name} (##{@build.id})", "Jobs" - page_title "#{@build.name} (##{@build.id})", "Jobs"
= render "projects/pipelines/head", build_subnav: true = render "projects/pipelines/head"
%div{ class: container_class } %div{ class: container_class }
.build-page .build-page

View File

@ -1,7 +1,7 @@
= content_for :sub_nav do = content_for :sub_nav do
.scrolling-tabs-container.sub-nav-scroll .scrolling-tabs-container.sub-nav-scroll
= render 'shared/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) } %ul{ class: (container_class) }
- if project_nav_tab? :pipelines - if project_nav_tab? :pipelines
= nav_link(path: 'pipelines#index', controller: :pipelines) do = nav_link(path: 'pipelines#index', controller: :pipelines) do