diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-25 08:17:09 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-25 08:17:09 -0500 |
| commit | e1e186bb28ac5ac1fe202fb21e5c4e396256bb27 (patch) | |
| tree | dae7838cfe8b2e49c0f90f8dbcf6da6ef471a6bf | |
| parent | 7d10817c110278cd18ada01ce8b31bda58cc1abe (diff) | |
| download | gitlab-ce-e1e186bb28ac5ac1fe202fb21e5c4e396256bb27.tar.gz | |
Wrap MR content -stable branch
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 28 |
2 files changed, 24 insertions, 13 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 6fdc9c724b4..9f048c6692d 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -374,6 +374,15 @@ ul.notes { } } +.note-headline-meta { + display: inline-block; + white-space: nowrap; + + .system-note-message { + white-space: normal; + } +} + /** * Actions for Discussions/Notes */ diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 1f021ad77e5..b49feb98248 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) |