restyle and cleanup emails

diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 3db1f59..f88abec 100644 (file)
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -4,29 +4,19 @@
       %title
         GitLab
 
-  %body{bgcolor: "#EAEAEA", style: "margin: 0; padding: 0; background: #EAEAEA"}
-    %table{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 35px 0; background: #EAEAEA;", width: "100%"}
+  %body
+    %h1{style: "background: #EEE; border-bottom: 1px solid #DDD; color: #474D57; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
+      GitLab
+      - if @project
+        \|
+        = link_to @project.name_with_namespace, project_url(@project), style: 'color: #29B; text-decoration: none'
+    %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
       %tr
-        %td{align: "center", style: "margin: 0; padding: 0; background: #EAEAEA;"}
-          %table.header{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background:#333", width: "600"}
-            %tr
-              %td{style: "font-size: 0px;", width: "20"}
-                \ 
-              %td{align: "left", style: "padding: 10px 0", width: "580"}
-                %h1{style: "color: #BBBBBB; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"}
-                  GITLAB
-                  - if @project
-                    \/ #{@project.name_with_namespace}
-          %table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"}
-            %tr= yield
-            %tr
-              %td{align: "left", colspan: "2", height: "3", style: "padding: font-size: 0; line-height: 0; height: 3px;", width: "600"}
-          %table.footer{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; line-height: 10px;", width: "600"}
-            %tr
-              %td{align: "center", style: "padding: 5px 0 10px; font-size: 11px; color:#7d7a7a; margin: 0; line-height: 1.2;font-family: Helvetica, Arial, sans-serif;", valign: "top"}
-                %br
-                  %p{style: "font-size: 11px; color:#7d7a7a; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;"}
-                    You're receiving this notification because you are a member of the
-                    - if @project
-                      #{@project.name_with_namespace}
-                    project team.
+        %td{align: "left", style: "margin: 0; padding: 10px;"}
+          = yield
+          %br
+      %tr
+        %td{align: "left", style: "margin: 0; padding: 10px;"}
+          %p{style: "font-size:small;color:#777"}
+            - if @project
+              You're receiving this notification because you are a member of the #{@project.name_with_namespace} project team.

diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml
new file mode 100644 (file)
index 0000000..88c4df5
--- /dev/null
+++ b/app/views/notify/_note_message.html.haml
@@ -0,0 +1,6 @@
+%p
+  %strong #{@note.author_name}
+  left next message:
+
+%cite{style: 'color: #666'}
+  = markdown(@note.note)

diff --git a/app/views/notify/issue_status_changed_email.html.haml b/app/views/notify/issue_status_changed_email.html.haml
index 27168ee..4cdb709 100644 (file)
--- a/app/views/notify/issue_status_changed_email.html.haml
+++ b/app/views/notify/issue_status_changed_email.html.haml
@@ -1,16 +1,5 @@
-%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: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = "Issue was #{@issue_status} by #{@updated_by.name}"
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}
-          = "Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
-        %br
-
+%p
+  = "Issue was #{@issue_status} by #{@updated_by.name}"
+%p
+  = "Issue ##{@issue.id}"
+  = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title

diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 3cb5351..0c89174 100644 (file)
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -1,15 +1,5 @@
-%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: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New Issue was created and assigned to you.
-      %td{width: "21"}
-    %tr
-      %td{width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}
-          = "Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
-        %br
+%p
+  New Issue was created and assigned to you.
+%p
+  = "Issue ##{@issue.id}"
+  = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title

diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 990d4d2..0f1cfff 100644 (file)
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -1,19 +1,9 @@
-%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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = "New Merge Request !#{@merge_request.id}"
-        %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}
-          = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
-      %td
+%p
+  = "New Merge Request !#{@merge_request.id}"
+%p
+  = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
+%p
+  Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}
+%p
+  Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
 

diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index e8e9735..8606dc6 100644 (file)
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -1,27 +1,16 @@
-%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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          Hi #{@user['name']}!
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          - if Gitlab.config.gitlab.signup_enabled
-            Account has been created successfully.
-          - else
-            Administrator created account for you. Now you are a member of company GitLab application.
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
-          login..........................................
-          %code= @user['email']
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
-          - unless Gitlab.config.gitlab.signup_enabled
-            password..................................
-            %code= @password
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          = link_to "Click here to login", root_url
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-
+%p
+  Hi #{@user['name']}!
+%p
+  - if Gitlab.config.gitlab.signup_enabled
+    Account has been created successfully.
+  - else
+    Administrator created account for you. Now you are a member of company GitLab application.
+%p
+  login..........................................
+  %code= @user['email']
+%p
+  - unless Gitlab.config.gitlab.signup_enabled
+    password..................................
+    %code= @password
+%p
+  = link_to "Click here to login", root_url

diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml
index e87f9c1..620b258 100644 (file)
--- a/app/views/notify/note_commit_email.html.haml
+++ b/app/views/notify/note_commit_email.html.haml
@@ -1,23 +1,5 @@
-%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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = "New comment for Commit #{@commit.short_id}"
-          = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@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:20px;border:1px solid #ddd" }
-                  = markdown(@note.note)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+%p
+  = "New comment for Commit #{@commit.short_id}"
+  = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
+= render 'note_message'
 

diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
index 832f5df..ca13312 100644 (file)
--- a/app/views/notify/note_issue_email.html.haml
+++ b/app/views/notify/note_issue_email.html.haml
@@ -1,23 +1,4 @@
-%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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = "New comment for Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@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:20px;border:1px solid #ddd" }
-                  = markdown(@note.note)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-
+%p
+  = "New comment for Issue ##{@issue.id}"
+  = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
+= render 'note_message'

diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 3857f2f..4f97867 100644 (file)
--- 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'

diff --git a/app/views/notify/note_wall_email.html.haml b/app/views/notify/note_wall_email.html.haml
index 0661c58..48344a0 100644 (file)
--- a/app/views/notify/note_wall_email.html.haml
+++ b/app/views/notify/note_wall_email.html.haml
@@ -1,22 +1,5 @@
-%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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New message on
-          = link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@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:20px;border:1px solid #ddd" }
-                  = markdown(@note.note)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+%p
+  New message on
+  = link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")
+
+= render 'note_message'

diff --git a/app/views/notify/project_access_granted_email.html.haml b/app/views/notify/project_access_granted_email.html.haml
index 11117bf..b4b44ea 100644 (file)
--- a/app/views/notify/project_access_granted_email.html.haml
+++ b/app/views/notify/project_access_granted_email.html.haml
@@ -1,15 +1,5 @@
-%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;" }
-          = "You have been granted #{@users_project.project_access_human} access to project"
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{width: "21"}
-      %td
-        %h3
-          = link_to project_url(@project) do
-            = @project.name_with_namespace
-        %br
+%p
+  = "You have been granted #{@users_project.project_access_human} access to project"
+%p
+  = link_to project_url(@project) do
+    = @project.name_with_namespace

diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml
index 222bd0f..3e761c4 100644 (file)
--- a/app/views/notify/project_was_moved_email.html.haml
+++ b/app/views/notify/project_was_moved_email.html.haml
@@ -1,25 +1,11 @@
-%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: #555; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
-    %tr
-      %td{width: "21"}
-      %td
-        %h2
-          = "Project was moved to another location"
-      %td{width: "21"}
-    %tr
-      %td{width: "21"}
-      %td
-        %p
-          The project is now located under
-          = link_to project_url(@project) do
-            = @project.name_with_namespace
-        %p
-          To update the remote url in your local repository run:
-        %br
-        %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
-          %tr
-            %td{valign: "top"}
-              %p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
-                git remote set-url origin #{@project.ssh_url_to_repo}
-        %br
-      %td{ width: "21"}
+%p
+  = "Project was moved to another location"
+%p
+  The project is now located under
+  = link_to project_url(@project) do
+    = @project.name_with_namespace
+%p
+  To update the remote url in your local repository run:
+%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
+  git remote set-url origin #{@project.ssh_url_to_repo}
+%br

diff --git a/app/views/notify/reassigned_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml
index bc2d6f7..018f20b 100644 (file)
--- a/app/views/notify/reassigned_issue_email.html.haml
+++ b/app/views/notify/reassigned_issue_email.html.haml
@@ -1,16 +1,9 @@
-%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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td
-        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = "Reassigned Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          Assignee changed from #{@previous_assignee.name} to #{@issue.assignee_name}
-      %td
+%p
+  = "Reassigned Issue ##{@issue.id}"
+  = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
+%p
+  Assignee changed from
+  %strong #{@previous_assignee.name}
+  to
+  %strong #{@issue.assignee_name}
 

diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml
index 8f7308b..9039bc8 100644 (file)
--- a/app/views/notify/reassigned_merge_request_email.html.haml
+++ b/app/views/notify/reassigned_merge_request_email.html.haml
@@ -1,16 +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{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = "Reassigned Merge Request !#{@merge_request.id}"
-          = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          Assignee changed from #{@previous_assignee.name} to #{@merge_request.assignee_name}
-      %td
-
+%p
+  = "Reassigned Merge Request !#{@merge_request.id}"
+  = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request)
+%p
+  Assignee changed from
+  %strong #{@previous_assignee.name}
+  to
+  %strong #{@merge_request.assignee_name}