From f36714908f50d34265b3aacdbab009ed50f54678 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 19 Jun 2018 15:20:53 -0500
Subject: Fix diff comment alignment for parallel code additions

---
 app/assets/stylesheets/pages/notes.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 299eda53140..42c9d563fe1 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -638,6 +638,10 @@ ul.notes {
   .new & {
     margin-top: -10px;
   }
+
+  .parallel .new & {
+    margin-top: initial;
+  }
 }
 
 .discussion-body,
-- 
cgit v1.2.1