From 8f489131f32e45b0848475848c22405e8de6f5ff Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Wed, 1 Jul 2020 02:03:37 +0300
Subject: [PATCH] Fix merge section in dark theme (#12086)

* Fix merge section in dark theme

* Fix lint
---
 web_src/less/themes/theme-arc-green.less | 55 +++++++++++++-----------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less
index 5c313eb9f5..6e9f018f89 100644
--- a/web_src/less/themes/theme-arc-green.less
+++ b/web_src/less/themes/theme-arc-green.less
@@ -521,11 +521,6 @@ a:hover {
     color: #ffffff;
 }
 
-.repository.view.issue .comment-list .comment .content > .bottom.segment a {
-    border: solid 1px #353945;
-    background-color: #353945;
-}
-
 .ui.attached.header {
     background: #404552;
     border: 1px solid #404552;
@@ -953,21 +948,6 @@ a.ui.basic.green.label:hover {
     border: 1px solid #404552;
 }
 
-.repository.view.issue .comment-list .comment .content > .bottom.segment {
-    background: #353945;
-}
-
-.repository.view.issue .comment-list .comment .content .header {
-    color: #dbdbdb;
-    background-color: #404552;
-    border-bottom: 1px solid #353944;
-}
-
-.repository.view.issue .comment-list .comment .content .merge-section {
-    background-color: #404552;
-    border-top: 1px solid #353944;
-}
-
 .repository.view.issue .comment-list .event > .svg.issue-symbol {
     background: #3b4954;
 }
@@ -989,18 +969,41 @@ a.ui.basic.green.label:hover {
     color: #fff !important;
 }
 
-.repository.view.issue .comment-list .comment .content .header:after {
-    border-right-color: #404552;
+.repository.view.issue .comment-list .comment .content {
+    > .bottom.segment {
+        background: #353945;
+        a {
+            border: solid 1px #353945;
+            background-color: #353945;
+        }
+    }
+
+    .header {
+        color: #dbdbdb;
+        background-color: #404552;
+        border-bottom: 1px solid #353944;
+    }
+
+    .merge-section {
+        background-color: #404552;
+        border-top: 1px solid #353944;
+    }
+
+    .header:after,
+    > .merge-section.no-header:after {
+        border-right-color: #404552;
+    }
+
+    .header:before,
+    > .merge-section.no-header:before {
+        border-right-color: #404552;
+    }
 }
 
 .repository.new.issue .comment.form .content:after {
     border-right-color: #353945;
 }
 
-.repository.view.issue .comment-list .comment .content .header:before {
-    border-right-color: #404552;
-}
-
 .repository.new.issue .comment.form .content:before {
     border-right-color: #353945;
 }