From 9472d1372fca687d3ee764feed51772e883237a7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 16 Dec 2015 15:41:50 +0100
Subject: [PATCH] Fix double border in MR discussion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/timeline.scss | 3 +--
 app/assets/stylesheets/pages/issuable.scss     | 2 +-
 app/assets/stylesheets/pages/issues.scss       | 7 +++++++
 app/assets/stylesheets/pages/note_form.scss    | 1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index eb53c4153d3..ff41e26ed8a 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -10,8 +10,7 @@
     margin-left: -$gl-padding;
     margin-right: -$gl-padding;
     color: $gl-gray;
-    border-bottom: 1px solid #ECEEF1;
-    border-right: 1px solid #ECEEF1;
+    border-bottom: 1px solid $border-white-light;
 
     &:target {
       background: $hover;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 797a0af3720..d6f51e6adc8 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -51,7 +51,7 @@
   }
 
   section {
-    border-right: 1px solid #ECEEF1;
+    border-right: 1px solid $border-white-light;
 
     > .tab-content {
       margin-right: 1px;
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index a652b65502f..12b190ef925 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -149,3 +149,10 @@ form.edit-issue {
 .issue-form .select2-container {
   width: 250px !important;
 }
+
+
+.issue-discussion {
+  .common-note-form {
+    border-right: 1px solid $border-white-light;
+  }
+}
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index e1a72af0013..4cf1a28c459 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -79,7 +79,6 @@
   padding: $gl-padding;
   margin-left: -$gl-padding;
   margin-right: -$gl-padding;
-  border-right: 1px solid $border-color;
   border-top: 1px solid $border-color;
   margin-bottom: -$gl-padding;
 }