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
06c4f15f
Commit
06c4f15f
authored
Sep 30, 2020
by
Ezekiel Kigbo
Committed by
Brandon Labuschagne
Sep 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-unlink with GitLab SVG unlink icon
parent
16d18671
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
ee/app/views/ldap_group_links/_ldap_group_link.html.haml
ee/app/views/ldap_group_links/_ldap_group_link.html.haml
+2
-1
ee/changelogs/unreleased/222535-replace-fa-unlink-with-gitlab-svg-unlink-icon.yml
.../222535-replace-fa-unlink-with-gitlab-svg-unlink-icon.yml
+5
-0
No files found.
app/assets/stylesheets/fontawesome_custom.scss
View file @
06c4f15f
...
...
@@ -253,10 +253,6 @@
content
:
'\f081'
;
}
.
fa-unlink
:
:
before
{
content
:
'\f127'
;
}
.
fa-file-pdf-o
:
:
before
{
content
:
'\f1c1'
;
}
...
...
ee/app/views/ldap_group_links/_ldap_group_link.html.haml
View file @
06c4f15f
%li
.float-right
=
link_to
group_ldap_group_link_path
(
group
,
ldap_group_link
),
method: :delete
,
class:
'btn btn-danger btn-sm'
do
=
fa_icon
(
'unlink'
,
text:
'Remove'
)
=
sprite_icon
(
'unlink'
,
size:
12
,
css_class:
'gl-m-0!'
)
%span
=
_
(
'Remove'
)
%strong
=
ldap_group_link
.
cn
?
"Group:
#{
ldap_group_link
.
cn
}
"
:
"Filter:
#{
truncate
(
ldap_group_link
.
filter
,
length:
70
)
}
"
-
if
ldap_group_link
.
config
...
...
ee/changelogs/unreleased/222535-replace-fa-unlink-with-gitlab-svg-unlink-icon.yml
0 → 100644
View file @
06c4f15f
---
title
:
Replace remove icon with unlink
merge_request
:
43641
author
:
type
:
changed
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