diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-03 17:23:06 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-01-05 15:31:56 -0200 |
| commit | 465be495f72458224ee0fa96b0ff6a676690b080 (patch) | |
| tree | 5c2b4e7530bec6909a9fcdb23954bc0deb451d13 /app | |
| parent | e76aa5d7eb2f03f4472eee8495a82eaab95d20ce (diff) | |
| download | gitlab-ce-465be495f72458224ee0fa96b0ff6a676690b080.tar.gz | |
Merge branch 'regression-note-headline-light' into 'master'
Fixed regression of note-headline-light where it was always placed on 2 lines, e…
See merge request !8348
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 12 |
1 files changed, 10 insertions, 2 deletions
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; |