Commit cd46cc0c authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'mw-mr-widget-header-replace-fa-icon' into 'master'

Replace fa-caret-down with SVG icon in MR widget

See merge request gitlab-org/gitlab!39852
parents 9b3f7d7f 81809e5c
<script> <script>
import Mousetrap from 'mousetrap'; import Mousetrap from 'mousetrap';
import { escape } from 'lodash'; import { escape } from 'lodash';
import { GlIcon } from '@gitlab/ui';
import { n__, s__, sprintf } from '~/locale'; import { n__, s__, sprintf } from '~/locale';
import { mergeUrlParams, webIDEUrl } from '~/lib/utils/url_utility'; import { mergeUrlParams, webIDEUrl } from '~/lib/utils/url_utility';
import Icon from '~/vue_shared/components/icon.vue';
import clipboardButton from '~/vue_shared/components/clipboard_button.vue'; import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
...@@ -12,7 +12,7 @@ import MrWidgetIcon from './mr_widget_icon.vue'; ...@@ -12,7 +12,7 @@ import MrWidgetIcon from './mr_widget_icon.vue';
export default { export default {
name: 'MRWidgetHeader', name: 'MRWidgetHeader',
components: { components: {
Icon, GlIcon,
clipboardButton, clipboardButton,
TooltipOnTruncate, TooltipOnTruncate,
MrWidgetIcon, MrWidgetIcon,
...@@ -157,7 +157,8 @@ export default { ...@@ -157,7 +157,8 @@ export default {
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false" aria-expanded="false"
> >
<icon name="download" /> <i class="fa fa-caret-down" aria-hidden="true"> </i> <gl-icon name="download" />
<gl-icon name="chevron-down" aria-hidden="true" />
</button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li> <li>
......
---
title: Replace fa-caret-down with SVG icon in MR widget
merge_request: 39852
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