diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-11 23:05:58 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-14 14:49:03 +0100 |
| commit | d913ea785c21101cafe02092aabf2b151bc38dcf (patch) | |
| tree | c74e80987fc8178d5828f97851c5b48b2a171ce2 | |
| parent | e3df0c7c8548f9ff96f949ec1529133b1c4fac9c (diff) | |
| download | gitlab-ce-d913ea785c21101cafe02092aabf2b151bc38dcf.tar.gz | |
Merge branch 'breadcrumbs-limit-width' into 'master'
Added limit-container-width to breadcrumbs container
Closes #34573
See merge request !12776
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/tree/show.html.haml | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index 5f1641f4300..b0c1ab7420f 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -2,7 +2,7 @@ - hide_top_links = @hide_top_links || false %nav.breadcrumbs{ role: "navigation" } - .breadcrumbs-container{ class: container_class } + .breadcrumbs-container{ class: [container_class, @content_class] } .breadcrumbs-links.js-title-container - unless hide_top_links .title diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index b778e8af121..07c83c0a590 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -1,6 +1,7 @@ - @no_container = true - container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : '' - limited_container_width = fluid_layout ? '' : 'limit-container-width' +- @content_class = limited_container_width - page_title "#{@commit.title} (#{@commit.short_id})", "Commits" - page_description @commit.description = render "projects/commits/head" diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d413c4619be..a73e111ad6d 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,4 +1,5 @@ - @no_container = true +- @content_class = "limit-container-width" unless fluid_layout - flash_message_container = show_new_nav? ? :new_global_flash : :flash_message = content_for :meta_tags do diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index 130980556c1..f727f340bb9 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -1,4 +1,5 @@ - @no_container = true +- @content_class = "limit-container-width" unless fluid_layout - page_title @path.presence || _("Files"), @ref = content_for :meta_tags do |