Merge branch 'ps-fix-enhanced-notify-css-vertical-spacing' into 'master'

Fix vertical spacing in enhanced_notify_css emails

See merge request gitlab-org/gitlab!84004

app/assets/stylesheets/notify_enhanced.scss

@@ -26,11 +26,15 @@ a {
   text-decoration: none;
 }
 
-.content {
-  .md {
-    padding: 1rem 0;
-  }
+.gl-mb-5 {
+  @include gl-mb-5;
+}
 
+.gl-mt-5 {
+  @include gl-mt-5;
+}
+
+.content {
   hr {
     border: 1px solid #e1e1e1;
   }

app/views/notify/_note_email.html.haml

@@ -27,7 +27,7 @@
     = content_for :head do
       = stylesheet_link_tag 'mailers/highlighted_diff_email'
 
-  %table.code
+  %table.code.gl-mb-5
     = render partial: "projects/diffs/email_line",
       collection: discussion.truncated_diff_lines(diff_limit: diff_limit),
       as: :line,

app/views/notify/new_merge_request_email.html.haml

@@ -2,18 +2,17 @@
   = html_escape(_('%{user} created a merge request: %{mr_link}')) % { user: link_to(@merge_request.author_name, user_url(@merge_request.author)),
                                                                       mr_link: merge_request_reference_link(@merge_request) }
 
-%p
-  .branch
-    = merge_path_description(@merge_request, 'to')
-  .author
-    Author: #{@merge_request.author_name}
-  .assignee
-    = assignees_label(@merge_request)
-  .reviewer
-    = reviewers_label(@merge_request)
-  .approvers
-    = render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter
+.branch
+  = merge_path_description(@merge_request, 'to')
+.author
+  Author: #{@merge_request.author_name}
+.assignee
+  = assignees_label(@merge_request)
+.reviewer
+  = reviewers_label(@merge_request)
+.approvers
+  = render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter
 
 - if @merge_request.description
-  .md
+  .md.gl-mt-5
     = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author, current_user: @recipient, issuable_reference_expansion_enabled: true)

app/views/notify/service_desk_new_note_email.html.haml

 - if Gitlab::CurrentSettings.email_author_in_body
-  %div
+  .gl-mb-5
     = _("%{author_link} wrote:").html_safe % { author_link: link_to(@note.author_name, user_url(@note.author)) }
 .md
   = markdown(@note.note, pipeline: :email, author: @note.author, issuable_reference_expansion_enabled: true)

ee/app/views/notify/add_merge_request_approver_email.html.haml

 - if Gitlab::CurrentSettings.email_author_in_body
-  %div
+  .gl-mb-5
     #{link_to @updated_by.name, user_url(@updated_by)} added you as an approver for:
-%p
-  .details
-    = merge_path_description(@merge_request, '→')
-  .author
-    Author: #{sanitize_name(@merge_request.author_name)}
-  .assignee
-    = assignees_label(@merge_request)
-  .reviewer
-    = reviewers_label(@merge_request)
-  .approvers
-    = render 'notify/merge_request_approvers', presenter: @mr_presenter
+
+.details
+  = merge_path_description(@merge_request, '→')
+.author
+  Author: #{sanitize_name(@merge_request.author_name)}
+.assignee
+  = assignees_label(@merge_request)
+.reviewer
+  = reviewers_label(@merge_request)
+.approvers
+  = render 'notify/merge_request_approvers', presenter: @mr_presenter
 
 - if @merge_request.description
-  .md
+  .md.gl-mt-5
     = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author, current_user: @recipient, issuable_reference_expansion_enabled: true)