From de8dea178a9ceaa5c4be67aa8aa7d530e7419258 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 15 Apr 2024 18:07:27 +0200
Subject: [PATCH] changed HTML of tooltips
---
resources/assets/javascripts/bootstrap/tooltip.js | 2 +-
resources/assets/stylesheets/scss/tooltip.scss | 4 ++--
templates/shared/tooltip.php | 5 +----
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/resources/assets/javascripts/bootstrap/tooltip.js b/resources/assets/javascripts/bootstrap/tooltip.js
index 034fcf9a9d3..564d8db2f52 100644
--- a/resources/assets/javascripts/bootstrap/tooltip.js
+++ b/resources/assets/javascripts/bootstrap/tooltip.js
@@ -33,7 +33,7 @@ $(document).on('mouseenter mouseleave focusin focusout', '[data-tooltip],.toolti
throw "Invalid content for tooltip via data";
}
if (!content) {
- content = $(this).find('.tooltip-content').remove().html();
+ content = $(this).closest('.tooltip-content').html();
}
$(this).attr('title', null);
$(this).attr('data-tooltip', content);
diff --git a/resources/assets/stylesheets/scss/tooltip.scss b/resources/assets/stylesheets/scss/tooltip.scss
index 4b7b36bbaff..7566438c5c6 100644
--- a/resources/assets/stylesheets/scss/tooltip.scss
+++ b/resources/assets/stylesheets/scss/tooltip.scss
@@ -34,11 +34,11 @@
@include icon(before, info-circle, attention);
}
- .tooltip-content {
+ & + .tooltip-content {
@extend %tooltip;
display: none;
}
- &:hover .tooltip-content {
+ &:hover + .tooltip-content {
bottom: 100%;
display: inline-block;
left: 50%;
diff --git a/templates/shared/tooltip.php b/templates/shared/tooltip.php
index d1ebafaf95a..4d9ab5f790f 100644
--- a/templates/shared/tooltip.php
+++ b/templates/shared/tooltip.php
@@ -1,8 +1,5 @@
<span class="tooltip tooltip-icon <? if ($important) echo 'tooltip-important'; ?>"
data-tooltip <? if (!$html) printf('title="%s"', htmlReady($text)) ?>
tabindex="0" aria-describedby="tooltip_<?= htmlReady($tooltip_id) ?>">
- <? if ($html): ?>
- <span class="tooltip-content"><?= $text ?></span>
- <? endif; ?>
</span>
-<span id="tooltip_<?= htmlReady($tooltip_id) ?>" class="sr-only"><?= htmlReady($text) ?></span>
+<span id="tooltip_<?= htmlReady($tooltip_id) ?>" class="tooltip-content"><?= htmlReady($text) ?></span>
--
GitLab