Commit e5644ec4 authored by Illya Klymov's avatar Illya Klymov

Merge branch 'mw-description-template-replace-fa-icons' into 'master'

Replace fa icons in description template

See merge request gitlab-org/gitlab!43379
parents e75e8951 cf984061
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings */
import $ from 'jquery'; import $ from 'jquery';
import { GlIcon } from '@gitlab/ui'; import { GlIcon } from '@gitlab/ui';
import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors'; import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors';
...@@ -62,11 +61,15 @@ export default { ...@@ -62,11 +61,15 @@ export default {
data-toggle="dropdown" data-toggle="dropdown"
> >
<span class="dropdown-toggle-text">{{ __('Choose a template') }}</span> <span class="dropdown-toggle-text">{{ __('Choose a template') }}</span>
<i aria-hidden="true" class="fa fa-chevron-down"> </i> <gl-icon
name="chevron-down"
class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
aria-hidden="true"
/>
</button> </button>
<div class="dropdown-menu dropdown-select"> <div class="dropdown-menu dropdown-select">
<div class="dropdown-title gl-display-flex gl-justify-content-center"> <div class="dropdown-title gl-display-flex gl-justify-content-center">
<span class="gl-ml-auto">Choose a template</span> <span class="gl-ml-auto">{{ __('Choose a template') }}</span>
<button <button
class="dropdown-title-button dropdown-menu-close gl-ml-auto" class="dropdown-title-button dropdown-menu-close gl-ml-auto"
:aria-label="__('Close')" :aria-label="__('Close')"
...@@ -82,7 +85,7 @@ export default { ...@@ -82,7 +85,7 @@ export default {
:placeholder="__('Filter')" :placeholder="__('Filter')"
autocomplete="off" autocomplete="off"
/> />
<i aria-hidden="true" class="fa fa-search dropdown-input-search"> </i> <gl-icon name="search" class="dropdown-input-search" aria-hidden="true" />
<gl-icon <gl-icon
name="close" name="close"
class="dropdown-input-clear js-dropdown-input-clear" class="dropdown-input-clear js-dropdown-input-clear"
......
---
title: "Description Templates: Replace fontawesome icons with GitLab SVGs"
merge_request: 43379
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