diff --git a/assets/css/app.scss b/assets/css/app.scss index 186c24c703..e69ef34af6 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -2,5 +2,12 @@ @import "~@fortawesome/fontawesome-free/css/all.css"; @import '~chosen-js/chosen.css'; @import '~flag-icon-css/sass/flag-icon.scss'; -@import 'base.css'; +@import "~fullcalendar/dist/fullcalendar.css"; + +@import "~select2/dist/css/select2.css"; +@import "~bootstrap-daterangepicker/daterangepicker.scss"; +@import "~bootstrap-select/dist/css/bootstrap-select.css"; +@import '~jquery-ui/themes/base/all.css'; + +@import 'base.css'; diff --git a/assets/js/vendor.js b/assets/js/vendor.js index 0e13be6d18..fb0b58a86c 100644 --- a/assets/js/vendor.js +++ b/assets/js/vendor.js @@ -21,14 +21,10 @@ require("jquery.scrollbar"); require("blueimp-file-upload"); require("select2"); require("timeago"); -require("select2/dist/css/select2.css"); require('bootstrap-select/dist/js/bootstrap-select.js'); -require('bootstrap-select/dist/css/bootstrap-select.css'); -require('flag-icon-css/css/flag-icon.css'); + require("bootstrap-daterangepicker"); -require("bootstrap-daterangepicker/daterangepicker.scss"); require("fullcalendar/dist/fullcalendar.js"); -require("fullcalendar/dist/fullcalendar.css"); require("fullcalendar/dist/gcal.js"); require("fullcalendar/dist/locale-all.js"); @@ -36,7 +32,6 @@ require("fullcalendar/dist/locale-all.js"); // doesn't work with webpack added directly in /public/libs folder /* -require("fullcalendar"); require("pwstrength-bootstrap"); require("js-cookie");