diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-09 14:03:45 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-09 14:03:45 +0000 |
| commit | f2b9e6c37c1c01f22135b25322739b0ee892f7c6 (patch) | |
| tree | 446b78a64470013289bef9b0c926e427853a42ba | |
| parent | 7078dfcc095fd70713fe87305d4599953df5a41d (diff) | |
| parent | 0f3542c8fba27f60ffe5e7c0ab7d506206957723 (diff) | |
| download | gitlab-ce-f2b9e6c37c1c01f22135b25322739b0ee892f7c6.tar.gz | |
Merge branch 'fix-9-2-stable-conflicts-for-mr-11702' into '9-2-stable'
Fix 9.2 conflicts for "Fix note header author and time ago wrapping in parallel diff"
See merge request !12004
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 9 | ||||
| -rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 71cf448121d..d513ee7eb0a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -394,6 +394,12 @@ ul.notes { padding-bottom: 8px; } +.note-header-author-name { + @media (max-width: $screen-xs-max) { + display: none; + } +} + .note-headline-light { display: inline; @@ -739,9 +745,8 @@ ul.notes { // Merge request notes in diffs .diff-file { // Diff is side by side - .notes_content.parallel .note-header .note-headline-light { + .notes_content.parallel .note-header .note-header-author-name { display: block; - position: relative; } // Diff is inline .notes_content .note-header .note-headline-light { diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index a7bf610b9c7..1e34b7c1e76 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -18,7 +18,7 @@ .note-header .note-header-info %a{ href: user_path(note.author) } - %span.hidden-xs + %span.note-header-author-name = sanitize(note.author.name) %span.note-headline-light = note.author.to_reference |