diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/assets/javascripts/authentication | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/assets/javascripts/authentication')
-rw-r--r-- | app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue index 55642aa64db..f89600fbed3 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue @@ -1,5 +1,5 @@ <script> -import { GlSprintf, GlButton, GlAlert } from '@gitlab/ui'; +import { GlSprintf, GlButton, GlAlert, GlCard } from '@gitlab/ui'; import Mousetrap from 'mousetrap'; import { __ } from '~/locale'; import Tracking from '~/tracking'; @@ -34,7 +34,7 @@ export default { recoveryCodeDownloadFilename: RECOVERY_CODE_DOWNLOAD_FILENAME, i18n, mousetrap: null, - components: { GlSprintf, GlButton, GlAlert, ClipboardButton }, + components: { GlSprintf, GlButton, GlAlert, ClipboardButton, GlCard }, mixins: [Tracking.mixin()], props: { codes: { @@ -116,8 +116,8 @@ export default { </gl-sprintf> </p> - <div - class="codes-to-print gl-my-5 gl-p-5 gl-border-solid gl-border-1 gl-border-gray-100 gl-rounded-base" + <gl-card + class="codes-to-print gl-my-5" data-testid="recovery-codes" data-qa-selector="codes_content" > @@ -126,7 +126,7 @@ export default { <span class="gl-font-monospace" data-qa-selector="code_content">{{ code }}</span> </li> </ul> - </div> + </gl-card> <div class="gl-my-n2 gl-mx-n2 gl-display-flex gl-flex-wrap"> <div class="gl-p-2"> <clipboard-button @@ -140,6 +140,7 @@ export default { </div> <div class="gl-p-2"> <gl-button + is-unsafe-link :href="codeDownloadUrl" :title="$options.i18n.downloadButton" icon="download" |