Use proper classes for sdiff content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 29 insertions, 33 deletions

diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index ee65ae1e2f5..9b1f4d77587 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -36,21 +36,17 @@
   .discussion-body
     - if note.for_diff_line?
       - if note.active?
-        .content
-          .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
+        = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
       - else
         = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
         %div.hide.outdated-discussion
-          .content
-            .notes{ rel: discussion_notes.first.discussion_id }
-              = render discussion_notes
-
+          .notes{ rel: discussion_notes.first.discussion_id }
+            = render discussion_notes
 
     - else
-      .content
-        .notes{ rel: discussion_notes.first.discussion_id }
-          = render discussion_notes
-        = render "projects/notes/discussion_reply_button", note: discussion_notes.first
+      .notes{ rel: discussion_notes.first.discussion_id }
+        = render discussion_notes
+      = render "projects/notes/discussion_reply_button", note: discussion_notes.first
 
     -# will be shown when the other one is hidden
     .discussion-hidden.content.hide
@@ -59,4 +55,3 @@
         = link_to "javascript:;", class: "js-details-target js-toggler-target" do
           %i.icon-eye-open
           Show
-
diff --git a/app/views/projects/notes/_discussion_diff.html.haml b/app/views/projects/notes/_discussion_diff.html.haml
index c3f41a1b6b5..687fac04973 100644
--- a/app/views/projects/notes/_discussion_diff.html.haml
+++ b/app/views/projects/notes/_discussion_diff.html.haml
@@ -1,24 +1,25 @@
 - diff = note.diff
-.header
-  - if diff.deleted_file
-    %span= diff.old_path
-  - else
-    %span= diff.new_path
-    - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
-      %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
-  %br/
-.content
-  %table
-    - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
-      %tr.line_holder{ id: line_code }
-        - if type == "match"
-          %td.old_line= "..."
-          %td.new_line= "..."
-          %td.line_content.matched= line
-        - else
-          %td.old_line= raw(type == "new" ? " " : line_old)
-          %td.new_line= raw(type == "old" ? " " : line_new)
-          %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "
+.diff-file
+  .diff-header
+    - if diff.deleted_file
+      %span= diff.old_path
+    - else
+      %span= diff.new_path
+      - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
+        %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
+    %br/
+  .diff-content
+    %table
+      - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
+        %tr.line_holder{ id: line_code }
+          - if type == "match"
+            %td.old_line= "..."
+            %td.new_line= "..."
+            %td.line_content.matched= line
+          - else
+            %td.old_line= raw(type == "new" ? " " : line_old)
+            %td.new_line= raw(type == "old" ? " " : line_new)
+            %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "
 
-          - if line_code == note.line_code
-            = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
+            - if line_code == note.line_code
+              = render "projects/notes/diff_notes_with_reply", notes: discussion_notes