diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-29 21:10:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-29 21:10:36 +0300 |
| commit | 1bbd0179d7ed8fb17c0574aa74ef491e53c833a7 (patch) | |
| tree | c74a9b9d8f7ad1cedb0995e10340820467a8ab6f /app/views/layouts/devise.html.haml | |
| parent | 4d3677a52dab1bb5c707ad493dcab8c8bca3dd8b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/devise.html.haml')
| -rw-r--r-- | app/views/layouts/devise.html.haml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 5bcb2dc9927..a76f97e3a23 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -1,14 +1,14 @@ - add_page_specific_style 'page_bundles/login' - custom_text = custom_sign_in_description !!! 5 -%html.devise-layout-html{ class: system_message_class } +%html.html-devise-layout{ lang: "en" } = render "layouts/head", { startup_filename: 'signin' } - %body.login-page.application.navless{ class: "#{user_application_theme} #{client_class_list}", data: { page: body_data_page, qa_selector: 'login_page' } } + %body.gl-h-full.login-page.navless{ class: "#{system_message_class} #{user_application_theme} #{client_class_list}", data: { page: body_data_page, qa_selector: 'login_page' } } = header_message = render "layouts/init_client_detection_flags" - if Feature.enabled?(:restyle_login_page, @project) - .page-wrap.borderless - .container.navless-container + .gl-h-full.borderless.gl-display-flex.gl-flex-wrap + .container .content = render "layouts/flash" - if custom_text.present? @@ -33,11 +33,11 @@ .gl-w-half.gl-xs-w-full.gl-ml-auto.gl-mr-auto.bar = yield - = render 'devise/shared/footer', footer_message: footer_message + = render 'devise/shared/footer' - else - .page-wrap - = render "layouts/header/empty" - .container.navless-container + = render "layouts/header/empty" + .gl-h-full.gl-display-flex.gl-flex-wrap + .container .content = render "layouts/flash" .row.mt-3 @@ -63,4 +63,4 @@ .col-md-6.order-1.new-session-forms-container{ class: recently_confirmed_com? ? 'order-sm-first' : 'order-sm-12' } = yield - = render 'devise/shared/footer', footer_message: footer_message + = render 'devise/shared/footer' |