Commit 21015953 authored by Alexis Ginsberg's avatar Alexis Ginsberg Committed by jboyson

Apply some of Simons suggestions to tooltips

parent 2c1872cf
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import relatedIssuableMixin from '~/vue_shared/mixins/related_issuable_mixin'; import relatedIssuableMixin from '~/vue_shared/mixins/related_issuable_mixin';
...@@ -8,6 +8,9 @@ export default { ...@@ -8,6 +8,9 @@ export default {
components: { components: {
GlIcon, GlIcon,
}, },
directives: {
GlTooltip: GlTooltipDirective,
},
mixins: [relatedIssuableMixin], mixins: [relatedIssuableMixin],
props: { props: {
isCondensed: { isCondensed: {
...@@ -52,7 +55,7 @@ export default { ...@@ -52,7 +55,7 @@ export default {
<component <component
:is="computedLinkElementType" :is="computedLinkElementType"
ref="link" ref="link"
v-tooltip v-gl-tooltip
:class="{ :class="{
'issue-token-link': isCondensed, 'issue-token-link': isCondensed,
'issuable-main-info': !isCondensed, 'issuable-main-info': !isCondensed,
...@@ -84,7 +87,7 @@ export default { ...@@ -84,7 +87,7 @@ export default {
> >
<gl-icon <gl-icon
v-if="hasState" v-if="hasState"
v-tooltip v-gl-tooltip
:class="iconClass" :class="iconClass"
:name="iconName" :name="iconName"
:size="12" :size="12"
...@@ -98,7 +101,7 @@ export default { ...@@ -98,7 +101,7 @@ export default {
<button <button
v-if="canRemove" v-if="canRemove"
ref="removeButton" ref="removeButton"
v-tooltip v-gl-tooltip
:class="{ :class="{
'issue-token-remove-button': isCondensed, 'issue-token-remove-button': isCondensed,
'btn btn-default': !isCondensed, 'btn btn-default': !isCondensed,
......
import { GlTooltipDirective } from '@gitlab/ui';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { sprintf, __ } from '~/locale'; import { sprintf, __ } from '~/locale';
import { formatDate } from '~/lib/utils/datetime_utility'; import { formatDate } from '~/lib/utils/datetime_utility';
...@@ -99,9 +98,6 @@ const mixins = { ...@@ -99,9 +98,6 @@ const mixins = {
default: () => ({}), default: () => ({}),
}, },
}, },
directives: {
GlTooltip: GlTooltipDirective,
},
mixins: [timeagoMixin], mixins: [timeagoMixin],
computed: { computed: {
hasState() { hasState() {
......
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