summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-12-21 17:36:17 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-21 19:31:43 -0200
commit69bc6a8e4e6865eca7882f89f18ea037301fd42d (patch)
treec3e6fd6c105e3a3a93e576dc8ed6359c5b78409f /app
parent1255cb4fd4dd7799004192bbc9e4920d1980d928 (diff)
downloadgitlab-ce-69bc6a8e4e6865eca7882f89f18ea037301fd42d.tar.gz
Merge branch '25368-fix-left-align-system-note' into 'master'
fixes left align issue for long system notes Closes #25368 and #25833 See merge request !7982
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/notes.scss8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 106c5d4d390..6ac4ec6ea0d 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -43,7 +43,7 @@ ul.notes {
}
.system-note-message {
- display: inline-block;
+ display: inline;
&::first-letter {
text-transform: lowercase;
@@ -55,7 +55,7 @@ ul.notes {
}
p {
- display: inline-block;
+ display: inline;
margin: 0;
&::first-letter {
@@ -151,6 +151,10 @@ ul.notes {
}
}
}
+
+ .note-headline-light {
+ display: inline;
+ }
}
.discussion-body {