Commit 3584f5db authored by Chad Woolley's avatar Chad Woolley Committed by David O'Regan

Improve readability for MR review emails

- Removes override for font size of review comments
- Adds padding above divider line

Changelog: changed
parent 1f9ba955
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
%table{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" } %table{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" }
%tbody %tbody
%tr %tr
%td{ style: "color:#333333;border-bottom:1px solid #ededed;font-size:15px;font-weight:bold;line-height:1.4;padding: 20px 0;" } %td{ style: "color:#333333;border-bottom:1px solid #ededed;font-weight:bold;line-height:1.4;padding: 20px 0;" }
- mr_link = link_to(@merge_request.to_reference(@project), project_merge_request_url(@project, @merge_request)) - mr_link = link_to(@merge_request.to_reference(@project), project_merge_request_url(@project, @merge_request))
- mr_author_link = link_to(@author_name, user_url(@author)) - mr_author_link = link_to(@author_name, user_url(@author))
= _('Merge request %{mr_link} was reviewed by %{mr_author}').html_safe % { mr_link: mr_link, mr_author: mr_author_link } = _('Merge request %{mr_link} was reviewed by %{mr_author}').html_safe % { mr_link: mr_link, mr_author: mr_author_link }
%tr %tr
%td{ style: "overflow:hidden;font-size:14px;line-height:1.4;display:grid;" } %td{ style: "overflow:hidden;line-height:1.4;display:grid;" }
- @notes.each do |note| - @notes.each do |note|
-# Get preloaded note discussion -# Get preloaded note discussion
- discussion = @discussions[note.discussion_id] if note.part_of_discussion? - discussion = @discussions[note.discussion_id] if note.part_of_discussion?
-# Preload project for discussions first note -# Preload project for discussions first note
- discussion.first_note.project = @project if discussion&.first_note - discussion.first_note.project = @project if discussion&.first_note
- target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{note.id}") - target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{note.id}")
= render 'note_email', note: note, diff_limit: 3, target_url: target_url, note_style: "border-bottom:1px solid #ededed;", include_stylesheet_link: false, discussion: discussion, author: @author = render 'note_email', note: note, diff_limit: 3, target_url: target_url, note_style: "border-bottom:1px solid #ededed; padding-bottom: 1em;", include_stylesheet_link: false, discussion: discussion, author: @author
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