Skip to content

Commit 82423ac

Browse files
author
Filipa Lacerda
committed
Merge branch 'tooltips-to-top' into 'master'
Change spawning of tooltips to be top by default Closes #39044 and #48581 See merge request gitlab-org/gitlab-ce!21223
2 parents 428da5b + 7cdab4d commit 82423ac

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

app/assets/javascripts/awards_handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ export class AwardsHandler {
437437

438438
createAwardButtonForVotesBlock(votesBlock, emojiName) {
439439
const buttonHtml = `
440-
<button class="btn award-control js-emoji-btn has-tooltip active" title="You" data-placement="bottom">
440+
<button class="btn award-control js-emoji-btn has-tooltip active" title="You">
441441
${this.emoji.glEmojiTag(emojiName)}
442442
<span class="award-control-text js-counter">1</span>
443443
</button>

app/assets/javascripts/main.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ function deferredInitialisation() {
124124
selector: '.has-tooltip, [data-toggle="tooltip"]',
125125
trigger: 'hover',
126126
boundary: 'viewport',
127-
placement(tip, el) {
128-
return $(el).data('placement') || 'bottom';
129-
},
130127
});
131128

132129
// Initialize popovers

app/assets/javascripts/notes/components/note_actions.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,9 @@ export default {
151151
</div>
152152
<div v-if="canAwardEmoji" class="note-actions-item">
153153
<a
154-
v-gl-tooltip.bottom
154+
v-gl-tooltip
155155
:class="{ 'js-user-authored': isAuthoredByCurrentUser }"
156156
class="note-action-button note-emoji-button js-add-award js-note-emoji"
157-
data-position="right"
158157
href="#"
159158
title="Add reaction"
160159
>
@@ -175,7 +174,7 @@ export default {
175174
/>
176175
<div v-if="canEdit" class="note-actions-item">
177176
<button
178-
v-gl-tooltip.bottom
177+
v-gl-tooltip
179178
type="button"
180179
title="Edit comment"
181180
class="note-action-button js-note-edit btn btn-transparent"
@@ -186,7 +185,7 @@ export default {
186185
</div>
187186
<div v-if="showDeleteAction" class="note-actions-item">
188187
<button
189-
v-gl-tooltip.bottom
188+
v-gl-tooltip
190189
type="button"
191190
title="Delete comment"
192191
class="note-action-button js-note-delete btn btn-transparent"
@@ -197,7 +196,7 @@ export default {
197196
</div>
198197
<div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions note-actions-item">
199198
<button
200-
v-gl-tooltip.bottom
199+
v-gl-tooltip
201200
type="button"
202201
title="More actions"
203202
class="note-action-button more-actions-toggle btn btn-transparent"

app/assets/javascripts/notes/components/note_awards_list.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ export default {
171171
:class="getAwardClassBindings(awardList)"
172172
:title="awardTitle(awardList)"
173173
data-boundary="viewport"
174-
data-placement="bottom"
175174
class="btn award-control"
176175
type="button"
177176
@click="handleAward(awardName)"
@@ -187,7 +186,6 @@ export default {
187186
title="Add reaction"
188187
aria-label="Add reaction"
189188
data-boundary="viewport"
190-
data-placement="bottom"
191189
type="button"
192190
>
193191
<span class="award-control-icon award-control-icon-neutral">

app/views/award_emoji/_awards_block.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- awards_sort(grouped_emojis).each do |emoji, awards|
44
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button",
55
class: [(award_state_class(awardable, awards, current_user))],
6-
data: { placement: "bottom", title: award_user_list(awards, current_user) } }
6+
data: { title: award_user_list(awards, current_user) } }
77
= emoji_icon(emoji)
88
%span.award-control-text.js-counter
99
= awards.count
@@ -12,7 +12,7 @@
1212
.award-menu-holder.js-award-holder
1313
%button.btn.award-control.has-tooltip.js-add-award{ type: 'button',
1414
'aria-label': _('Add reaction'),
15-
data: { title: _('Add reaction'), placement: "bottom" } }
15+
data: { title: _('Add reaction') } }
1616
%span{ class: "award-control-icon award-control-icon-neutral" }= custom_icon('emoji_slightly_smiling_face')
1717
%span{ class: "award-control-icon award-control-icon-positive" }= custom_icon('emoji_smiley')
1818
%span{ class: "award-control-icon award-control-icon-super-positive" }= custom_icon('emoji_smile')
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Change spawning of tooltips to be top by default
3+
merge_request: 21223
4+
author:
5+
type: changed

0 commit comments

Comments
 (0)