diff options
author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-09-18 17:42:53 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-18 17:42:53 +0300 |
commit | caf28f661cecdc163a0d2a4e48b12c65f5eca4ee (patch) | |
tree | 2ddde3c44f4b61d2c689ca0be0ea4f0104aed877 /app/assets/javascripts/filtered_search | |
parent | a2a00a5e6d1ba3d2ebfafcff57e211cb1b65c00a (diff) |
Resolve "Move filter dropdown from Font Awesome to our own icons"
Diffstat (limited to 'app/assets/javascripts/filtered_search')
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/filtered_search/admin_runners_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/admin_runners_filtered_search_token_keys.js index 1f9c3f41e52..b4588cc1318 100644 --- a/app/assets/javascripts/filtered_search/admin_runners_filtered_search_token_keys.js +++ b/app/assets/javascripts/filtered_search/admin_runners_filtered_search_token_keys.js @@ -5,7 +5,7 @@ const tokenKeys = [{ type: 'string', param: 'status', symbol: '', - icon: 'signal', + icon: 'messages', tag: 'status', }]; diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 184b34b7b5e..8aecf9725e6 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -62,7 +62,7 @@ export default class DropdownHint extends FilteredSearchDropdown { renderContent() { const dropdownData = this.tokenKeys.get() .map(tokenKey => ({ - icon: `fa-${tokenKey.icon}`, + icon: `${gon.sprite_icons}#${tokenKey.icon}`, hint: tokenKey.key, tag: `:${tokenKey.tag}`, type: tokenKey.type, diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js index 6c9499864c5..cc7291c9f59 100644 --- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js +++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js @@ -19,14 +19,14 @@ export const tokenKeys = [{ type: 'string', param: 'title', symbol: '%', - icon: 'clock-o', + icon: 'clock', tag: '%milestone', }, { key: 'label', type: 'array', param: 'name[]', symbol: '~', - icon: 'tag', + icon: 'labels', tag: '~label', }]; @@ -37,7 +37,7 @@ if (gon.current_user_id) { type: 'string', param: 'emoji', symbol: '', - icon: 'thumbs-up', + icon: 'thumb-up', tag: 'emoji', }); } |