diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-10 06:09:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-10 06:09:09 +0300 |
commit | 63e90f0c44d45761c28137c6dd983b837a41a64c (patch) | |
tree | ad28839f4b184324fe4ff8730c1c819dac7e2ab7 /app/views/authentication | |
parent | 89cb3fa7748cad1d71417bcd5b69bf30b94c25b5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/authentication')
-rw-r--r-- | app/views/authentication/_authenticate.html.haml | 4 | ||||
-rw-r--r-- | app/views/authentication/_register.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/authentication/_authenticate.html.haml b/app/views/authentication/_authenticate.html.haml index 2d8948ae9aa..5a2ae3f44c2 100644 --- a/app/views/authentication/_authenticate.html.haml +++ b/app/views/authentication/_authenticate.html.haml @@ -1,5 +1,5 @@ #js-authenticate-token-2fa -%a.btn.btn-block.btn-info#js-login-2fa-device{ href: '#' }= _("Sign in via 2FA code") +%a.gl-button.btn.btn-block.btn-confirm#js-login-2fa-device{ href: '#' }= _("Sign in via 2FA code") %script#js-authenticate-token-2fa-in-progress{ type: "text/template" } %p= _("Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.") @@ -7,7 +7,7 @@ %script#js-authenticate-token-2fa-error{ type: "text/template" } %div %p <%= error_message %> (<%= error_name %>) - %a.btn.gl-button.btn-block.btn-warning#js-token-2fa-try-again= _("Try again?") + %a.btn.btn-default.gl-button.btn-block#js-token-2fa-try-again= _("Try again?") %script#js-authenticate-token-2fa-authenticated{ type: "text/template" } %div diff --git a/app/views/authentication/_register.html.haml b/app/views/authentication/_register.html.haml index d250cddf0f8..678fd3c8e8c 100644 --- a/app/views/authentication/_register.html.haml +++ b/app/views/authentication/_register.html.haml @@ -21,7 +21,7 @@ %div %p %span <%= error_message %> (<%= error_name %>) - %a.btn.gl-button.btn-warning#js-token-2fa-try-again= _("Try again?") + %a.btn.btn-default.gl-button#js-token-2fa-try-again= _("Try again?") %script#js-register-token-2fa-registered{ type: "text/template" } .row.gl-mb-3 @@ -33,4 +33,4 @@ = text_field_tag 'device_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name") .col-md-3 = hidden_field_tag 'device_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response" - = submit_tag _("Register device"), class: "btn btn-success" + = submit_tag _("Register device"), class: "gl-button btn btn-confirm" |