Commit 795c0e35 authored by Clement Ho's avatar Clement Ho

Merge branch 'replace-tooltip-in-markdown-component' into 'master'

Replace tooltip in markdown component with gl-tooltip

See merge request gitlab-org/gitlab-ce!21989
parents eab26218 45c00152
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
import Tooltip from '../../directives/tooltip'; import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import ToolbarButton from './toolbar_button.vue'; import ToolbarButton from './toolbar_button.vue';
import Icon from '../icon.vue'; import Icon from '../icon.vue';
export default { export default {
directives: {
Tooltip,
},
components: { components: {
ToolbarButton, ToolbarButton,
Icon, Icon,
}, },
directives: {
GlTooltip: GlTooltipDirective,
},
props: { props: {
previewMarkdown: { previewMarkdown: {
type: Boolean, type: Boolean,
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
icon="table" icon="table"
/> />
<button <button
v-tooltip v-gl-tooltip
aria-label="Go full screen" aria-label="Go full screen"
class="toolbar-btn toolbar-fullscreen-btn js-zen-enter" class="toolbar-btn toolbar-fullscreen-btn js-zen-enter"
data-container="body" data-container="body"
......
<script> <script>
import tooltip from '../../directives/tooltip'; import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import icon from '../icon.vue'; import Icon from '../icon.vue';
export default { export default {
components: { components: {
icon, Icon,
}, },
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
props: { props: {
buttonTitle: { buttonTitle: {
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
<template> <template>
<button <button
v-tooltip v-gl-tooltip
:data-md-tag="tag" :data-md-tag="tag"
:data-md-select="tagSelect" :data-md-select="tagSelect"
:data-md-block="tagBlock" :data-md-block="tagBlock"
......
---
title: Replace tooltip in markdown component with gl-tooltip
merge_request: 21989
author: George Tsiolis
type: other
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