From a6045df701aaf21f9af09227564eddb891f5e3f2 Mon Sep 17 00:00:00 2001 From: Brett Walker Date: Wed, 6 Sep 2017 18:39:55 +0200 Subject: [PATCH] move #cta properly under #content --- .../_confirmation_instructions_account.html.haml | 8 ++++---- .../_confirmation_instructions_secondary.html.haml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/devise/mailer/_confirmation_instructions_account.html.haml b/app/views/devise/mailer/_confirmation_instructions_account.html.haml index a508b7537a2..3090fc0a2c0 100644 --- a/app/views/devise/mailer/_confirmation_instructions_account.html.haml +++ b/app/views/devise/mailer/_confirmation_instructions_account.html.haml @@ -2,8 +2,8 @@ #content = email_default_heading(@resource.unconfirmed_email) %p Click the link below to confirm your email address. - #cta - = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token) + #cta + = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token) - else #content - if Gitlab.com? @@ -11,5 +11,5 @@ - else = email_default_heading("Welcome, #{@resource.name}!") %p To get started, click the link below to confirm your account. - #cta - = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token) + #cta + = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token) diff --git a/app/views/devise/mailer/_confirmation_instructions_secondary.html.haml b/app/views/devise/mailer/_confirmation_instructions_secondary.html.haml index 83f5edbde7a..3d0a1f622a5 100644 --- a/app/views/devise/mailer/_confirmation_instructions_secondary.html.haml +++ b/app/views/devise/mailer/_confirmation_instructions_secondary.html.haml @@ -1,8 +1,8 @@ #content = email_default_heading("#{@resource.user.name}, you've added an additional email!") %p Click the link below to confirm your email address (#{@resource.email}) -#cta - = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token) -%p - If this email was added in error, you can remove it here: - = link_to "Emails", profile_emails_url + #cta + = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token) + %p + If this email was added in error, you can remove it here: + = link_to "Emails", profile_emails_url