diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-14 20:05:28 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-14 20:05:28 +0000 |
| commit | 1cc2d2ecb6d809fba5c1aa17c5f7b3b55d65414d (patch) | |
| tree | da17863b2c3467873562ccc7a971df927d2d22b3 /app/views/projects/notes | |
| parent | 344a2619bb0e796862531f6784351472e6a70fd7 (diff) | |
| parent | 0cb6370a2de01e76ab666ab253492a25b23d2687 (diff) | |
| download | gitlab-ce-1cc2d2ecb6d809fba5c1aa17c5f7b3b55d65414d.tar.gz | |
Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master'
Fix note header timeago and action overlap
Closes #30810
See merge request !10644
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index a6fbe2c441f..7cf604bb772 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -12,19 +12,21 @@ = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' .timeline-content .note-header - %a.visible-xs{ href: user_path(note.author) } - = note.author.to_reference - = link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs') - .note-headline-light - %span.hidden-xs - = note.author.to_reference - - unless note.system - commented - - if note.system - %span.system-note-message - = note.redacted_note_html - %a{ href: "##{dom_id(note)}" } - = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') + .note-header-info + %a{ href: user_path(note.author) } + %span.hidden-xs + = sanitize(note.author.name) + %span.note-headline-light + = note.author.to_reference + %span.note-headline-light + %span.note-headline-meta + - unless note.system + commented + - if note.system + %span.system-note-message + = note.redacted_note_html + %a{ href: "##{dom_id(note)}" } + = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') - unless note.system? .note-actions - access = note_max_access_for_user(note) |