diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-11 21:10:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-11 21:10:42 +0300 |
| commit | dd174e8f6a3be398155978ac55836e69a67c0585 (patch) | |
| tree | 9d44a96d1d6cd6dd739aa74954a5341aa348ba3c /app/views | |
| parent | b8f2bd7587f656a04f8489e235bae7c6bd93d11c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/observability/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/fullscreen.html.haml | 18 | ||||
| -rw-r--r-- | app/views/layouts/group.html.haml | 3 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app/views/groups/observability/index.html.haml b/app/views/groups/observability/index.html.haml new file mode 100644 index 00000000000..582651c329b --- /dev/null +++ b/app/views/groups/observability/index.html.haml @@ -0,0 +1,2 @@ +- page_title _("Observability") +%iframe{ id: 'observability-ui-iframe', src: @observability_iframe_src, frameborder: 0, width: "100%", height: "100%" } diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml index 2a865aeda40..61a57240ed5 100644 --- a/app/views/layouts/fullscreen.html.haml +++ b/app/views/layouts/fullscreen.html.haml @@ -6,12 +6,16 @@ = header_message = render partial: "layouts/header/default", locals: { project: @project, group: @group } .mobile-overlay - .alert-wrapper.hide-when-top-nav-responsive-open - = render 'shared/outdated_browser' - = render "layouts/broadcast" - = yield :flash_message - = render "layouts/flash" - .content-wrapper.hide-when-top-nav-responsive-open{ id: "content-body", class: "d-flex flex-column align-items-stretch" } - = yield + .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}" + .gl--flex-full.gl-flex-direction-column.gl-w-full + .alert-wrapper + = render 'shared/outdated_browser' + = render "layouts/broadcast" + = yield :flash_message + = render "layouts/flash" + .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" = footer_message diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 5a043704b76..97c2b8bb7e3 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -4,6 +4,7 @@ - nav "group" - display_subscription_banner! - @left_sidebar = true +- base_layout = local_assigns[:base_layout] - content_for :flash_message do = dispensable_render_if_exists "groups/storage_enforcement_alert", context: @group @@ -15,4 +16,4 @@ :plain window.uploads_path = "#{group_uploads_path(@group)}"; -= render template: "layouts/application" += render template: base_layout || "layouts/application" |