Commit 821c2984 authored by Phil Hughes's avatar Phil Hughes

Merge branch '12550-fullscrean' into 'master'

Removes EE differences for app/views/layouts/fullscreen.html.haml

Closes gitlab-ee#12550

See merge request gitlab-org/gitlab-ce!30403
parents 5ecb2db8 930982ce
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
= render "layouts/head" = render "layouts/head"
%body{ class: "#{user_application_theme} #{@body_class} fullscreen-layout", data: { page: body_data_page } } %body{ class: "#{user_application_theme} #{@body_class} fullscreen-layout", data: { page: body_data_page } }
= render 'peek/bar' = render 'peek/bar'
= header_message
= render partial: "layouts/header/default", locals: { project: @project, group: @group } = render partial: "layouts/header/default", locals: { project: @project, group: @group }
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
.mobile-overlay .mobile-overlay
...@@ -12,3 +13,4 @@ ...@@ -12,3 +13,4 @@
= render "layouts/flash" = render "layouts/flash"
.content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch mt-0" } .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch mt-0" }
= yield = yield
= footer_message
---
title: Removes EE differences for app/views/layouts/fullscreen.html.haml
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment