Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5e22c4d6
Commit
5e22c4d6
authored
Aug 18, 2020
by
Alishan Ladhani
Committed by
Jose Ivan Vargas
Aug 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace some fa-trash icons with GitLab SVG remove icon
parent
dfdfb82d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+1
-1
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
.../projects/pipeline_schedules/_pipeline_schedule.html.haml
+1
-1
app/views/shared/members/_group.html.haml
app/views/shared/members/_group.html.haml
+1
-1
changelogs/unreleased/225950-replace-fa-trash-and-fa-trash-o-icons-with-gitlab-svg-remove-icon-.yml
...ash-and-fa-trash-o-icons-with-gitlab-svg-remove-icon-.yml
+5
-0
No files found.
app/views/profiles/emails/index.html.haml
View file @
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
'
)
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
View file @
5e22c4d6
...
...
@@ -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
'
)
app/views/shared/members/_group.html.haml
View file @
5e22c4d6
...
...
@@ -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'
)
changelogs/unreleased/225950-replace-fa-trash-and-fa-trash-o-icons-with-gitlab-svg-remove-icon-.yml
0 → 100644
View file @
5e22c4d6
---
title
:
Replace some fa-trash icons with GitLab SVG remove icon
merge_request
:
38964
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment