diff --git a/src/scripts/tutti/0_navbar.js b/src/scripts/tutti/0_navbar.js index b27df9cc..592e8759 100644 --- a/src/scripts/tutti/0_navbar.js +++ b/src/scripts/tutti/0_navbar.js @@ -2,7 +2,7 @@ if(typeof($.fn.popover) != 'undefined'){ $('[data-toggle="popover"]').popover(); } if(typeof($.fn.tooltip) != 'undefined'){ - $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 1250, 'hide': 250}}); + $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 0, 'hide': 0}}); } function NavbarTransparent() { diff --git a/src/styles/base.sass b/src/styles/base.sass index 06923efd..caec7ad5 100644 --- a/src/styles/base.sass +++ b/src/styles/base.sass @@ -701,6 +701,8 @@ footer .tooltip + transition: none + &.in opacity: 1 diff --git a/src/templates/nodes/custom/_scripts.jade b/src/templates/nodes/custom/_scripts.jade index 9b0b5002..45da1453 100644 --- a/src/templates/nodes/custom/_scripts.jade +++ b/src/templates/nodes/custom/_scripts.jade @@ -168,5 +168,5 @@ script(type="text/javascript"). if (typeof $().tooltip != 'undefined'){ - $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 1250, 'hide': 250}}); + $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 0, 'hide': 0}}); }