diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-09 12:52:09 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-09 12:52:09 +0300 |
commit | 8dd97b5a441e23e9bd3a6d1af3c1af96ea17e839 (patch) | |
tree | e7a2df94ca8fa54870ede3e24f01f1a8f147a82a | |
parent | ca5d6d841a73aa1ab56a5eaba72987f07a52d5a7 (diff) | |
parent | 8b52503f459c65384daf180ca649e2b53c3d7930 (diff) |
Merge branch 'notes-awards-double-tooltip-fix' into 'master'
Fixes doubles tooltips on note awards
Closes #55483
See merge request gitlab-org/gitlab-ce!24261
-rw-r--r-- | app/assets/javascripts/notes/components/note_awards_list.vue | 10 | ||||
-rw-r--r-- | changelogs/unreleased/notes-awards-double-tooltip-fix.yml | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/notes/components/note_awards_list.vue index 3d60eb02db8..bde00ea87ff 100644 --- a/app/assets/javascripts/notes/components/note_awards_list.vue +++ b/app/assets/javascripts/notes/components/note_awards_list.vue @@ -1,6 +1,6 @@ <script> import { mapActions, mapGetters } from 'vuex'; -import { GlTooltipDirective } from '@gitlab/ui'; +import tooltip from '~/vue_shared/directives/tooltip'; import Icon from '~/vue_shared/components/icon.vue'; import Flash from '../../flash'; import { glEmojiTag } from '../../emoji'; @@ -10,7 +10,7 @@ export default { Icon, }, directives: { - GlTooltip: GlTooltipDirective, + tooltip, }, props: { awards: { @@ -167,9 +167,11 @@ export default { <button v-for="(awardList, awardName, index) in groupedAwards" :key="index" - v-gl-tooltip.bottom="{ boundary: 'viewport' }" + v-tooltip :class="getAwardClassBindings(awardList)" :title="awardTitle(awardList)" + data-boundary="viewport" + data-placement="bottom" class="btn award-control" type="button" @click="handleAward(awardName);" @@ -179,7 +181,7 @@ export default { </button> <div v-if="canAwardEmoji" class="award-menu-holder"> <button - v-gl-tooltip + v-tooltip :class="{ 'js-user-authored': isAuthoredByMe }" class="award-control btn js-add-award" title="Add reaction" diff --git a/changelogs/unreleased/notes-awards-double-tooltip-fix.yml b/changelogs/unreleased/notes-awards-double-tooltip-fix.yml new file mode 100644 index 00000000000..23338a60c2a --- /dev/null +++ b/changelogs/unreleased/notes-awards-double-tooltip-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fixed double tooltips on note awards buttons +merge_request: +author: +type: fixed |