diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-22 23:47:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-22 23:47:30 +0300 |
| commit | 0ca9e9b7230cb262a04b524aee8ffe99dbe63060 (patch) | |
| tree | b26b9c2667a025a7e72f690e6789292028ece9de /app/views | |
| parent | fe69f9a3841ee9b9ef2b35cb72b3e973c0301fcb (diff) | |
Add latest changes from gitlab-org/gitlab@13-11-stable-ee
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/notify/in_product_marketing_email.html.haml | 10 | ||||
| -rw-r--r-- | app/views/notify/in_product_marketing_email.text.erb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/notify/in_product_marketing_email.html.haml b/app/views/notify/in_product_marketing_email.html.haml index 39f084efe40..015a12bbb6d 100644 --- a/app/views/notify/in_product_marketing_email.html.haml +++ b/app/views/notify/in_product_marketing_email.html.haml @@ -166,6 +166,10 @@ = about_link('mailers/in_product_marketing', 'gitlab-logo-gray-rgb.png', 200) %tr %td{ "aria-hidden" => "true", height: "30", style: "font-size: 0; line-height: 0;" } + %tr{ style: "background-color: #ffffff;" } + %td{ style: "color: #424242; padding: 10px 30px; text-align: center; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;font-size: 16px; line-height: 22px; border: 1px solid #dddddd" } + %p + = in_product_marketing_progress(@track, @series, format: :html).html_safe %tr %td{ bgcolor: "#ffffff", height: "auto", style: "max-width: 600px; width: 100%; text-align: center; height: 200px; padding: 25px 15px; mso-line-height-rule: exactly; min-height: 40px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;", valign: "middle", width: "100%" } = in_product_marketing_logo(@track, @series) @@ -184,10 +188,6 @@ %td{ align: "center", style: "padding: 10px 20px 80px 20px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;" } .cta_link= cta_link(@track, @series, @group, format: :html) %tr{ style: "background-color: #ffffff;" } - %td{ style: "color: #424242; padding: 10px 30px; text-align: center; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;font-size: 16px; line-height: 22px; border: 1px solid #dddddd" } - %p - = in_product_marketing_progress(@track, @series) - %tr{ style: "background-color: #ffffff;" } %td{ align: "center", style: "padding:75px 20px 25px;" } = about_link('', 'gitlab_logo.png', 80) %tr{ style: "background-color: #ffffff;" } @@ -202,4 +202,4 @@ %tr{ style: "background-color: #ffffff;" } %td{ align: "left", style: "padding:20px 30px 20px 30px;" } %span.footernav{ style: "color: #6e49cb; font-size: 14px; line-height: 20px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif; color:#424242;" } - = unsubscribe(format: :html).html_safe + = unsubscribe(@track, @series, format: :html).html_safe diff --git a/app/views/notify/in_product_marketing_email.text.erb b/app/views/notify/in_product_marketing_email.text.erb index ecc4c565b73..bc8315e49a0 100644 --- a/app/views/notify/in_product_marketing_email.text.erb +++ b/app/views/notify/in_product_marketing_email.text.erb @@ -20,4 +20,4 @@ <%= address %> -<%= unsubscribe %> +<%= unsubscribe(@track, @series) %> |