Commit 6ec0b993 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'btn-confirm-2fa' into 'master'

Apply new GitLab UI for buttons in 2fa and changed deprecated info to confirm

See merge request gitlab-org/gitlab!52580
parents 9062134b 094b928a
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
- if current_user.two_factor_otp_enabled? - if current_user.two_factor_otp_enabled?
.row.gl-mb-3 .row.gl-mb-3
.col-md-5 .col-md-5
%button#js-setup-token-2fa-device.gl-button.btn.btn-info= _("Set up new device") %button#js-setup-token-2fa-device.gl-button.btn.btn-confirm= _("Set up new device")
.col-md-7 .col-md-7
%p= _("Your device needs to be set up. Plug it in (if needed) and click the button on the left.") %p= _("Your device needs to be set up. Plug it in (if needed) and click the button on the left.")
- else - else
.row.gl-mb-3 .row.gl-mb-3
.col-md-4 .col-md-4
%button#js-setup-token-2fa-device.gl-button.btn.btn-info.btn-block{ disabled: true }= _("Set up new device") %button#js-setup-token-2fa-device.gl-button.btn.btn-confirm.btn-block{ disabled: true }= _("Set up new device")
.col-md-8 .col-md-8
%p= _("You need to register a two-factor authentication app before you can set up a device.") %p= _("You need to register a two-factor authentication app before you can set up a device.")
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
%p %p
#{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')} #{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')}
- if current_user.two_factor_enabled? - if current_user.two_factor_enabled?
= link_to _('Manage two-factor authentication'), profile_two_factor_auth_path, class: 'gl-button btn btn-info' = link_to _('Manage two-factor authentication'), profile_two_factor_auth_path, class: 'gl-button btn btn-confirm'
- else - else
.gl-mb-3 .gl-mb-3
= link_to _('Enable two-factor authentication'), profile_two_factor_auth_path, class: 'gl-button btn btn-success', data: { qa_selector: 'enable_2fa_button' } = link_to _('Enable two-factor authentication'), profile_two_factor_auth_path, class: 'gl-button btn btn-success', data: { qa_selector: 'enable_2fa_button' }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
data: { confirm: webauthn_enabled ? _('Are you sure? This will invalidate your registered applications and U2F / WebAuthn devices.') : _('Are you sure? This will invalidate your registered applications and U2F devices.') }, data: { confirm: webauthn_enabled ? _('Are you sure? This will invalidate your registered applications and U2F / WebAuthn devices.') : _('Are you sure? This will invalidate your registered applications and U2F devices.') },
class: 'gl-button btn btn-danger gl-mr-3' class: 'gl-button btn btn-danger gl-mr-3'
= form_tag codes_profile_two_factor_auth_path, {style: 'display: inline-block', method: :post} do |f| = form_tag codes_profile_two_factor_auth_path, {style: 'display: inline-block', method: :post} do |f|
= submit_tag _('Regenerate recovery codes'), class: 'btn' = submit_tag _('Regenerate recovery codes'), class: 'gl-button btn btn-default'
- else - else
%p %p
......
---
title: Apply new GitLab UI for buttons in 2fa and changed deprecated info to confirm
merge_request: 52580
author: Yogi (@yo)
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment