diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-12 12:46:04 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-12 12:46:04 +0400 |
| commit | b1e425511fd9f79da5289f1651bb8e9397b384f5 (patch) | |
| tree | 40db19ca2a08d083df6defa1b7439b958bbdf8c2 /app/views/notify/note_merge_request_email.html.haml | |
| parent | 7367f1cfd8f3cd134a0de4d9121c67ec8fd1f477 (diff) | |
restyle and cleanup emails
Diffstat (limited to 'app/views/notify/note_merge_request_email.html.haml')
| -rw-r--r-- | app/views/notify/note_merge_request_email.html.haml | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml index 3857f2f0318..4f97867e49d 100644 --- a/app/views/notify/note_merge_request_email.html.haml +++ b/app/views/notify/note_merge_request_email.html.haml @@ -1,27 +1,8 @@ -%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} - %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"} - %tr - %td{width: "21"} - %td - %h2{style: "color:#646464; font-weight: normal;"} - - if @note.for_diff_line? - = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") - - else - = link_to "New comment", project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") - for Merge Request ##{@merge_request.id} - %cite "#{truncate(@merge_request.title, length: 20)}" - %td{width: "21"} - %tr - %td{width: "21"} - %td - %p - %strong #{@note.author_name} - left next message: - %br - %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"} - %tr - %td{valign: "top"} - %div{ style: "background:#f5f5f5; padding:10px 20px;border:1px solid #ddd" } - = markdown(@note.note) - %td{width: "21"} - +%p + - if @note.for_diff_line? + = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") + - else + = link_to "New comment", project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") + for Merge Request ##{@merge_request.id} + %cite "#{truncate(@merge_request.title, length: 20)}" += render 'note_message' |