diff --git a/Resources/public/sass/_custom.scss b/Resources/public/sass/_custom.scss index b355a533e..ffcca26d4 100644 --- a/Resources/public/sass/_custom.scss +++ b/Resources/public/sass/_custom.scss @@ -76,10 +76,6 @@ ul.custom_fields.choice li { color: $red; } -.blop label { - line-height: 1 + ($base-spacing / 3); -} - .footer { p { font-family: 'Open Sans'; diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig index 099a42294..c7efe69ff 100644 --- a/Resources/views/Form/fields.html.twig +++ b/Resources/views/Form/fields.html.twig @@ -61,7 +61,11 @@
{% endfor %} - + {% endspaceless %} {% endblock choice_widget_expanded %} @@ -90,7 +94,9 @@ {%- endif -%} {% endfor %} {% endspaceless %} {% endblock choice_with_other_widget %} diff --git a/chill.webpack.config.js b/chill.webpack.config.js index b14331e57..e6f4c8be8 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -18,10 +18,11 @@ import {chill} from './Resources/public/js/chill.js'; global.chill = chill; // css -require('./Resources/public/sass/_custom.scss'); +require('./Resources/public/sass/scratch.scss'); require('./Resources/public/css/chillmain.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('select2/dist/css/select2.css'); // img