Unify css files, Move vendor files to assets folder

sonata-project · Apr 19, 2021 · f47f526 · f47f526
1 parent aced4f7
commit f47f526
Show file tree

Hide file tree

Showing 385 changed files with 410 additions and 55,193 deletions.
diff --git a/assets/scss/app.scss b/assets/scss/app.scss
@@ -1,3 +1,16 @@
+@import "~bootstrap/dist/css/bootstrap.css";
+@import "~font-awesome/scss/font-awesome";
+@import "~admin-lte/dist/css/alt/AdminLTE-without-plugins.css";
+@import "~icheck/skins/square/blue.css";
+
+// Eonasdan Bootstrap DateTimePicker in its version 3 does not
+// provide the scss or plain css, it only provides the less version
+// of its source files, that's why it is not included it via npm.
+@import "../vendor/bootstrap-datetimepicker.css";
+@import "../vendor/jquery-ui.css";
+@import "~select2/dist/css/select2.css";
+@import "~select2-bootstrap-theme/dist/select2-bootstrap.css";
+@import "~x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css";
 @import "./styles";
 @import "./layout";
 @import "./tree";

diff --git a/...er/build/css/bootstrap-datetimepicker.css → assets/vendor/bootstrap-datetimepicker.css b/...er/build/css/bootstrap-datetimepicker.css → assets/vendor/bootstrap-datetimepicker.css
diff --git a/.../build/js/bootstrap-datetimepicker.min.js → ...ts/vendor/bootstrap-datetimepicker.min.js b/.../build/js/bootstrap-datetimepicker.min.js → ...ts/vendor/bootstrap-datetimepicker.min.js
diff --git a/...i/themes/base/images/animated-overlay.gif → assets/vendor/images/animated-overlay.gif b/...i/themes/base/images/animated-overlay.gif → assets/vendor/images/animated-overlay.gif
diff --git a/...ase/images/ui-bg_flat_0_aaaaaa_40x100.png → ...dor/images/ui-bg_flat_0_aaaaaa_40x100.png b/...ase/images/ui-bg_flat_0_aaaaaa_40x100.png → ...dor/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/...se/images/ui-bg_flat_75_ffffff_40x100.png → ...or/images/ui-bg_flat_75_ffffff_40x100.png b/...se/images/ui-bg_flat_75_ffffff_40x100.png → ...or/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/...se/images/ui-bg_glass_55_fbf9ee_1x400.png → ...or/images/ui-bg_glass_55_fbf9ee_1x400.png b/...se/images/ui-bg_glass_55_fbf9ee_1x400.png → ...or/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/...se/images/ui-bg_glass_65_ffffff_1x400.png → ...or/images/ui-bg_glass_65_ffffff_1x400.png b/...se/images/ui-bg_glass_65_ffffff_1x400.png → ...or/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/...se/images/ui-bg_glass_75_dadada_1x400.png → ...or/images/ui-bg_glass_75_dadada_1x400.png b/...se/images/ui-bg_glass_75_dadada_1x400.png → ...or/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/...se/images/ui-bg_glass_75_e6e6e6_1x400.png → ...or/images/ui-bg_glass_75_e6e6e6_1x400.png b/...se/images/ui-bg_glass_75_e6e6e6_1x400.png → ...or/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/...se/images/ui-bg_glass_95_fef1ec_1x400.png → ...or/images/ui-bg_glass_95_fef1ec_1x400.png b/...se/images/ui-bg_glass_95_fef1ec_1x400.png → ...or/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/.../ui-bg_highlight-soft_75_cccccc_1x100.png → .../ui-bg_highlight-soft_75_cccccc_1x100.png b/.../ui-bg_highlight-soft_75_cccccc_1x100.png → .../ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/...s/base/images/ui-icons_222222_256x240.png → ...vendor/images/ui-icons_222222_256x240.png b/...s/base/images/ui-icons_222222_256x240.png → ...vendor/images/ui-icons_222222_256x240.png
diff --git a/...s/base/images/ui-icons_2e83ff_256x240.png → ...vendor/images/ui-icons_2e83ff_256x240.png b/...s/base/images/ui-icons_2e83ff_256x240.png → ...vendor/images/ui-icons_2e83ff_256x240.png
diff --git a/...s/base/images/ui-icons_454545_256x240.png → ...vendor/images/ui-icons_454545_256x240.png b/...s/base/images/ui-icons_454545_256x240.png → ...vendor/images/ui-icons_454545_256x240.png
diff --git a/...s/base/images/ui-icons_888888_256x240.png → ...vendor/images/ui-icons_888888_256x240.png b/...s/base/images/ui-icons_888888_256x240.png → ...vendor/images/ui-icons_888888_256x240.png
diff --git a/...s/base/images/ui-icons_cd0a0a_256x240.png → ...vendor/images/ui-icons_cd0a0a_256x240.png b/...s/base/images/ui-icons_cd0a0a_256x240.png → ...vendor/images/ui-icons_cd0a0a_256x240.png
diff --git a/...ui/ui/minified/i18n/jquery-ui-i18n.min.js → assets/vendor/jquery-ui-i18n.min.js b/...ui/ui/minified/i18n/jquery-ui-i18n.min.js → assets/vendor/jquery-ui-i18n.min.js
diff --git a/...vendor/jqueryui/themes/base/jquery-ui.css → assets/vendor/jquery-ui.css b/...vendor/jqueryui/themes/base/jquery-ui.css → assets/vendor/jquery-ui.css
diff --git a/...dor/jqueryui/ui/minified/jquery-ui.min.js → assets/vendor/jquery-ui.min.js b/...dor/jqueryui/ui/minified/jquery-ui.min.js → assets/vendor/jquery-ui.min.js
diff --git a/.../jquery.confirmExit/jquery.confirmExit.js → assets/vendor/jquery.confirmExit.js b/.../jquery.confirmExit/jquery.confirmExit.js → assets/vendor/jquery.confirmExit.js
diff --git a/docs/reference/configuration.rst b/docs/reference/configuration.rst
@@ -179,15 +179,6 @@ Full Configuration Options
                 stylesheets:
 
                     # The default stylesheet list:
