diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/views/layouts/fullscreen.html.haml | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/views/layouts/fullscreen.html.haml')
-rw-r--r-- | app/views/layouts/fullscreen.html.haml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml index 61a57240ed5..f4f9f39c20e 100644 --- a/app/views/layouts/fullscreen.html.haml +++ b/app/views/layouts/fullscreen.html.haml @@ -1,11 +1,13 @@ +- minimal = local_assigns.fetch(:minimal, false) !!! 5 %html{ lang: I18n.locale, class: page_class } = render "layouts/head" %body{ class: "#{user_application_theme} #{user_tab_width} #{@body_class} fullscreen-layout", data: { page: body_data_page } } = render 'peek/bar' = header_message - = render partial: "layouts/header/default", locals: { project: @project, group: @group } - .mobile-overlay + - unless minimal + = render partial: "layouts/header/default", locals: { project: @project, group: @group } + .mobile-overlay .hide-when-top-nav-responsive-open.gl--flex-full.gl-h-full{ class: nav ? ["layout-page", page_with_sidebar_class, "gl-mt-0!"]: '' } - if defined?(nav) && nav = render "layouts/nav/sidebar/#{nav}" @@ -14,8 +16,9 @@ = render 'shared/outdated_browser' = render "layouts/broadcast" = yield :flash_message - = render "layouts/flash" + = render "layouts/flash", flash_container_no_margin: true .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch" } = yield - = render "layouts/nav/top_nav_responsive", class: "gl-flex-grow-1 gl-overflow-y-auto" + - unless minimal + = render "layouts/nav/top_nav_responsive", class: "gl-flex-grow-1 gl-overflow-y-auto" = footer_message |