Remove comment gutters; remove commented out scss

3 files changed, 8 insertions, 23 deletions

diff --git a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
index 3339c56cbb6..3b71c0a1fd4 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
@@ -76,8 +76,9 @@ export default {
     :class="className"
     class="notes_holder"
   >
-    <td class="notes_line old"></td>
-    <td class="notes_content parallel old">
+    <td
+      class="notes_content parallel old"
+      colspan="2">
       <div
         v-if="shouldRenderDiscussionsOnLeft"
         class="content"
@@ -95,8 +96,9 @@ export default {
         line-position="left"
       />
     </td>
-    <td class="notes_line new"></td>
-    <td class="notes_content parallel new">
+    <td
+      class="notes_content parallel new"
+      colspan="2">
       <div
         v-if="shouldRenderDiscussionsOnRight"
         class="content"
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index e81dd1b5626..4a311da1675 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -1,5 +1,4 @@
 .timeline {
-  // @include basic-list;
   margin: 0;
   padding: 0;
   list-style: none;
@@ -27,10 +26,8 @@
 }
 
 .timeline-entry {
-  // border-color: $white-normal;
   color: $gl-text-color;
-  // border-bottom: 1px solid $border-white-light;
-  background: $white-light;
+  background-color: $white-light;
 
   .timeline-entry-inner {
     position: relative;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 067e24f85f8..11f9977b696 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -157,10 +157,6 @@ $note-form-margin-left: 70px;
     position: relative;
     border-bottom: 0;
 
-    // @include notes-media('min', map-get($grid-breakpoints, sm)) {
-    //   padding-left: $note-icon-gutter-width;
-    // }
-
     &:target,
     &.target {
       border-bottom: 1px solid $white-normal;
@@ -273,7 +269,7 @@ $note-form-margin-left: 70px;
   .system-note {
     padding: 6px $gl-padding;
     margin: $gl-padding-24 0;
-    background: transparent;
+    background-color: transparent;
 
     .note-header-info {
       padding-bottom: 0;
@@ -315,11 +311,6 @@ $note-form-margin-left: 70px;
       border-radius: $system-note-icon-size;
       margin: -6px $gl-padding 0 2px;
 
-      // @include notes-media('min', map-get($grid-breakpoints, sm)) {
-      //   margin-left: 0;
-      //   width: auto;
-      // }
-
       svg {
         width: $system-note-svg-size;
         height: $system-note-svg-size;
@@ -418,11 +409,6 @@ $note-form-margin-left: 70px;
   }
 
   .discussion-notes {
-    @include notes-media('min', map-get($grid-breakpoints, md)) {
-      border-left: 1px solid $border-color;
-      margin-left: 99px;
-    }
-
     &:not(:first-child) {
       border-top: 1px solid $white-normal;
       margin-top: 20px;