Commit f77d3dc2 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Replace fa-users icon

Replace fa-user icon

Fix broken specs

Added a changelog entry
parent c9450eab
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
import axios from '../lib/utils/axios_utils'; import axios from '../lib/utils/axios_utils';
import { s__, __, sprintf } from '../locale'; import { s__, __, sprintf } from '../locale';
import ModalStore from '../boards/stores/modal_store'; 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 { getAjaxUsersSelectOptions, getAjaxUsersSelectParams } from './utils';
import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
...@@ -225,7 +225,9 @@ function UsersSelect(currentUser, els, options = {}) { ...@@ -225,7 +225,9 @@ function UsersSelect(currentUser, els, options = {}) {
}); });
}; };
collapsedAssigneeTemplate = template( 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( 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"> `<% 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">
......
...@@ -186,10 +186,6 @@ ...@@ -186,10 +186,6 @@
content: '\f1a0'; content: '\f1a0';
} }
.fa-user::before {
content: '\f007';
}
.fa-exclamation-circle::before { .fa-exclamation-circle::before {
content: '\f06a'; content: '\f06a';
} }
...@@ -210,10 +206,6 @@ ...@@ -210,10 +206,6 @@
content: '\f016'; content: '\f016';
} }
.fa-users::before {
content: '\f0c0';
}
.fa-tags::before { .fa-tags::before {
content: '\f02c'; content: '\f02c';
} }
...@@ -266,10 +258,6 @@ ...@@ -266,10 +258,6 @@
content: '\f061'; content: '\f061';
} }
.fa-user-secret::before {
content: '\f21b';
}
.fa-search-plus::before { .fa-search-plus::before {
content: '\f00e'; content: '\f00e';
} }
......
---
title: Replace fa-user(s) icons with GitLab SVG user(s) icon
merge_request: 39165
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