diff options
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/chat_names/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key_details.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 34 |
3 files changed, 18 insertions, 20 deletions
diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml index 7a63fc30d9c..99284abb73d 100644 --- a/app/views/profiles/chat_names/index.html.haml +++ b/app/views/profiles/chat_names/index.html.haml @@ -13,7 +13,7 @@ - if @chat_names.present? .table-responsive - %table.table + %table.table.gl-table %thead %tr %th= _('Team domain') diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index 1307c388041..94671b69b5e 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -46,7 +46,7 @@ .gl-display-flex %pre.well-pre.gl-pl-5.gl-mb-0.gl-border-0 = @key.key - = deprecated_clipboard_button(title: s_('Profiles|Copy SSH key'), text: @key.key, class: 'gl-bg-gray-10 gl-px-3! gl-border-none! gl-rounded-top-left-none! gl-rounded-bottom-left-none!') + = clipboard_button(title: s_('Profiles|Copy SSH key'), text: @key.key, category: :tertiary, size: :medium) = render Pajamas::CardComponent.new(card_options: { class: 'gl-new-card' }, header_options: { class: 'gl-new-card-header' }, body_options: { class: 'gl-new-card-body gl-px-0'}) do |c| - c.with_header do diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 42297a0cf3d..ff0b31da022 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -18,24 +18,22 @@ - register_2fa_token = _('We recommend using cloud-based authenticator applications that can restore access if you lose your hardware device.') = register_2fa_token.html_safe = link_to _('What are some examples?'), help_page_path('user/profile/account/two_factor_authentication', anchor: 'enable-one-time-password'), target: '_blank', rel: 'noopener noreferrer' - .row.gl-mb-3 - .col-md-4.gl-min-w-fit-content - .gl-p-2.gl-mb-3{ style: 'background: #fff' } - = raw @qr_code - .col-md-8 - = render Pajamas::CardComponent.new do |c| - - c.with_body do - %p.gl-mt-0.gl-mb-3.gl-font-weight-bold - = _("Can't scan the code?") - %p.gl-mt-0.gl-mb-3 - = _('To add the entry manually, provide the following details to the application on your phone.') - %p.gl-mt-0.gl-mb-0 - = _('Account: %{account}') % { account: @account_string } - %p.gl-mt-0.gl-mb-0{ data: { qa_selector: 'otp_secret_content' } } - = _('Key:') - %code.two-factor-secret= current_user.otp_secret.scan(/.{4}/).join(' ') - %p.gl-mb-0.two-factor-new-manual-content - = _('Time based: Yes') + .gl-p-2.gl-mb-3{ style: 'background: #fff' } + = raw @qr_code + .gl-mb-5 + = render Pajamas::CardComponent.new do |c| + - c.with_body do + %p.gl-mt-0.gl-mb-3.gl-font-weight-bold + = _("Can't scan the code?") + %p.gl-mt-0.gl-mb-3 + = _("To add the entry manually, provide the following details to the application on your phone.") + %p.gl-mt-0.gl-mb-0 + = _('Account: %{account}') % { account: @account_string } + %p.gl-mt-0.gl-mb-0{ data: { qa_selector: 'otp_secret_content' } } + = _('Key:') + %code.two-factor-secret= current_user.otp_secret.scan(/.{4}/).join(' ') + %p.gl-mb-0.two-factor-new-manual-content + = _('Time based: Yes') = form_tag profile_two_factor_auth_path, method: :post do |f| - if @error = render Pajamas::AlertComponent.new(title: @error[:message], |