Commit 61d0cf0c authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'delete-icon-color' into 'master'

Fixed delete comment button color

![Screen_Shot_2016-04-06_at_09.55.38](/uploads/526c03db67b0fc7dc9876439f4be2b6b/Screen_Shot_2016-04-06_at_09.55.38.png)

See merge request !3562
parents 205af25a 4d463c3b
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
= access = access
= link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
= icon('pencil-square-o') = 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') = icon('trash-o')
.note-body{class: note_editable?(note) ? 'js-task-list-container' : ''} .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
.note-text .note-text
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment