Commit 387ae1dc authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'mw-replace-fa-search-icons' into 'master'

Replace fa-search with GitLab SVG

See merge request gitlab-org/gitlab!43879
parents 0d6c68bc 58704401
<script>
import $ from 'jquery';
import { mapActions, mapState } from 'vuex';
import { GlLoadingIcon } from '@gitlab/ui';
import { GlIcon, GlLoadingIcon } from '@gitlab/ui';
import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue';
export default {
components: {
DropdownButton,
GlIcon,
GlLoadingIcon,
},
props: {
......@@ -85,7 +86,7 @@ export default {
type="search"
class="dropdown-input-field qa-dropdown-filter-input"
/>
<i aria-hidden="true" class="fa fa-search dropdown-input-search"></i>
<gl-icon name="search" class="dropdown-input-search" aria-hidden="true" />
</div>
<div class="dropdown-content">
<gl-loading-icon v-if="showLoading" size="lg" />
......
<script>
import { GlIcon } from '@gitlab/ui';
import { __ } from '~/locale';
export default {
components: {
GlIcon,
},
props: {
placeholderText: {
type: String,
......@@ -41,5 +45,6 @@ export default {
autocomplete="off"
/>
<i class="fa fa-search dropdown-input-search" aria-hidden="true" data-hidden="true"> </i>
<gl-icon name="search" class="dropdown-input-search" aria-hidden="true" data-hidden="true" />
</div>
</template>
......@@ -230,13 +230,12 @@ export default {
@keydown="onKeydown($event)"
@keyup="onKeyup($event)"
/>
<i
:class="{
hidden: showClearInputButton,
}"
<gl-icon
name="search"
class="dropdown-input-search"
:class="{ hidden: showClearInputButton }"
aria-hidden="true"
class="fa fa-search dropdown-input-search"
></i>
/>
<gl-icon
name="close"
class="dropdown-input-clear"
......
---
title: Replace fa-search fontawesome icons with GitLab SVG in Vue components
merge_request: 43879
author:
type: changed
......@@ -31,7 +31,7 @@ export default {
class="dropdown-input-field"
@keyup="handleInputChange"
/>
<i class="fa fa-search dropdown-input-search" aria-hidden="true" data-hidden="true"></i>
<gl-icon name="search" class="dropdown-input-search" aria-hidden="true" data-hidden="true" />
<gl-icon
name="close"
class="dropdown-input-clear"
......
......@@ -74,7 +74,7 @@ describe('ListFilter', () => {
});
it('renders search input icons', () => {
expect(wrapper.find('i.fa.fa-search.dropdown-input-search').exists()).toBe(true);
expect(wrapper.find('.dropdown-input-search').exists()).toBe(true);
expect(wrapper.find('.dropdown-input-clear').exists()).toBe(true);
});
});
......
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