8000 minor #27887 [Form] Removed .mb-0 in errors. (vudaltsov) · symfony/symfony@5c74952 · GitHub
[go: up one dir, main page]
Skip to content
< 8000 /div>

Commit 5c74952

Browse files
nicolas-grekasnicolas-grekas
committed
minor #27887 [Form] Removed .mb-0 in errors. (vudaltsov)
This PR was merged into the 3.4 branch. Discussion ---------- [Form] Removed .mb-0 in errors. | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | `<span class="d-block">` will never have a margin on its own, so `.mb-0` is needless. Commits ------- 925dda1 Removed .mb-0 in errors.
2 parents d5c765a + 925dda1 commit 5c74952

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
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">
271+
<span class="d-block">
272272
<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 -%}

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/asset": "~2.8|~3.0|~4.0",
2424
"symfony/dependency-injection": "~2.8|~3.0|~4.0",
2525
"symfony/finder": "~2.8|~3.0|~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.3.11|~4.0",
2828
"symfony/http-kernel": "~3.2|~4.0",
2929
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
4141
"symfony/workflow": "~3.3|~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": {

‎src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testRow()
3333
./label[@for="name"]
3434
[
3535
./span[@class="alert alert-danger d-block"]
36-
[./span[@class="mb-0 d-block"]
36+
[./span[@class="d-block"]
3737
[./span[.="[trans]Error[/trans]"]]
3838
8000 [./span[.="[trans]Error![/trans]"]]
3939
]

‎src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testRow()
4242
./label[@for="name"]
4343
[
4444
./span[@class="alert alert-danger d-block"]
45-
[./span[@class="mb-0 d-block"]
45+
[./span[@class="d-block"]
4646
[./span[.="[trans]Error[/trans]"]]
4747
[./span[.="[trans]Error![/trans]"]]
4848
]
@@ -172,11 +172,11 @@ public function testErrors()
172172
'/span
173173
[@class="alert alert-danger d-block"]
174174
[
175-
./span[@class="mb-0 d-block"]
175+
./span[@class="d-block"]
176176
[./span[.="[trans]Error[/trans]"]]
177177
[./span[.="[trans]Error 1[/trans]"]]
178178
179-
/following-sibling::span[@class="mb-0 d-block"]
179+
/following-sibling::span[@class="d-block"]
180180
[./span[.="[trans]Error[/trans]"]]
181181
[./span[.="[trans]Error 2[/trans]"]]
182182
]

0 commit comments

Comments
 (0)
0