Skip to content

Commit

Permalink
Unify css files, Move vendor files to assets folder
Browse files Browse the repository at this point in the history
  • Loading branch information
jordisala1991 committed Apr 18, 2021
1 parent 3385cc2 commit 723dfdb
Show file tree
Hide file tree
Showing 385 changed files with 410 additions and 55,193 deletions.
13 changes: 13 additions & 0 deletions assets/scss/app.scss
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 4 additions & 13 deletions docs/reference/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.min.js
- bundles/sonataadmin/dist/admin-lte/js/adminlte.min.js
Expand Down
25 changes: 4 additions & 21 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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.min.js',
'bundles/sonataadmin/dist/admin-lte/js/adminlte.min.js',
Expand Down

This file was deleted.

Binary file removed src/Resources/public/dist/admin-lte/img/avatar.png
Binary file not shown.
Binary file removed src/Resources/public/dist/admin-lte/img/avatar04.png
Binary file not shown.
Binary file removed src/Resources/public/dist/admin-lte/img/avatar2.png
Binary file not shown.
Binary file removed src/Resources/public/dist/admin-lte/img/avatar3.png
Binary file not shown.
Binary file removed src/Resources/public/dist/admin-lte/img/avatar5.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Binary file removed src/Resources/public/dist/admin-lte/img/icons.png
Diff not rendered.
Binary file removed src/Resources/public/dist/admin-lte/img/photo1.png
Diff not rendered.
Binary file removed src/Resources/public/dist/admin-lte/img/photo2.png
Diff not rendered.
Binary file removed src/Resources/public/dist/admin-lte/img/photo3.jpg
Diff not rendered.
Binary file removed src/Resources/public/dist/admin-lte/img/photo4.jpg
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 723dfdb

Please sign in to comment.