diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
-------

925dda130e Removed .mb-0 in errors.
This commit is contained in:
Nicolas Grekas 2018-07-09 14:39:50 +02:00
parent d5c765ad69 925dda130e
commit 5c7495295b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
View File

@ -268,7 +268,7 @@
{%- if errors|length > 0 -%}
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
{%- for error in errors -%}
<span class="mb-0 d-block">
<span class="d-block">
<span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
</span>
{%- endfor -%}

4
src/Symfony/Bridge/Twig/composer.json
View File

@ -23,7 +23,7 @@
"symfony/asset": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~2.8|~3.0|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
"symfony/form": "^3.4.9|^4.0.9",
"symfony/form": "^3.4.13|~4.0.13|^4.1.2",
"symfony/http-foundation": "^3.3.11|~4.0",
"symfony/http-kernel": "~3.2|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
@ -41,7 +41,7 @@
"symfony/workflow": "~3.3|~4.0"
},
"conflict": {
"symfony/form": "<3.4.9|<4.0.9,>=4.0",
"symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2",
"symfony/console": "<3.4"
},
"suggest": {

2
src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php
View File

@ -33,7 +33,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
./label[@for="name"]
[
./span[@class="alert alert-danger d-block"]
[./span[@class="mb-0 d-block"]
[./span[@class="d-block"]
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error![/trans]"]]
]

6
src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
View File

@ -42,7 +42,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
./label[@for="name"]
[
./span[@class="alert alert-danger d-block"]
[./span[@class="mb-0 d-block"]
[./span[@class="d-block"]
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error![/trans]"]]
]
@ -172,11 +172,11 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
'/span
[@class="alert alert-danger d-block"]
[
./span[@class="mb-0 d-block"]
./span[@class="d-block"]
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error 1[/trans]"]]
/following-sibling::span[@class="mb-0 d-block"]
/following-sibling::span[@class="d-block"]
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error 2[/trans]"]]
]