From 69bc6a8e4e6865eca7882f89f18ea037301fd42d Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 21 Dec 2016 17:36:17 +0000 Subject: 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 --- app/assets/stylesheets/pages/notes.scss | 8 ++++++-- changelogs/unreleased/25368-fix-left-align-system-note.yml | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/25368-fix-left-align-system-note.yml 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 { diff --git a/changelogs/unreleased/25368-fix-left-align-system-note.yml b/changelogs/unreleased/25368-fix-left-align-system-note.yml new file mode 100644 index 00000000000..81fd0888773 --- /dev/null +++ b/changelogs/unreleased/25368-fix-left-align-system-note.yml @@ -0,0 +1,4 @@ +--- +title: Fixes left align issue for long system notes +merge_request: 7982 +author: -- cgit v1.2.3