summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-06-19 15:20:53 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-06-19 15:20:53 -0500
commitf36714908f50d34265b3aacdbab009ed50f54678 (patch)
treeb0ee1522c487e43754234579f40cc088fe0b2ea7
parente0da61bca80485b99f78ef1dbb3c64578d64d55a (diff)
downloadgitlab-ce-f36714908f50d34265b3aacdbab009ed50f54678.tar.gz
Fix diff comment alignment for parallel code additions
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
1 files changed, 4 insertions, 0 deletions
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,