Commit 694aac31 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch...

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

Replace some fa-trash icons with GitLab SVG remove icon

See merge request gitlab-org/gitlab!38964
parents 2e6e20a9 5e22c4d6
......@@ -60,4 +60,4 @@
= link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'btn btn-sm btn-danger gl-ml-3' do
%span.sr-only= _('Remove')
= icon('trash')
= sprite_icon('remove')
......@@ -37,4 +37,4 @@
= sprite_icon('pencil')
- if can?(current_user, :admin_pipeline_schedule, pipeline_schedule)
= link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'btn btn-remove', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do
= icon('trash')
= sprite_icon('remove')
......@@ -46,4 +46,4 @@
class: 'btn btn-remove m-0 ml-sm-2 align-self-center' do
%span.d-block.d-sm-none
= _("Delete")
= icon('trash', class: 'd-none d-sm-block')
= sprite_icon('remove', css_class: 'd-none d-sm-block')
---
title: Replace some fa-trash icons with GitLab SVG remove icon
merge_request: 38964
author:
type: other
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