diff --git a/composer.json b/composer.json index 748a7d862..fb0d2dcd1 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,8 @@ "symfony/css-selector": "^5.2", "twig/markdown-extra": "^3.3", "erusev/parsedown": "^1.7", - "symfony/serializer": "^5.2" + "symfony/serializer": "^5.2", + "symfony/webpack-encore-bundle": "^1.11" }, "conflict": { "symfony/symfony": "*" diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss index cc9c090e2..37bf2f253 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss @@ -18,7 +18,7 @@ // @import "bootstrap/scss/tables"; // @import "bootstrap/scss/forms"; // @import "bootstrap/scss/buttons"; -// @import "bootstrap/scss/transitions"; +@import "bootstrap/scss/transitions"; // @import "bootstrap/scss/dropdown"; // @import "bootstrap/scss/button-group"; // @import "bootstrap/scss/input-group"; diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js index 075823cab..e75a810c2 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js @@ -4,6 +4,8 @@ // Or compile bootstrap only enabled assets require('./bootstrap.scss'); + // You can specify which plugins you need //import { Tooltip, Toast, Popover } from 'bootstrap'; import Modal from 'bootstrap/js/dist/modal'; +import Collapse from 'bootstrap/js/src/collapse'; diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 7c8231d4b..2bdb6c715 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -28,16 +28,16 @@ {{ installation.name }} - {% block title %}{% endblock %} - - + {{ encore_entry_link_tags('scratch') }} + {{ encore_entry_link_tags('chill') }} {% if active_bootstrap == 1 %} - + {{ encore_entry_link_tags('bootstrap') }} {% endif %} {% if active_forkawesome == 1 %} - + {{ encore_entry_link_tags('forkawesome') }} {% endif %} {% if active_ckeditor == 1 %} - + {{ encore_entry_link_tags('ckeditor5') }} {% endif %} {% block css%}{% endblock %} @@ -152,17 +152,16 @@ {{ include('@ChillMain/Layout/_footer.html.twig') }} - - - + {{ encore_entry_script_tags('scratch') }} + {{ encore_entry_script_tags('chill') }} {% if active_bootstrap == 1 %} - + {{ encore_entry_script_tags('bootstrap') }} {% endif %} {% if active_forkawesome == 1 %} - + {{ encore_entry_script_tags('forkawesome') }} {% endif %} {% if active_ckeditor == 1 %} - + {{ encore_entry_script_tags('ckeditor5') }} {% endif %}