diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-30 19:33:43 +0300 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-06 12:10:10 +0300 |
| commit | f1d74ccc8ca8e3fa91e87193fc886e9a00a636b3 (patch) | |
| tree | 3b3dc8c820ab3eb4b5d3aaa7cf32827bd9be1c82 /app/views/projects/notes | |
| parent | 47fc235fe1d8b6387428a13ea7bda33b59561cee (diff) | |
Some design related tweaks.
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 47ab8906316..3a1aa35fa21 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -22,7 +22,7 @@ %span.note-role = access - if note_editable - = link_to '#', title: 'Award Emoji', class: 'note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do + = link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do = icon('spinner spin') = icon('smile-o') = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do @@ -33,11 +33,11 @@ .note-text = preserve do = markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author) + = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true) - if note_editable = render 'projects/notes/edit_form', note: note .note-awards = render 'award_emoji/awards_block', awardable: note, inline: false - = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true) - if note.attachment.url .note-attachment |