diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-18 06:12:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-18 06:12:31 +0000 |
| commit | 20ab32fe1094c9781e5b39381412898b6dce6657 (patch) | |
| tree | f1a7c72875cf1bec79dcdf0b0fdeaee9490a0e87 /app/views/layouts | |
| parent | cd54eae89b35e0ba1d798cbe5850762c25e16132 (diff) | |
| download | gitlab-ce-20ab32fe1094c9781e5b39381412898b6dce6657.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/nav/_top_bar.html.haml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/app/views/layouts/nav/_top_bar.html.haml b/app/views/layouts/nav/_top_bar.html.haml index e7a6566a7ff..8968f60b106 100644 --- a/app/views/layouts/nav/_top_bar.html.haml +++ b/app/views/layouts/nav/_top_bar.html.haml @@ -1,10 +1,14 @@ -- container = @no_top_bar_container ? 'container-fluid' : container_class +- if show_super_sidebar? + - top_bar_class = 'top-bar-fixed container-fluid' + - top_bar_container_class = nil +- else + - top_bar_class = [@no_top_bar_container ? 'container-fluid' : container_class, @content_class] + - top_bar_container_class = 'gl-border-b' -.gl-relative - %div{ class: [container, @content_class] } - .top-bar-container.gl-display-flex.gl-align-items-center - - if show_super_sidebar? - = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'js-super-sidebar-toggle super-sidebar-toggle gl-ml-n3 gl-mr-2', title: _('Expand sidebar'), aria: { controls: 'super-sidebar', expanded: 'false', label: _('Navigation sidebar') }, data: {toggle: 'tooltip', placement: 'right' } }) - - elsif defined?(@left_sidebar) - = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'toggle-mobile-nav gl-ml-n3 gl-mr-2', data: { qa_selector: 'toggle_mobile_nav_button' }, aria: { label: _('Open sidebar') } }) - = render "layouts/nav/breadcrumbs/breadcrumbs" +%div{ class: top_bar_class } + .top-bar-container.gl-display-flex.gl-align-items-center{ :class => top_bar_container_class } + - if show_super_sidebar? + = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'js-super-sidebar-toggle super-sidebar-toggle gl-ml-n3 gl-mr-2', title: _('Expand sidebar'), aria: { controls: 'super-sidebar', expanded: 'false', label: _('Navigation sidebar') }, data: {toggle: 'tooltip', placement: 'right' } }) + - elsif defined?(@left_sidebar) + = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'toggle-mobile-nav gl-ml-n3 gl-mr-2', data: { qa_selector: 'toggle_mobile_nav_button' }, aria: { label: _('Open sidebar') } }) + = render "layouts/nav/breadcrumbs/breadcrumbs" |