kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Added limit-container-width to breadcrumbs container

Browse source 
This fixes an issue where the content has a limited width but the
breadcrumbs remained full width. Instead of creating a new variable
specifically for the breadcrumbs, it just re-uses @content_class

Closes #34573
This commit is contained in:
Phil Hughes 2017-07-11 08:53:52 +01:00
parent 0b434daf52
commit aa0a63082c
4 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/nav/_breadcrumbs.html.haml
View file

@ -2,7 +2,7 @@
- hide_top_links = @hide_top_links || false - hide_top_links = @hide_top_links || false
%nav.breadcrumbs{ role: "navigation" } %nav.breadcrumbs{ role: "navigation" }
.breadcrumbs-container{ class: container_class } .breadcrumbs-container{ class: [container_class, @content_class] }
.breadcrumbs-links.js-title-container .breadcrumbs-links.js-title-container
- unless hide_top_links - unless hide_top_links
.title .title

1
app/views/projects/commit/show.html.haml
View file

@ -1,6 +1,7 @@
- @no_container = true - @no_container = true
- container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : '' - container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : ''
- limited_container_width = fluid_layout ? '' : 'limit-container-width' - limited_container_width = fluid_layout ? '' : 'limit-container-width'
- @content_class = limited_container_width
- page_title "#{@commit.title} (#{@commit.short_id})", "Commits" - page_title "#{@commit.title} (#{@commit.short_id})", "Commits"
- page_description @commit.description - page_description @commit.description
= render "projects/commits/head" = render "projects/commits/head"

1
app/views/projects/show.html.haml
View file

@ -1,4 +1,5 @@
- @no_container = true - @no_container = true
- @content_class = "limit-container-width" unless fluid_layout
- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message - flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
= content_for :meta_tags do = content_for :meta_tags do

1
app/views/projects/tree/show.html.haml
View file

@ -1,4 +1,5 @@
- @no_container = true - @no_container = true
- @content_class = "limit-container-width" unless fluid_layout
- page_title @path.presence || _("Files"), @ref - page_title @path.presence || _("Files"), @ref
= content_for :meta_tags do = content_for :meta_tags do