diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-25 16:24:04 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-25 16:24:04 +0000 |
| commit | 41441445a07649ce451bfffc546aaca87934655e (patch) | |
| tree | 43bf03ab52d49d829e81f371f10225c877ce886d | |
| parent | d9835145f99ba9b9df414a136e393f4137eef59e (diff) | |
| parent | 068e5e21b360e976c582bb751ce93ac6668b6bdf (diff) | |
| download | gitlab-ce-41441445a07649ce451bfffc546aaca87934655e.tar.gz | |
Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'master'
Fix note header author and time ago wrapping in parallel diff
Closes #32801
See merge request !11702
| -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 51918917329..a8a996c1035 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -385,6 +385,12 @@ ul.notes { padding-bottom: 0; } +.note-header-author-name { + @media (max-width: $screen-xs-max) { + display: none; + } +} + .note-headline-light { display: inline; @@ -733,9 +739,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 |