diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 19:26:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 19:26:10 +0300 |
| commit | 6653ccc011dec86e5140a5d09ea3b2357eab6714 (patch) | |
| tree | 897193f37bcd98152a0ac214f80a3c4cfe1047c5 /app/views/devise/confirmations | |
| parent | bff35a05aed6a31380a73c39113808fd262c2c37 (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc41
Diffstat (limited to 'app/views/devise/confirmations')
| -rw-r--r-- | app/views/devise/confirmations/almost_there.haml | 16 | ||||
| -rw-r--r-- | app/views/devise/confirmations/new.html.haml | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml index bf321bb690b..684af933f3a 100644 --- a/app/views/devise/confirmations/almost_there.haml +++ b/app/views/devise/confirmations/almost_there.haml @@ -1,14 +1,14 @@ -.well-confirmation.text-center.gl-mb-6 +.well-confirmation.gl-text-center.gl-mb-6 %h1.gl-mt-0 - Almost there... + = _("Almost there...") %p.lead.gl-mb-6 - Please check your email to confirm your account + = _("Please check your email to confirm your account") %hr - if Gitlab::CurrentSettings.after_sign_up_text.present? - .well-confirmation.text-center + .well-confirmation.gl-text-center = markdown_field(Gitlab::CurrentSettings, :after_sign_up_text) %p.text-center - No confirmation email received? Please check your spam folder or -.gl-mb-6.prepend-top-20.text-center - %a.btn.btn-lg.btn-success{ href: new_user_confirmation_path } - Request new confirmation email + = _("No confirmation email received? Please check your spam folder or") +.gl-mb-6.prepend-top-20.gl-text-center + %a.btn.gl-button.btn-confirm{ href: new_user_confirmation_path } + = _("Request new confirmation email") diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index ace80ba16dd..024ccaddaa1 100644 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -8,7 +8,7 @@ = f.label :email = f.email_field :email, class: "form-control gl-form-input", required: true, title: 'Please provide a valid email address.', value: nil .clearfix - = f.submit "Resend", class: 'gl-button btn btn-success' + = f.submit "Resend", class: 'gl-button btn btn-confirm' .clearfix.prepend-top-20 = render 'devise/shared/sign_in_link' |