From e99982daf92f3a1b3c0d19a3983d9503726e7e3a Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Thu, 29 Oct 2020 23:38:55 +0100
Subject: [PATCH] bootstrap upgrade, js fix

---
 package.json                    |  2 +-
 src/js/tabler.js                | 53 +++++++++++++++++++--------------
 src/scss/mixins/_functions.scss |  2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index c9e6c59d5..79e09f7e3 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 969cf801e..c1458e366 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 c6fd97a1b..ed5c5ab3d 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: "") {