diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-05-24 23:57:33 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-25 00:02:58 -0500 |
| commit | 068e5e21b360e976c582bb751ce93ac6668b6bdf (patch) | |
| tree | 0de0d9f1e0615450a220cbea8d72ce57bea9bf75 | |
| parent | 34a6d80e1146b2e88a95f91c2bd84214f130d4c5 (diff) | |
| download | gitlab-ce-068e5e21b360e976c582bb751ce93ac6668b6bdf.tar.gz | |
Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diff
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
| -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 4b15fc2bd82..c1e613e8f3d 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -380,6 +380,12 @@ ul.notes { padding-bottom: 5px; } +.note-header-author-name { + @media (max-width: $screen-xs-max) { + display: none; + } +} + .note-headline-light { display: inline; @@ -717,9 +723,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 |