-                    - bundles/sonataadmin/dist/bootstrap/bootstrap.min.css
-                    - bundles/sonataadmin/dist/components-font-awesome/css/font-awesome.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
-                    - bundles/sonataadmin/dist/select2/select2.min.css
-                    - bundles/sonataadmin/dist/select2-bootstrap-theme/select2-bootstrap.min.css
-                    - bundles/sonataadmin/dist/x-editable/bootstrap-editable.css
                     - bundles/sonataadmin/dist/app.css
 
                 # stylesheet paths to add to the page in addition to the list above
@@ -201,13 +192,13 @@ Full Configuration Options
                     # The default javascript list:
                     - bundles/sonataadmin/dist/jquery/jquery.min.js
                     - bundles/sonataadmin/dist/jquery-scrollto/jquery.scrollTo.min.js
-                    - bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js
-                    - bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js
+                    - bundles/sonataadmin/dist/jquery-ui/jquery-ui.min.js
+                    - bundles/sonataadmin/dist/jquery-ui/jquery-ui-i18n.min.js
                     - bundles/sonataadmin/dist/moment/moment.min.js
                     - bundles/sonataadmin/dist/bootstrap/bootstrap.min.js
-                    - bundles/sonataadmin/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js
+                    - bundles/sonataadmin/dist/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
                     - bundles/sonataadmin/dist/jquery-form/jquery.form.js
-                    - bundles/sonataadmin/vendor/jquery.confirmExit/jquery.confirmExit.js
+                    - bundles/sonataadmin/dist/jquery.confirmExit/jquery.confirmExit.js
                     - bundles/sonataadmin/dist/x-editable/bootstrap-editable.min.js
                     - bundles/sonataadmin/dist/select2/select2.full.min.js
                     - bundles/sonataadmin/dist/admin-lte/js/adminlte.min.js

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -388,17 +388,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->children()
                         ->arrayNode('stylesheets')
                             ->defaultValue([
-                                'bundles/sonataadmin/dist/bootstrap/bootstrap.min.css',
-                                'bundles/sonataadmin/dist/components-font-awesome/css/font-awesome.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',
-
-                                'bundles/sonataadmin/dist/select2/select2.min.css',
-                                'bundles/sonataadmin/dist/select2-bootstrap-theme/select2-bootstrap.min.css',
-                                'bundles/sonataadmin/dist/x-editable/bootstrap-editable.css',
                                 'bundles/sonataadmin/dist/app.css',
                             ])
                             ->prototype('scalar')->end()
