diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig index 8f790fdd19450..4fa0e3bf0a9e8 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig @@ -129,8 +129,12 @@ {% endblock %} {% block form_widget_simple -%} + {% if use_bootstrap_custom is not defined %} + {% set use_bootstrap_custom = true %} + {% endif %} + {% if type is not defined or type != 'hidden' %} - {%- set attr = attr|merge({class: (attr.class|default('') ~ (type|default('') == 'file' ? ' custom-file-input' : ' form-control'))|trim}) -%} + {%- set attr = attr|merge({class: (attr.class|default('') ~ (type|default('') == 'file' and use_bootstrap_custom ? ' custom-file-input' : ' form-control'))|trim}) -%} {% endif %} {%- if type is defined and (type == 'range' or type == 'color') %} {# Attribute "required" is not supported #} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_nocustom_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_nocustom_layout.html.twig new file mode 100644 index 0000000000000..207bcebc54177 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_nocustom_layout.html.twig @@ -0,0 +1,20 @@ +{% extends "bootstrap_4_layout.html.twig" %} + +{% block file_widget -%} +
+ <{{ element|default('div') }}> + {%- set type = type|default('file') -%} + {{- block('form_widget_simple') -}} + + +
+{% endblock %} + +{% block form_widget_simple -%} + {% set use_bootstrap_custom = false %} + {{- parent() -}} +{% endblock %}