Commit a9722596 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch '217694-replace-icon-with-gl-icon-component-in-related-issuable-item-component' into 'master'

Use gl-icon on related issues component

See merge request gitlab-org/gitlab!32016
parents 0b70a154 388d4fd1
<script> <script>
import '~/commons/bootstrap'; import '~/commons/bootstrap';
import { GlTooltip, GlTooltipDirective } from '@gitlab/ui'; import { GlIcon, GlTooltip, GlTooltipDirective } from '@gitlab/ui';
import { sprintf } from '~/locale'; import { sprintf } from '~/locale';
import IssueMilestone from '../../components/issue/issue_milestone.vue'; import IssueMilestone from '../../components/issue/issue_milestone.vue';
import IssueAssignees from '../../components/issue/issue_assignees.vue'; import IssueAssignees from '../../components/issue/issue_assignees.vue';
...@@ -13,6 +13,7 @@ export default { ...@@ -13,6 +13,7 @@ export default {
IssueMilestone, IssueMilestone,
IssueAssignees, IssueAssignees,
CiIcon, CiIcon,
GlIcon,
GlTooltip, GlTooltip,
}, },
directives: { directives: {
...@@ -44,6 +45,9 @@ export default { ...@@ -44,6 +45,9 @@ export default {
visibility: 'hidden', visibility: 'hidden',
}; };
}, },
iconClasses() {
return `${this.iconClass} ic-${this.iconName}`;
},
}, },
}; };
</script> </script>
...@@ -60,13 +64,12 @@ export default { ...@@ -60,13 +64,12 @@ export default {
<!-- Title area: Status icon (XL) and title --> <!-- Title area: Status icon (XL) and title -->
<div class="item-title d-flex align-items-xl-center mb-xl-0"> <div class="item-title d-flex align-items-xl-center mb-xl-0">
<div ref="iconElementXL"> <div ref="iconElementXL">
<icon <gl-icon
v-if="hasState" v-if="hasState"
ref="iconElementXL" ref="iconElementXL"
class="mr-2" class="mr-2 d-block"
:class="iconClass" :class="iconClasses"
:name="iconName" :name="iconName"
:size="16"
:title="stateTitle" :title="stateTitle"
:aria-label="state" :aria-label="state"
/> />
...@@ -74,11 +77,10 @@ export default { ...@@ -74,11 +77,10 @@ export default {
<gl-tooltip :target="() => $refs.iconElementXL"> <gl-tooltip :target="() => $refs.iconElementXL">
<span v-html="stateTitle"></span> <span v-html="stateTitle"></span>
</gl-tooltip> </gl-tooltip>
<icon <gl-icon
v-if="confidential" v-if="confidential"
v-gl-tooltip v-gl-tooltip
name="eye-slash" name="eye-slash"
:size="16"
:title="__('Confidential')" :title="__('Confidential')"
class="confidential-icon append-right-4 align-self-baseline align-self-md-auto mt-xl-0" class="confidential-icon append-right-4 align-self-baseline align-self-md-auto mt-xl-0"
:aria-label="__('Confidential')" :aria-label="__('Confidential')"
......
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