Use admin lte without plugins to avoid override of select2 default st…

…yles
sonata-project · Apr 14, 2021 · b4b7178 · b4b7178
1 parent b927435
commit b4b7178
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/docs/reference/configuration.rst b/docs/reference/configuration.rst
@@ -182,7 +182,7 @@ Full Configuration Options
                     - bundles/sonataadmin/dist/bootstrap/bootstrap.min.css
                     - bundles/sonataadmin/dist/components-font-awesome/css/font-awesome.min.css
                     - bundles/sonataadmin/dist/ionicons/css/ionicons.min.css
-                    - bundles/sonataadmin/dist/admin-lte/css/AdminLTE.min.css
+                    - bundles/sonataadmin/dist/admin-lte/css/AdminLTE-without-plugins.min.css
                     - bundles/sonataadmin/dist/icheck/skins/square/blue.css
                     - bundles/sonataadmin/vendor/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css
                     - bundles/sonataadmin/vendor/jqueryui/themes/base/jquery-ui.css

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -391,7 +391,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 'bundles/sonataadmin/dist/bootstrap/bootstrap.min.css',
                                 'bundles/sonataadmin/dist/components-font-awesome/css/font-awesome.min.css',
                                 'bundles/sonataadmin/dist/ionicons/css/ionicons.min.css',
-                                'bundles/sonataadmin/dist/admin-lte/css/AdminLTE.min.css',
+                                'bundles/sonataadmin/dist/admin-lte/css/AdminLTE-without-plugins.min.css',
                                 'bundles/sonataadmin/dist/icheck/skins/square/blue.css',
 
                                 'bundles/sonataadmin/vendor/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css',

diff --git a/...ublic/dist/admin-lte/css/AdminLTE.min.css → ...-lte/css/AdminLTE-without-plugins.min.css b/...ublic/dist/admin-lte/css/AdminLTE.min.css → ...-lte/css/AdminLTE-without-plugins.min.css
diff --git a/src/Resources/public/dist/manifest.json b/src/Resources/public/dist/manifest.json
@@ -12,10 +12,10 @@
   "bundles/sonataadmin/dist/ionicons/fonts/ionicons.eot": "/bundles/sonataadmin/dist/ionicons/fonts/ionicons.eot",
   "bundles/sonataadmin/dist/bootstrap/bootstrap.min.css": "/bundles/sonataadmin/dist/bootstrap/bootstrap.min.css",
   "bundles/sonataadmin/dist/components-font-awesome/fonts/fontawesome-webfont.woff": "/bundles/sonataadmin/dist/components-font-awesome/fonts/fontawesome-webfont.woff",
-  "bundles/sonataadmin/dist/admin-lte/css/AdminLTE.min.css": "/bundles/sonataadmin/dist/admin-lte/css/AdminLTE.min.css",
   "bundles/sonataadmin/dist/jquery/jquery.min.js": "/bundles/sonataadmin/dist/jquery/jquery.min.js",
   "bundles/sonataadmin/dist/components-font-awesome/fonts/fontawesome-webfont.woff2": "/bundles/sonataadmin/dist/components-font-awesome/fonts/fontawesome-webfont.woff2",
   "bundles/sonataadmin/dist/x-editable/bootstrap-editable.min.js": "/bundles/sonataadmin/dist/x-editable/bootstrap-editable.min.js",
+  "bundles/sonataadmin/dist/admin-lte/css/AdminLTE-without-plugins.min.css": "/bundles/sonataadmin/dist/admin-lte/css/AdminLTE-without-plugins.min.css",
   "bundles/sonataadmin/dist/select2/select2.min.js": "/bundles/sonataadmin/dist/select2/select2.min.js",
   "bundles/sonataadmin/dist/ionicons/fonts/ionicons.woff": "/bundles/sonataadmin/dist/ionicons/fonts/ionicons.woff",
   "bundles/sonataadmin/dist/bootstrap/bootstrap.min.css.map": "/bundles/sonataadmin/dist/bootstrap/bootstrap.min.css.map",

diff --git a/webpack.config.js b/webpack.config.js
@@ -23,7 +23,8 @@ Encore
     { from: './node_modules/jquery-slimscroll/', pattern: /jquery\.slimscroll\.min\.js/, to: 'jquery-slimscroll/[name].[ext]' },
     { from: './node_modules/jquery.scrollto/', pattern: /jquery\.scrollTo\.min\.js/, to: 'jquery-scrollto/[name].[ext]' },
     { from: './node_modules/jquery-form/', pattern: /jquery\.form\.js/, to: 'jquery-form/[name].[ext]' },
-    { from: './node_modules/admin-lte/dist/css/', pattern: /skin-.*\.min.css|AdminLTE\.min\.css/, to: 'admin-lte/css/[path][name].[ext]' },
+    { from: './node_modules/admin-lte/dist/css/skins/', pattern: /skin-.*\.min.css/, to: 'admin-lte/css/skins/[name].[ext]' },
+    { from: './node_modules/admin-lte/dist/css/alt/', pattern: /AdminLTE-without-plugins\.min\.css/, to: 'admin-lte/css/[name].[ext]' },
     { from: './node_modules/admin-lte/dist/img/', to: 'admin-lte/img/[path][name].[ext]' },
     { from: './node_modules/admin-lte/dist/js/', pattern: /adminlte\.min\.js/, to: 'admin-lte/js/[name].[ext]' },
     { from: './node_modules/bootstrap/dist/css/', pattern: /bootstrap\.min\.css/, to: 'bootstrap/[name].[ext]' },