diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-06 19:13:46 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-06 19:13:46 +0000 |
| commit | 61d0cf0c6179a2aebaac897b73d4cf2c666a827a (patch) | |
| tree | dd5fc25df5cc682e47c84399f35e74b10fb227a1 | |
| parent | 205af25a330ded40818333ea5c589466b69d3172 (diff) | |
| parent | 4d463c3b0f05fa8873b76afce621eaaf44c19836 (diff) | |
| download | gitlab-ce-61d0cf0c6179a2aebaac897b73d4cf2c666a827a.tar.gz | |
Merge branch 'delete-icon-color' into 'master'
Fixed delete comment button color
See merge request !3562
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 34fe1743f4b..a681d6dece4 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -18,7 +18,7 @@ = access = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = icon('pencil-square-o') - = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do + = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete' do = icon('trash-o') .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''} .note-text |