diff options
Diffstat (limited to 'app/views')
4 files changed, 20 insertions, 15 deletions
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 5f85235e8fa..232dffa28b4 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -1,7 +1,16 @@ - page_title "Sign up" - if experiment_enabled?(:signup_flow) - = render 'devise/shared/experimental_separate_sign_up_flow_box' + .row + .col-lg-7 + %h1.mb-3.font-weight-bold.text-6.mt-0 + = _("Speed up your DevOps<br>with GitLab").html_safe + %p.text-3 + = _("GitLab is a single application for the entire software development lifecycle. From project planning and source code management to CI/CD, monitoring, and security.") + .col-lg-5.order-12 + .text-center.mb-3 + %h2.font-weight-bold.gl-font-size-20= _('Register for GitLab') + = render 'devise/shared/experimental_separate_sign_up_flow_box' + = render 'devise/shared/sign_in_link' - else = render 'devise/shared/signup_box' - -= render 'devise/shared/sign_in_link' + = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml b/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml index 7de7dec61b0..7bc3042c94d 100644 --- a/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml +++ b/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml @@ -1,4 +1,3 @@ -- content_for(:page_title, _('Register for GitLab')) - max_first_name_length = max_last_name_length = 127 - max_username_length = 255 .signup-box.p-3.mb-2 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' |