Skip to content

Commit

Permalink
bootstrap upgrade, js fix
Browse files Browse the repository at this point in the history
  • Loading branch information
codecalm committed Oct 29, 2020
1 parent 4860980 commit e99982d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 25 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
53 changes: 30 additions & 23 deletions src/js/tabler.js
Original file line number Diff line number Diff line change
@@ -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);
});

})();
2 changes: 1 addition & 1 deletion src/scss/mixins/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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: "") {
Expand Down

0 comments on commit e99982d

Please sign in to comment.