Commit 8a830f5e authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '225950-replace-fa-trash-and-fa-trash-o-icons-with-gitlab-svg-remove-icon' into 'master'

Replace fa-trash icons with GitLab SVG remove icon

Closes #225950

See merge request gitlab-org/gitlab!40579
parents e29c9ba3 edc19455
...@@ -130,10 +130,6 @@ ...@@ -130,10 +130,6 @@
content: '\f101'; content: '\f101';
} }
.fa-trash::before {
content: '\f1f8';
}
.fa-angle-double-left::before { .fa-angle-double-left::before {
content: '\f100'; content: '\f100';
} }
......
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
= button_tag type: "submit", class: "btn btn-transparent", data: { confirm: _("Are you sure?") } do = button_tag type: "submit", class: "btn btn-transparent", data: { confirm: _("Are you sure?") } do
%span.sr-only %span.sr-only
= _('Destroy') = _('Destroy')
= icon('trash') = sprite_icon('remove')
- else - else
= submit_tag _('Destroy'), data: { confirm: _("Are you sure?") }, class: submit_btn_css = submit_tag _('Destroy'), data: { confirm: _("Are you sure?") }, class: submit_btn_css
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
- if can_destroy_package - if can_destroy_package
.float-right .float-right
= link_to project_package_path(@project, package), method: :delete, data: { confirm: _("Are you sure?") }, class: "btn btn-grouped btn-remove", title: _('Delete Package') do = link_to project_package_path(@project, package), method: :delete, data: { confirm: _("Are you sure?") }, class: "btn btn-grouped btn-remove", title: _('Delete Package') do
= icon('trash') = sprite_icon('remove')
= paginate @packages, theme: "gitlab" = paginate @packages, theme: "gitlab"
- else - else
.row.empty-state .row.empty-state
......
...@@ -34,4 +34,4 @@ ...@@ -34,4 +34,4 @@
= sprite_icon('pencil') = sprite_icon('pencil')
- if can?(current_user, :manage_trigger, trigger) - if can?(current_user, :manage_trigger, trigger)
= link_to project_trigger_path(@project, trigger), data: { confirm: revoke_trigger_confirmation }, method: :delete, title: "Revoke", class: "btn btn-default btn-warning btn-sm btn-trigger-revoke" do = link_to project_trigger_path(@project, trigger), data: { confirm: revoke_trigger_confirmation }, method: :delete, title: "Revoke", class: "btn btn-default btn-warning btn-sm btn-trigger-revoke" do
%i.fa.fa-trash = sprite_icon('remove')
---
title: Replace fa-trash icons with GitLab SVG remove icon
merge_request: 40579
author:
type: changed
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