Merge branch '14762-delete-button' into 'master'

Update delete button Closes #14762 ![Screen_Shot_2016-04-11_at_5.21.32_PM](/uploads/fef09645eb70fc0fcaee359245664ddc/Screen_Shot_2016-04-11_at_5.21.32_PM.png) See merge request !3665

Merge branch '14762-delete-button' into 'master'
9c9893dd · Jacob Schatz · e17f79fd · 72e2c1db · 9c9893dd
Commit 9c9893dd authored Apr 13, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

_form.html.haml app/views/shared/issuable/_form.html.haml +2 -4

No files found.
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -128,8 +128,6 @@
  - else
    .pull-right
      - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project)
-        = link_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
-                                                                                                  method: :delete, class: 'btn btn-grouped' do
-          = icon('trash-o')
-          Delete
+        = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
+                                                                                                  method: :delete, class: 'btn btn-danger btn-grouped'
      = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel'