Skip to content

Commit 87a4614

Browse files
Merge branch '3.4' into 4.0
* 3.4: [Filesystem] fix lock file permissions [Lock] fix lock file permissions [Form] Removed .form-control-label class. Removed .mb-0 in errors. Fix the detection of the Process new argument add @xabbuh as a code owner of the Yaml component Replace .initialism with .text-uppercase.
2 parents b5f1c06 + 9699d6e commit 87a4614

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Resources/views/Form/bootstrap_4_layout.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
{%- set element = 'legend' -%}
188188
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
189189
{%- else -%}
190-
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
190+
{%- set label_attr = label_attr|merge({for: id}) -%}
191191
{%- endif -%}
192192
{% if required -%}
193193
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
@@ -268,8 +268,8 @@
268268
{%- if errors|length > 0 -%}
269269
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
270270
{%- for error in errors -%}
271-
<span class="mb-0 d-block">
272-
<span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
271+
<span class="d-block">
272+
<span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
273273
</span>
274274
{%- endfor -%}
275275
</span>

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/asset": "~3.4|~4.0",
2424
"symfony/dependency-injection": "~3.4|~4.0",
2525
"symfony/finder": "~3.4|~4.0",
26-
"symfony/form": "^3.4.9|^4.0.9",
26+
"symfony/form": "^3.4.13|~4.0.13|^4.1.2",
2727
"symfony/http-foundation": "~3.4|~4.0",
2828
"symfony/http-kernel": "~3.4|~4.0",
2929
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
4141
"symfony/workflow": "~3.4|~4.0"
4242
},
4343
"conflict": {
44-
"symfony/form": "<3.4.9|<4.0.9,>=4.0",
44+
"symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2",
4545
"symfony/console": "<3.4"
4646
},
4747
"suggest": {

0 commit comments

Comments
 (0)