diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-29 23:02:34 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-29 23:02:34 +0300 |
| commit | 17165efe65d2fd83328f2ffcd52864fc87e14092 (patch) | |
| tree | 198dc3272cc3f8edc9cac5b59e67e5ea5b961a78 | |
| parent | 3abcf8eab20bd00cd35663775d3c217ae42c49cd (diff) | |
| parent | d515ec4df908fc65496904f4705ae903db54b6a8 (diff) | |
Merge branch 'issue-boards-breadcrumbs-container' into 'master'
Fixes the breadcrumb container when in issue boards
Closes #36561
See merge request !13655
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/boards/_show.html.haml | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/issue-boards-breadcrumbs-container.yml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index 4db84771f4e..653452871a0 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -1,8 +1,9 @@ - breadcrumb_link = breadcrumb_title_link +- container = @no_breadcrumb_container ? 'container-fluid' : container_class - hide_top_links = @hide_top_links || false %nav.breadcrumbs{ role: "navigation" } - .breadcrumbs-container{ class: [container_class, @content_class] } + .breadcrumbs-container{ class: [container, @content_class] } - if defined?(@new_sidebar) = button_tag class: 'toggle-mobile-nav', type: 'button' do %span.sr-only Open sidebar diff --git a/app/views/projects/boards/_show.html.haml b/app/views/projects/boards/_show.html.haml index 2076e46fde8..5354ec8522e 100644 --- a/app/views/projects/boards/_show.html.haml +++ b/app/views/projects/boards/_show.html.haml @@ -1,3 +1,4 @@ +- @no_breadcrumb_container = true - @no_container = true - @content_class = "issue-boards-content" - page_title "Boards" diff --git a/changelogs/unreleased/issue-boards-breadcrumbs-container.yml b/changelogs/unreleased/issue-boards-breadcrumbs-container.yml new file mode 100644 index 00000000000..5e042de7000 --- /dev/null +++ b/changelogs/unreleased/issue-boards-breadcrumbs-container.yml @@ -0,0 +1,5 @@ +--- +title: Fix breadcrumbs container in issue boards +merge_request: +author: +type: fixed |