Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'features/household-members-list' into features/household-editor

Browse Source
This commit is contained in:
Julien Fastré
2021-06-07 17:36:25 +02:00
parent a922e397f8 be13f8f65b
commit 7c94824c20
18 changed files with 433 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss vendored
View File

@@ -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";

2
src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
View File

@@ -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';

21
src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
View File

@@ -28,16 +28,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ installation.name }} - {% block title %}{% endblock %}</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/scratch.css') }}"/>
<link rel="stylesheet" href="{{ asset('build/chill.css') }}"/>
{{ encore_entry_link_tags('scratch') }}
{{ encore_entry_link_tags('chill') }}
{% if active_bootstrap == 1 %}
<link rel="stylesheet" href="{{ asset('build/bootstrap.css') }}" type="text/css"/>
{{ encore_entry_link_tags('bootstrap') }}
{% endif %}
{% if active_forkawesome == 1 %}
<link rel="stylesheet" href="{{ asset('build/forkawesome.css') }}" type="text/css"/>
{{ encore_entry_link_tags('forkawesome') }}
{% endif %}
{% if active_ckeditor == 1 %}
<link rel="stylesheet" href="{{ asset('build/ckeditor5.css') }}" type="text/css"/>
{{ encore_entry_link_tags('ckeditor5') }}
{% endif %}
{% block css%}<!-- nothing added to css -->{% endblock %}
</head>
@@ -152,17 +152,16 @@
{{ include('@ChillMain/Layout/_footer.html.twig') }}
<script type="text/javascript" src="{{ asset('build/runtime.js') }}"></script>
<script type="text/javascript" src="{{ asset('build/scratch.js') }}"></script>
<script type="text/javascript" src="{{ asset('build/chill.js') }}"></script>
{{ encore_entry_script_tags('scratch') }}
{{ encore_entry_script_tags('chill') }}
{% if active_bootstrap == 1 %}
<script type="text/javascript" src="{{ asset('build/bootstrap.js') }}"></script>
{{ encore_entry_script_tags('bootstrap') }}
{% endif %}
{% if active_forkawesome == 1 %}
<script type="text/javascript" src="{{ asset('build/forkawesome.js') }}"></script>
{{ encore_entry_script_tags('forkawesome') }}
{% endif %}
{% if active_ckeditor == 1 %}
<script type="text/javascript" src="{{ asset('build/ckeditor5.js') }}"></script>
{{ encore_entry_script_tags('ckeditor5') }}
{% endif %}
<script type="text/javascript">
chill.initPikaday('{{ app.request.locale }}');