diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/views/u2f/_register.html.haml | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/views/u2f/_register.html.haml')
-rw-r--r-- | app/views/u2f/_register.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/u2f/_register.html.haml b/app/views/u2f/_register.html.haml index 6f3f4c4981c..a83b55379da 100644 --- a/app/views/u2f/_register.html.haml +++ b/app/views/u2f/_register.html.haml @@ -6,13 +6,13 @@ %script#js-register-u2f-setup{ type: "text/template" } - if current_user.two_factor_otp_enabled? - .row.append-bottom-10 + .row.gl-mb-3 .col-md-4 %button#js-setup-u2f-device.btn.btn-info.btn-block= _("Set up new U2F device") .col-md-8 %p= _("Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.") - else - .row.append-bottom-10 + .row.gl-mb-3 .col-md-4 %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true }= _("Set up new U2F device") .col-md-8 @@ -28,11 +28,11 @@ %a.btn.btn-warning#js-token-2fa-try-again= _("Try again?") %script#js-register-u2f-registered{ type: "text/template" } - .row.append-bottom-10 + .row.gl-mb-3 .col-md-12 %p= _("Your device was successfully set up! Give it a name and register it with the GitLab server.") = form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do - .row.append-bottom-10 + .row.gl-mb-3 .col-md-3 = text_field_tag 'u2f_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name") .col-md-3 |