Commit a6b5e4cf authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'selhorn-tooltip-3' into 'master'

Changed tooltip to gl-tooltip for "Weight" on issues

See merge request gitlab-org/gitlab!44664
parents c730563e 10a17d5f
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
import eventHub from '~/sidebar/event_hub'; import eventHub from '~/sidebar/event_hub';
import tooltip from '~/vue_shared/directives/tooltip';
import { MAX_DISPLAY_WEIGHT } from '../../constants'; import { MAX_DISPLAY_WEIGHT } from '../../constants';
export default { export default {
...@@ -13,7 +12,7 @@ export default { ...@@ -13,7 +12,7 @@ export default {
GlLoadingIcon, GlLoadingIcon,
}, },
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
mixins: [Tracking.mixin({ label: 'right_sidebar' })], mixins: [Tracking.mixin({ label: 'right_sidebar' })],
props: { props: {
...@@ -141,12 +140,9 @@ export default { ...@@ -141,12 +140,9 @@ export default {
<template> <template>
<div :class="{ 'collapse-after-update': collapsedAfterUpdate }" class="block weight"> <div :class="{ 'collapse-after-update': collapsedAfterUpdate }" class="block weight">
<div <div
v-tooltip v-gl-tooltip.left.viewport
:title="tooltipTitle" :title="tooltipTitle"
class="sidebar-collapsed-icon js-weight-collapsed-block" class="sidebar-collapsed-icon js-weight-collapsed-block"
data-container="body"
data-placement="left"
data-boundary="viewport"
@click="onCollapsedClick" @click="onCollapsedClick"
> >
<gl-icon :size="16" name="weight" /> <gl-icon :size="16" name="weight" />
......
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