diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:52 +0300 |
| commit | f0707f413ce49b5712fca236b950acbec029be1e (patch) | |
| tree | e28b49d89d4cf2422ee0066600c0ea045dcf7669 /app/views/layouts | |
| parent | 31a49d924418aa9983ae30be28e6e304a30939e1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/devise_experimental_separate_sign_up_flow.html.haml | 15 | ||||
| -rw-r--r-- | app/views/layouts/header/_logo_with_title.html.haml | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/app/views/layouts/devise_experimental_separate_sign_up_flow.html.haml b/app/views/layouts/devise_experimental_separate_sign_up_flow.html.haml index 3a5c5399355..fddfe14e05f 100644 --- a/app/views/layouts/devise_experimental_separate_sign_up_flow.html.haml +++ b/app/views/layouts/devise_experimental_separate_sign_up_flow.html.haml @@ -1,22 +1,15 @@ !!! 5 %html.devise-layout-html.navless{ class: system_message_class } = render "layouts/head" - %body.ui-indigo.signup-page.application.navless{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } } - = header_message + %body.ui-indigo.signup-page{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } } + = render "layouts/header/logo_with_title" = render "layouts/init_client_detection_flags" .page-wrap - .container.signup-box-container.navless-container.mt-0 + .container.signup-box-container.navless-container = render "layouts/broadcast" .content = render "layouts/flash" - .row.mb-6 - .col-sm-8.offset-sm-2.col-md-6.offset-md-3.new-session-forms-container - = render_if_exists 'layouts/devise_help_text' - .text-center.signup-heading.mb-3 - = image_tag(image_url('logo.svg'), class: 'gitlab-logo', alt: 'GitLab Logo') - - if content_for?(:page_title) - %h2= yield :page_title - = yield + = yield %hr.footer-fixed .footer-container .container diff --git a/app/views/layouts/header/_logo_with_title.html.haml b/app/views/layouts/header/_logo_with_title.html.haml new file mode 100644 index 00000000000..1ea6168fc9a --- /dev/null +++ b/app/views/layouts/header/_logo_with_title.html.haml @@ -0,0 +1,4 @@ +%header.navbar.fixed-top.navbar-gitlab.justify-content-center + = render 'shared/logo.svg' + %span.logo-text.d-none.d-lg-block.prepend-left-8.pt-1 + = render 'shared/logo_type.svg' |