Simplify the default layout of notification emails

* Less margin: the content appears as the text of the message.

* Streamlined footer: everything on one line, with a small separator.

* Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display
the content of the message. Switching to a simpler layout fixes the
issue.
parent 7959455f
...@@ -3,17 +3,24 @@ ...@@ -3,17 +3,24 @@
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"} %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
%title %title
GitLab GitLab
:css
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
%body %body
%table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"} %div.content
%tr
%td{align: "left", style: "margin: 0; padding: 10px;"}
= yield = yield
%tr %div.footer{style: "margin-top: 10px;"}
%td{align: "left", style: "margin: 0; padding: 10px;"} %p
%p{style: "font-size:small;color:#777"} \—
%br
- if @project - if @project
You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team. You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
%br
- if @target_url - if @target_url
#{link_to "View in GitLab", @target_url} #{link_to "View in GitLab", @target_url}
%p %p.details
= "New Merge Request ##{@merge_request.iid}"
%p
!= merge_path_description(@merge_request, '→') != merge_path_description(@merge_request, '→')
- if @merge_request.assignee_id.present? - if @merge_request.assignee_id.present?
......
%p %p.details
- if @note.for_diff_line? - if @note.for_diff_line?
= link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}") = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
- else - else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment