diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-07 13:17:32 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-07 13:17:32 +0000 |
commit | 0c2dc7273819b29efcb77a347af0116aeb5a9927 (patch) | |
tree | 3abcea65a35bc4b05990481bb8ee713eba0b4f5e /app/views/layouts | |
parent | 6f0042421447f6675a5fc3d2bf3fdaedb6007451 (diff) | |
parent | 2814ea6f7cc2c3cc97fd0f97cb4b598779465552 (diff) | |
download | gitlab-ce-0c2dc7273819b29efcb77a347af0116aeb5a9927.tar.gz |
Merge branch 'breadcrumbs-extra-btns-remove' into 'master'
Moves the action buttons out of the breadcrumbs
Closes #36459
See merge request !14072
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index feffd7707dc..7bd3f5306a2 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", class: [container, @content_class] } - .breadcrumbs-container{ class: [container, @content_class] } + .breadcrumbs-container - if defined?(@left_sidebar) = button_tag class: 'toggle-mobile-nav', type: 'button' do %span.sr-only Open sidebar @@ -17,6 +17,4 @@ = render "layouts/nav/breadcrumbs/collapsed_dropdown", location: :after %li %h2.breadcrumbs-sub-title= @breadcrumb_title - - if content_for?(:breadcrumbs_extra) - .breadcrumbs-extra.hidden-xs= yield :breadcrumbs_extra = yield :header_content |