diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-07 21:01:51 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-07 21:01:51 +0300 |
| commit | 82423ac34ac90e3ff3443495a14af0105feff67d (patch) | |
| tree | c3040e8a535f93d051ebc1e1c2f3481ba06f26de /app/views | |
| parent | 428da5b8050b5ec53043706667024342644eee66 (diff) | |
| parent | 7cdab4da830257b8a34b0b30291906976165c4ad (diff) | |
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
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index a758a63dfb3..8d9c083d223 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -3,7 +3,7 @@ - awards_sort(grouped_emojis).each do |emoji, awards| %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: [(award_state_class(awardable, awards, current_user))], - data: { placement: "bottom", title: award_user_list(awards, current_user) } } + data: { title: award_user_list(awards, current_user) } } = emoji_icon(emoji) %span.award-control-text.js-counter = awards.count @@ -12,7 +12,7 @@ .award-menu-holder.js-award-holder %button.btn.award-control.has-tooltip.js-add-award{ type: 'button', 'aria-label': _('Add reaction'), - data: { title: _('Add reaction'), placement: "bottom" } } + data: { title: _('Add reaction') } } %span{ class: "award-control-icon award-control-icon-neutral" }= custom_icon('emoji_slightly_smiling_face') %span{ class: "award-control-icon award-control-icon-positive" }= custom_icon('emoji_smiley') %span{ class: "award-control-icon award-control-icon-super-positive" }= custom_icon('emoji_smile') |