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
f77d3dc2
Commit
f77d3dc2
authored
Aug 11, 2020
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-users icon
Replace fa-user icon Fix broken specs Added a changelog entry
parent
c9450eab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
14 deletions
+9
-14
app/assets/javascripts/users_select/index.js
app/assets/javascripts/users_select/index.js
+4
-2
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-12
changelogs/unreleased/225936-replace-fa-user-s-icons-with-gitlab-svg-user-s-icon.yml
...6-replace-fa-user-s-icons-with-gitlab-svg-user-s-icon.yml
+5
-0
No files found.
app/assets/javascripts/users_select/index.js
View file @
f77d3dc2
...
...
@@ -11,7 +11,7 @@ import {
import
axios
from
'
../lib/utils/axios_utils
'
;
import
{
s__
,
__
,
sprintf
}
from
'
../locale
'
;
import
ModalStore
from
'
../boards/stores/modal_store
'
;
import
{
parseBoolean
}
from
'
../lib/utils/common_utils
'
;
import
{
parseBoolean
,
spriteIcon
}
from
'
../lib/utils/common_utils
'
;
import
{
getAjaxUsersSelectOptions
,
getAjaxUsersSelectParams
}
from
'
./utils
'
;
import
initDeprecatedJQueryDropdown
from
'
~/deprecated_jquery_dropdown
'
;
...
...
@@ -225,7 +225,9 @@ function UsersSelect(currentUser, els, options = {}) {
});
};
collapsedAssigneeTemplate
=
template
(
'
<% if( avatar ) { %> <a class="author-link" href="/<%- username %>"> <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>"> </a> <% } else { %> <i class="fa fa-user"></i> <% } %>
'
,
`<% if( avatar ) { %> <a class="author-link" href="/<%- username %>"> <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>"> </a> <% } else { %>
${
spriteIcon
(
'
user
'
,
)}
<% } %>`
,
);
assigneeTemplate
=
template
(
`<% if (username) { %> <a class="author-link bold" href="/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself">
...
...
app/assets/stylesheets/fontawesome_custom.scss
View file @
f77d3dc2
...
...
@@ -186,10 +186,6 @@
content
:
'\f1a0'
;
}
.
fa-user
:
:
before
{
content
:
'\f007'
;
}
.
fa-exclamation-circle
:
:
before
{
content
:
'\f06a'
;
}
...
...
@@ -210,10 +206,6 @@
content
:
'\f016'
;
}
.
fa-users
:
:
before
{
content
:
'\f0c0'
;
}
.
fa-tags
:
:
before
{
content
:
'\f02c'
;
}
...
...
@@ -266,10 +258,6 @@
content
:
'\f061'
;
}
.
fa-user-secret
:
:
before
{
content
:
'\f21b'
;
}
.
fa-search-plus
:
:
before
{
content
:
'\f00e'
;
}
...
...
changelogs/unreleased/225936-replace-fa-user-s-icons-with-gitlab-svg-user-s-icon.yml
0 → 100644
View file @
f77d3dc2
---
title
:
Replace fa-user(s) icons with GitLab SVG user(s) icon
merge_request
:
39165
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