From ccc85d802f44b0ca1603a10588c7a1edb7fe8bc0 Mon Sep 17 00:00:00 2001
From: dimitrieh <dimitriehoekstra@gmail.com>
Date: Wed, 28 Dec 2016 16:56:37 +0100
Subject: [PATCH] Fixed regression of note-headline-light where it was always
 placed on 2 lines, even on wide viewports

---
 app/assets/stylesheets/pages/notes.scss              | 12 ++++++++++--
 .../unreleased/regression-note-headline-light.yml    |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/regression-note-headline-light.yml

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 8f15775ee03..21d72791e81 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 {
@@ -353,6 +353,14 @@ ul.notes {
   font-size: 14px;
 }
 
+.note-headline-light {
+  display: inline;
+
+  @media (max-width: $screen-xs-min) {
+    display: block;
+  }
+}
+
 .note-headline-light,
 .discussion-headline-light {
   color: $notes-light-color;
diff --git a/changelogs/unreleased/regression-note-headline-light.yml b/changelogs/unreleased/regression-note-headline-light.yml
new file mode 100644
index 00000000000..f24d4cb014c
--- /dev/null
+++ b/changelogs/unreleased/regression-note-headline-light.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed regression of note-headline-light where it was always placed on 2 lines, even on wide viewports
+merge_request:
+author: