diff --git a/package.json b/package.json index c9e6c59d59a10953a8d15f42b4c29613fe5f44b1..79e09f7e30711333ed1676688b004de33a4e05b6 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@fullcalendar/timegrid": "^5.3.1", "apexcharts": "^3.22.0", "autosize": "^4.0.2", - "bootstrap": "5.0.0-alpha2", + "bootstrap": "twbs/bootstrap#a6156ed", "countup.js": "^2.0.7", "daterangepicker": "^3.1.0", "flatpickr": "^4.6.6", diff --git a/src/js/tabler.js b/src/js/tabler.js index 969cf801ead0513cc396f5f7b6486bc1860191cd..c1458e366039f26b23a8bf6e326309e3b6fbaeb4 100644 --- a/src/js/tabler.js +++ b/src/js/tabler.js @@ -1,27 +1,34 @@ //Vendor -import 'bootstrap'; +// import 'bootstrap'; -/** - */ -let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="tooltip"]')); -tooltipTriggerList.map(function (tooltipTriggerEl) { - let options = { - delay: {show: 50, hide: 50}, - html: true, - placement: 'auto' - }; - return new bootstrap.Tooltip(tooltipTriggerEl, options); -}); +(function() { + /** + */ + let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="tooltip"]')); + tooltipTriggerList.map(function (tooltipTriggerEl) { + let options = { + delay: {show: 50, hide: 50}, + html: true, + placement: 'auto' + }; + return new bootstrap.Tooltip(tooltipTriggerEl, options); + }); -/** - */ -let popoverTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="popover"]')); -popoverTriggerList.map(function (popoverTriggerEl) { - let options = { - delay: {show: 50, hide: 50}, - html: true, - placement: 'auto' - }; - return new bootstrap.Popover(popoverTriggerEl, options); -}); + /** + */ + let popoverTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="popover"]')); + popoverTriggerList.map(function (popoverTriggerEl) { + let options = { + delay: {show: 50, hide: 50}, + html: true, + placement: 'auto' + }; + return new bootstrap.Popover(popoverTriggerEl, options); + }); + let dropdownTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="dropdown"]')); + dropdownTriggerList.map(function (dropdownTriggerEl) { + return new bootstrap.Dropdown(dropdownTriggerEl); + }); + +})(); \ No newline at end of file diff --git a/src/scss/mixins/_functions.scss b/src/scss/mixins/_functions.scss index c6fd97a1b68c76a71aea3a951d496cd39fa672a8..ed5c5ab3d153491a49019d63b2c3cafa959848ef 100644 --- a/src/scss/mixins/_functions.scss +++ b/src/scss/mixins/_functions.scss @@ -6,7 +6,7 @@ //} @function theme-color-lighter($color) { - @return tint-color($color, 8); + @return tint-color($color, 90%); } @function str-replace($string, $search, $replace: "") {