Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

adapt config to load select2 and other values. Removed unused constants

Browse Source
This commit is contained in:
Julien Fastré 2018-05-04 15:11:27 +02:00
parent a0d290ca2c
commit 02ffcbb9ae
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/public/sass/_custom.scss
View File

@ -76,10 +76,6 @@ ul.custom_fields.choice li {
color: $red; color: $red;
} }
.blop label {
line-height: 1 + ($base-spacing / 3);
}
.footer { .footer {
p { p {
font-family: 'Open Sans'; font-family: 'Open Sans';

10
Resources/views/Form/fields.html.twig
View File

@ -61,7 +61,11 @@
<br/> <br/>
{% endfor %} {% endfor %}
</div> </div>
<script type="text/javascript">chill.checkNullValuesInChoices("{{ form.vars.full_name }}");</script> <script type="text/javascript">
document.addEventListener('load', function(e) {
chill.checkNullValuesInChoices("{{ form.vars.full_name }}");
});
</script>
{% endspaceless %} {% endspaceless %}
{% endblock choice_widget_expanded %} {% endblock choice_widget_expanded %}
@ -90,7 +94,9 @@
{%- endif -%} {%- endif -%}
{% endfor %} {% endfor %}
<script type="text/javascript"> <script type="text/javascript">
chill.checkNullValuesInChoices("{{ form._choices.vars.full_name }}"); document.addEventListener('load', function(e) {
chill.checkNullValuesInChoices("{{ form._choices.vars.full_name }}");
});
</script> </script>
{% endspaceless %} {% endspaceless %}
{% endblock choice_with_other_widget %} {% endblock choice_with_other_widget %}

5
chill.webpack.config.js
View File

@ -18,10 +18,11 @@ import {chill} from './Resources/public/js/chill.js';
global.chill = chill; global.chill = chill;
// css // css
require('./Resources/public/sass/_custom.scss'); require('./Resources/public/sass/scratch.scss');
require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/chillmain.css');
require('./Resources/public/css/pikaday.css'); require('./Resources/public/css/pikaday.css');
require('./Resources/public/css/scratch.css'); //require('./Resources/public/css/scratch.css');
//require('./Resources/public/css/select2/select2.css'); //require('./Resources/public/css/select2/select2.css');
require('select2/dist/css/select2.css');
// img // img