Merge branch '46340-remove-extra-spaces-from-mr-discussion-notes-after-vuejs' into 'master'

Remove extra spaces from MR discussion notes

Closes #46340

See merge request gitlab-org/gitlab-ce!21461

app/assets/javascripts/diffs/components/inline_diff_comment_row.vue

@@ -44,10 +44,9 @@ export default {
     class="notes_holder"
   >
     <td
-      class="notes_line"
-      colspan="2"
-    ></td>
-    <td class="notes_content">
+      class="notes_content"
+      colspan="3"
+    >
       <div class="content">
         <diff-discussions
           v-if="discussions.length"

app/assets/javascripts/notes.js

@@ -1074,7 +1074,7 @@ export default class Notes {
     addForm = false;
     let lineTypeSelector = '';
     rowCssToAdd =
-      '<tr class="notes_holder js-temp-notes-holder"><td class="notes_line" colspan="2"></td><td class="notes_content"><div class="content"></div></td></tr>';
+      '<tr class="notes_holder js-temp-notes-holder"><td class="notes_content" colspan="3"><div class="content"></div></td></tr>';
     // In parallel view, look inside the correct left/right pane
     if (this.isParallelView()) {
       lineTypeSelector = `.${lineType}`;

app/assets/javascripts/notes/components/diff_with_note.vue

@@ -148,10 +148,9 @@ export default {
         </tr>
         <tr class="notes_holder">
           <td
-            class="notes_line"
-            colspan="2"
-          ></td>
-          <td class="notes_content">
+            class="notes_content"
+            colspan="3"
+          >
             <slot></slot>
           </td>
         </tr>

app/assets/stylesheets/pages/notes.scss

@@ -334,20 +334,6 @@ ul.notes {
       border: 1px solid $white-normal;
       border-left: 0;
 
-      &.notes_line {
-        vertical-align: middle;
-        text-align: center;
-        padding: 10px 0;
-        background: $gray-light;
-        color: $text-color;
-      }
-
-      &.notes_line2 {
-        text-align: center;
-        padding: 10px 0;
-        border-left: 1px solid $note-line2-border !important;
-      }
-
       &.notes_content {
         background-color: $gray-light;
         border-width: 1px 0;

app/views/discussions/_diff_discussion.html.haml

@@ -4,7 +4,6 @@
   -# Text diff discussions
   - expanded = local_assigns.fetch(:expanded, true)
   %tr.notes_holder{ class: ('hide' unless expanded) }
-    %td.notes_line{ colspan: 2 }
-    %td.notes_content
+    %td.notes_content{ colspan: 3 }
       .content{ class: ('hide' unless expanded) }
         = render partial: "discussions/notes", collection: discussions, as: :discussion, locals: { disable_collapse_class: true }

app/views/discussions/_parallel_diff_discussion.html.haml

@@ -1,21 +1,17 @@
 - expanded = [*discussions_left, *discussions_right].any?(&:expanded?)
 %tr.notes_holder{ class: ('hide' unless expanded) }
   - if discussions_left
-    %td.notes_line.old
-    %td.notes_content.parallel.old
+    %td.notes_content.parallel.old{ colspan: 2 }
       .content{ class: ('hide' unless discussions_left.any?(&:expanded?)) }
         = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old', locals: { disable_collapse_class: true }
   - else
-    %td.notes_line.old= ("")
-    %td.notes_content.parallel.old
+    %td.notes_content.parallel.old{ colspan: 2 }
       .content
 
   - if discussions_right
-    %td.notes_line.new
-    %td.notes_content.parallel.new
+    %td.notes_content.parallel.new{ colspan: 2 }
       .content{ class: ('hide' unless discussions_right.any?(&:expanded?)) }
         = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new', locals: { disable_collapse_class: true }
   - else
-    %td.notes_line.new= ("")
-    %td.notes_content.parallel.new
+    %td.notes_content.parallel.new{ colspan: 2 }
       .content

changelogs/unreleased/46340-remove-extra-spaces-from-mr-discussion-notes.yml

@@ -0,0 +1,5 @@
+---
+title: Remove extra spaces from MR discussion notes
+merge_request: 18946
+author: Takuya Noguchi
+type: other