3 files changed, 12 insertions, 35 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 233aada9c38..3d5208c3db5 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -36,7 +36,6 @@
   &:target,
   &.target {
     background: $line-target-blue;
-    margin-bottom: $gl-padding;
 
     &.system-note .note-body .note-text.system-note-commit-list::after {
       background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%);
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 6aa0b779b42..5b30295adf9 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -255,7 +255,6 @@ table {
     display: flex;
   }
 
-
   .discussion-actions {
     display: table;
 
@@ -276,8 +275,10 @@ table {
     }
   }
 
-  .btn {
-    width: 100%;
+  @include media-breakpoint-down(xs) {
+    .btn {
+      width: 100%;
+    }
   }
 
   .btn-text-field {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 6cab255a18e..2adfa0d312e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -27,8 +27,10 @@ $note-form-margin-left: 72px;
   }
 }
 
-.main-notes-list {
-  @include vertical-line(36px);
+.issuable-discussion {
+  .main-notes-list {
+    @include vertical-line(36px);
+  }
 }
 
 .notes {
@@ -76,10 +78,10 @@ $note-form-margin-left: 72px;
     .card {
       border: 0;
     }
+  }
 
-    li.note {
-      border-bottom: 1px solid $border-color;
-    }
+  li.note {
+    border-bottom: 1px solid $border-color;
   }
 
   .replies-toggle {
@@ -161,19 +163,6 @@ $note-form-margin-left: 72px;
     position: relative;
     border-bottom: 0;
 
-    &:target,
-    &.target {
-      border-bottom: 1px solid $white-normal;
-
-      &:not(:first-child) {
-        border-top: 1px solid $white-normal;
-      }
-
-      .timeline-entry-inner {
-        border-bottom: 0;
-      }
-    }
-
     &.being-posted {
       pointer-events: none;
       opacity: 0.5;
@@ -461,7 +450,7 @@ $note-form-margin-left: 72px;
     font-family: $regular-font;
 
     td {
-      border: 1px solid $white-normal;
+      border: 1px solid $border-color;
       border-left: 0;
 
       &.notes_content {
@@ -503,8 +492,6 @@ $note-form-margin-left: 72px;
   }
 
   .note-wrapper {
-    @include outline-comment();
-
     &.system-note {
       border: 0;
       margin-left: 20px;
@@ -518,10 +505,6 @@ $note-form-margin-left: 72px;
 }
 
 .commit-diff {
-  .notes {
-    @include vertical-line(52px);
-  }
-
   .notes_content {
     background-color: $white-light;
   }
@@ -937,12 +920,6 @@ $note-form-margin-left: 72px;
     border-bottom: 1px solid $border-color;
   }
 
-  .note-wrapper.outlined {
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-  }
-
   .discussion-form-container {
     padding: $gl-padding;
   }