@@ -417,19 +406,13 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->defaultValue([
                                 'bundles/sonataadmin/dist/jquery/jquery.min.js',
                                 'bundles/sonataadmin/dist/jquery-scrollto/jquery.scrollTo.min.js',
-
-                                'bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js',
-                                'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js',
-
+                                'bundles/sonataadmin/dist/jquery-ui/jquery-ui.min.js',
+                                'bundles/sonataadmin/dist/jquery-ui/jquery-ui-i18n.min.js',
                                 'bundles/sonataadmin/dist/moment/moment.min.js',
                                 'bundles/sonataadmin/dist/bootstrap/bootstrap.min.js',
-
-                                'bundles/sonataadmin/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
-
+                                'bundles/sonataadmin/dist/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js',
                                 'bundles/sonataadmin/dist/jquery-form/jquery.form.js',
-
-                                'bundles/sonataadmin/vendor/jquery.confirmExit/jquery.confirmExit.js',
-
+                                'bundles/sonataadmin/dist/jquery.confirmExit/jquery.confirmExit.js',
                                 'bundles/sonataadmin/dist/x-editable/bootstrap-editable.min.js',
                                 'bundles/sonataadmin/dist/select2/select2.full.min.js',
                                 'bundles/sonataadmin/dist/admin-lte/js/adminlte.min.js',

diff --git a/src/Resources/public/dist/admin-lte/css/AdminLTE-without-plugins.min.css b/src/Resources/public/dist/admin-lte/css/AdminLTE-without-plugins.min.css
diff --git a/src/Resources/public/dist/admin-lte/img/avatar.png b/src/Resources/public/dist/admin-lte/img/avatar.png
diff --git a/src/Resources/public/dist/admin-lte/img/avatar04.png b/src/Resources/public/dist/admin-lte/img/avatar04.png
diff --git a/src/Resources/public/dist/admin-lte/img/avatar2.png b/src/Resources/public/dist/admin-lte/img/avatar2.png
diff --git a/src/Resources/public/dist/admin-lte/img/avatar3.png b/src/Resources/public/dist/admin-lte/img/avatar3.png
diff --git a/src/Resources/public/dist/admin-lte/img/avatar5.png b/src/Resources/public/dist/admin-lte/img/avatar5.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/american-express.png b/src/Resources/public/dist/admin-lte/img/credit/american-express.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/cirrus.png b/src/Resources/public/dist/admin-lte/img/credit/cirrus.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/mastercard.png b/src/Resources/public/dist/admin-lte/img/credit/mastercard.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/mestro.png b/src/Resources/public/dist/admin-lte/img/credit/mestro.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/paypal.png b/src/Resources/public/dist/admin-lte/img/credit/paypal.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/paypal2.png b/src/Resources/public/dist/admin-lte/img/credit/paypal2.png
diff --git a/src/Resources/public/dist/admin-lte/img/credit/visa.png b/src/Resources/public/dist/admin-lte/img/credit/visa.png
diff --git a/src/Resources/public/dist/admin-lte/img/default-50x50.gif b/src/Resources/public/dist/admin-lte/img/default-50x50.gif
diff --git a/src/Resources/public/dist/admin-lte/img/icons.png b/src/Resources/public/dist/admin-lte/img/icons.png
diff --git a/src/Resources/public/dist/admin-lte/img/photo1.png b/src/Resources/public/dist/admin-lte/img/photo1.png
diff --git a/src/Resources/public/dist/admin-lte/img/photo2.png b/src/Resources/public/dist/admin-lte/img/photo2.png
diff --git a/src/Resources/public/dist/admin-lte/img/photo3.jpg b/src/Resources/public/dist/admin-lte/img/photo3.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/photo4.jpg b/src/Resources/public/dist/admin-lte/img/photo4.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user1-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user1-128x128.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user2-160x160.jpg b/src/Resources/public/dist/admin-lte/img/user2-160x160.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user3-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user3-128x128.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user4-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user4-128x128.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user5-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user5-128x128.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user6-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user6-128x128.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user7-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user7-128x128.jpg
diff --git a/src/Resources/public/dist/admin-lte/img/user8-128x128.jpg b/src/Resources/public/dist/admin-lte/img/user8-128x128.jpg