diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 08:45:27 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 08:45:27 +0000 |
| commit | 83d80bc9685b26e34583f5887ed6573f260d2d4c (patch) | |
| tree | 1a55e692f6b7ed8f29d64587d302a853f772617d /app/views/layouts | |
| parent | 2ae642f8c7bf576b7113761ff00fa033373dc6ab (diff) | |
| parent | 3de489fb7f7e52756a8209086f19127d76061718 (diff) | |
| download | gitlab-ce-83d80bc9685b26e34583f5887ed6573f260d2d4c.tar.gz | |
Merge branch '59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile' into 'master'
Resolve "Move sign-in/2FA on users/sign_in above intro content on mobile"
Closes #59987
See merge request gitlab-org/gitlab-ce!28360
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/devise.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index f7a561afbb3..ff3410f6268 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -10,15 +10,17 @@ .container.navless-container .content = render "layouts/flash" - .row.append-bottom-15 - .col-sm-7.brand-holder - %h1 + .row.mt-3 + .col-sm-12 + %h1.mb-3.font-weight-normal = brand_title + .row.mb-3 + .col-sm-7.order-12.order-sm-1.brand-holder = brand_image - if current_appearance&.description? = brand_text - else - %h3 + %h3.mt-sm-0 = _('Open source software to collaborate on code') %p @@ -29,7 +31,7 @@ = render_if_exists 'layouts/devise_help_text' - .col-sm-5.new-session-forms-container + .col-sm-5.order-1.order-sm-12.new-session-forms-container = yield %hr.footer-fixed |