From 504e9e1ae068cb1ad2b3261f7533fe09dd03c3a1 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Wed, 14 Nov 2018 23:17:02 +0200
Subject: [PATCH] Remove unnecessary line before reply holder

---
 app/assets/stylesheets/pages/note_form.scss           | 11 ++++++++---
 app/assets/stylesheets/pages/notes.scss               |  1 -
 ...gt-remove-unnecessary-line-before-reply-holder.yml |  5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 97b3f696139..011fdf63fb7 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -236,17 +236,22 @@ table {
   }
 }
 
-.discussion-body,
-.diff-file {
+.discussion-body {
   .discussion-reply-holder {
     background-color: $white-light;
-    padding: 10px 16px;
     border-radius: 0 0 3px 3px;
+    padding: 0 $gl-padding 10px;
 
     &.is-replying {
       padding-bottom: $gl-padding;
     }
   }
+
+  .diff-file {
+    .discussion-reply-holder {
+      padding: 10px 16px;
+    }
+  }
 }
 
 .discussion-with-resolve-btn {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 39d01c49fd7..d40c34b2402 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -514,7 +514,6 @@ $note-form-margin-left: 72px;
 
   .discussion-reply-holder {
     border-radius: 0 0 $border-radius-default $border-radius-default;
-    border-top: 1px solid $border-color;
     position: relative;
   }
 }
diff --git a/changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml b/changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml
new file mode 100644
index 00000000000..142a9c1f2cc
--- /dev/null
+++ b/changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml
@@ -0,0 +1,5 @@
+---
+title: Remove unnecessary line before reply holder
+merge_request: 23092
+author: George Tsiolis
+type: changed