diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-01 10:30:12 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-01 10:30:12 +0000 |
| commit | a5b4fa3533dffca6662b0c5f368f1d76ee4c509f (patch) | |
| tree | a39aee28fb77dc5d6211e4521dff2d11e0101dac | |
| parent | 458fa667f5273c3a91906c20cb9e580fb6cfaff4 (diff) | |
| parent | 009f1251df93f9b7047d7a8da5d1c1d36641922d (diff) | |
| download | gitlab-ce-a5b4fa3533dffca6662b0c5f368f1d76ee4c509f.tar.gz | |
Merge branch 'active-element-tooltip' into 'master'
Do not show tooltip for active element
## What does this MR do?
Change Bootstrap's default for tooltips to display them only when hovering and not for the active element.
See also here: https://getbootstrap.com/javascript/#tooltips-options
## Screenshots
### Before
### After
## What are the relevant issue numbers?
Closes #23794
See merge request !7105
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index acf97249265..498eac9a289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Removed delete branch tooltip !6954 - Stop unauthorized users dragging on milestone page (blackst0ne) - Restore issue boards welcome message when a project is created !6899 +- Do not show tooltip for active element !7105 (winniehell) - Escape ref and path for relative links !6050 (winniehell) - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose) - Fix filtering of milestones with quotes in title (airatshigapov) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e57cf1b3a58..02a55040939 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -188,6 +188,7 @@ // Close select2 on escape }); // Initialize tooltips + $.fn.tooltip.Constructor.DEFAULTS.trigger = 'hover'; $body.tooltip({ selector: '.has-tooltip, [data-toggle="tooltip"]', placement: function(_, el) { |