Commit 535af620 authored by Bryce Johnson's avatar Bryce Johnson

Fix copy.

parent 4e5512d9
......@@ -65,7 +65,7 @@
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;" }
%img{ alt: "✓", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'), style: "display:block;", width: "13" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" }
%p= "Merge Request #{@merge_request.to_reference} was approved by #{@approved_by_users.to_sentence} (#{@merge_request.approvals.count}/#{@merge_request.approvals_required})"
%p Merge request was approved!
%tr.spacer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
 
......@@ -75,9 +75,9 @@
%tbody
%tr{ style: 'width:100%;'}
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;text-align:center;" }
%span{ style: "font-weight: bold;color:#333333;"} Merge Request
%a{ href: 'hello', style: "font-weight: bold;color:#3777b0;text-decoration:none" } #{@merge_request.to_reference}
%span was approved by
%span{ style: "font-weight: bold;color:#333333;"} Merge Request
%a{ href: 'hello', style: "font-weight: bold;color:#3777b0;text-decoration:none" } #{@merge_request.to_reference}
%span was approved by
%img.avatar{ height: "24", src: avatar_icon(@merge_request.assignee, 24), style: "border-radius:12px;margin:-7px 0 -7px 3px;", width: "24", alt: "Avatar" }/
%a.muted{ href: user_url(@merge_request.assignee), style: "color:#333333;text-decoration:none;" }
= @merge_request.assignee.name
......@@ -97,7 +97,7 @@
= namespace_name
\/
%a.muted{ href: project_url(@project), style: "color:#333333;text-decoration:none;" }
= @project.name
= @project.name
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Branch
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
......
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