diff --git a/core/admin/assets/app.js b/core/admin/assets/app.js index 2b3ad9ee..364f8429 100644 --- a/core/admin/assets/app.js +++ b/core/admin/assets/app.js @@ -1,6 +1,6 @@ require('./app.css'); -import 'select2'; +import 'admin-lte/plugins/select2/js/select2.js'; import 'admin-lte/plugins/datatables/jquery.dataTables.js'; import 'admin-lte/plugins/datatables-bs4/js/dataTables.bootstrap4.js'; import 'admin-lte/plugins/datatables-responsive/js/dataTables.responsive.js'; diff --git a/core/admin/assets/vendor.js b/core/admin/assets/vendor.js index 65bee27f..1d9b0b69 100644 --- a/core/admin/assets/vendor.js +++ b/core/admin/assets/vendor.js @@ -1,13 +1,12 @@ // jQuery import jQuery from 'jquery'; -import 'select2/dist/css/select2.css'; +import 'admin-lte/plugins/select2/css/select2.css'; // bootstrap // import 'bootstrap/less/bootstrap.less'; // import 'bootstrap'; -// FA -// import 'font-awesome/scss/font-awesome.scss'; // FA is included with AdminLTE +// FontAwesome import 'admin-lte/plugins/fontawesome-free/css/fontawesome.css'; import 'admin-lte/plugins/fontawesome-free/css/regular.css'; import 'admin-lte/plugins/fontawesome-free/css/solid.css'; @@ -16,10 +15,6 @@ import 'admin-lte/plugins/fontawesome-free/css/solid.css'; import 'admin-lte/build/scss/adminlte.scss'; import 'admin-lte/plugins/datatables-bs4/css/dataTables.bootstrap4.css'; import 'admin-lte/plugins/datatables-responsive/css/responsive.bootstrap4.css'; -// import 'admin-lte/build/less/AdminLTE-without-plugins.less'; // doesn't exist -// import 'admin-lte/build/less/select2.less'; // doesn't exist -// import 'admin-lte/build/less/skins/skin-blue.less'; // doesn't exist import 'admin-lte/build/js/Layout.js'; import 'admin-lte/build/js/ControlSidebar.js'; import 'admin-lte/build/js/PushMenu.js'; -// import 'admin-lte/build/js/BoxRefresh.js'; // doesn't exist diff --git a/core/admin/package.json b/core/admin/package.json index ac18f61e..72e612bc 100644 --- a/core/admin/package.json +++ b/core/admin/package.json @@ -13,12 +13,9 @@ "@babel/preset-env": "^7.4.4", "admin-lte": "^3.1.0", "babel-loader": "^8.0.5", - "bootstrap": "^3.4.1", "css-loader": "^2.1.1", "expose-loader": "^0.7.5", "file-loader": "^3.0.1", - "font-awesome": "^4.7.0", - "font-awesome-loader": "^1.0.2", "jQuery": "^1.7.4", "less": "^3.9.0", "less-loader": "^5.0.0", @@ -26,7 +23,6 @@ "node-sass": "^4.12.0", "popper.js": "^1.15.0", "sass-loader": "^7.1.0", - "select2": "^4.0.7-rc.0", "style-loader": "^0.23.1", "url-loader": "^1.1.2", "webpack": "^4.30.0",