Merge branch 'move-email-footer-info-to-single-line' into 'master'
Move email footer info to a single line See merge request gitlab-org/gitlab-ce!17916
This commit is contained in:
commit
4718f22f57
|
@ -67,12 +67,8 @@
|
||||||
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
|
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
|
||||||
%img{ alt: "GitLab", height: "33", src: image_url('mailers/gitlab_footer_logo.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
|
%img{ alt: "GitLab", height: "33", src: image_url('mailers/gitlab_footer_logo.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
|
||||||
%div
|
%div
|
||||||
%a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
|
- manage_notifications_link = link_to(_("Manage all notifications"), profile_notifications_url, style: "color:#3777b0;text-decoration:none;")
|
||||||
·
|
- help_link = link_to(_("Help"), help_url, style: "color:#3777b0;text-decoration:none;")
|
||||||
%a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
|
= _("You're receiving this email because of your account on %{host}. %{manage_notifications_link} · %{help_link}").html_safe % { host: Gitlab.config.gitlab.host, manage_notifications_link: manage_notifications_link, help_link: help_link }
|
||||||
%div
|
|
||||||
You're receiving this email because of your account on
|
|
||||||
= succeed "." do
|
|
||||||
%a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host
|
|
||||||
|
|
||||||
= yield :additional_footer
|
= yield :additional_footer
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Move email footer info to a single line
|
||||||
|
merge_request: 17916
|
||||||
|
author:
|
||||||
|
type: changed
|
Loading…
Reference in New Issue