diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-20 15:52:46 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-20 17:51:50 +0000 |
| commit | 2133baaf9944da24859e54bb68d86f8cf6f89d28 (patch) | |
| tree | d33de7939658efeb386e86da223f60c79b6ad94e | |
| parent | d179ffc25ceb7ffd9bf241494c03a8d90a0aab58 (diff) | |
| download | gitlab-ce-2133baaf9944da24859e54bb68d86f8cf6f89d28.tar.gz | |
Fixes stuck tooltip on stop env button
Used the glTooltipdirective to fix the tooltip
on the stop environment button in the mr widget
getting stuck when the element is not in hover state
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/54282-tooltip-stuck.yml | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index fe741dc60cb..4650b311e68 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -1,10 +1,10 @@ <script> +import { GlTooltipDirective } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue'; import { __ } from '~/locale'; import timeagoMixin from '../../vue_shared/mixins/timeago'; -import tooltip from '../../vue_shared/directives/tooltip'; import LoadingButton from '../../vue_shared/components/loading_button.vue'; import { visitUrl } from '../../lib/utils/url_utility'; import createFlash from '../../flash'; @@ -25,7 +25,7 @@ export default { ReviewAppLink, }, directives: { - tooltip, + GlTooltip: GlTooltipDirective, }, mixins: [timeagoMixin], props: { @@ -136,7 +136,7 @@ export default { </template> <span v-if="hasDeploymentTime" - v-tooltip + v-gl-tooltip :title="deployment.deployed_at_formatted" class="js-deploy-time" > @@ -195,7 +195,7 @@ export default { </template> <span v-if="deployment.stop_url" - v-tooltip + v-gl-tooltip :title="deployInProgressTooltip" class="d-inline-block" tabindex="0" diff --git a/changelogs/unreleased/54282-tooltip-stuck.yml b/changelogs/unreleased/54282-tooltip-stuck.yml new file mode 100644 index 00000000000..655870499a0 --- /dev/null +++ b/changelogs/unreleased/54282-tooltip-stuck.yml @@ -0,0 +1,5 @@ +--- +title: Fixes stuck tooltip on stop env button +merge_request: 23244 +author: +type: fixed |