8000 [Form] Removed .form-control-label class. by vudaltsov · Pull Request #27886 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] Removed .form-control-label class. #27886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2018
Merged

[Form] Removed .form-control-label class. #27886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
{%- set element = 'legend' -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
{%- else -%}
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
{%- set label_attr = label_attr|merge({for: id}) -%}
{%- endif -%}
{% if required -%}
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bridge/Twig/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function testLabelDoesNotRenderFieldAttributes()
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="col-form-label col-sm-2 form-control-label required"]
[@class="col-form-label col-sm-2 required"]
'
);
}
Expand All @@ -89,7 +89,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="my&class col-form-label col-sm-2 form-control-label required"]
[@class="my&class col-form-label col-sm-2 required"]
'
);
}
Expand All @@ -106,7 +106,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="my&class col-form-label col-sm-2 form-control-label required"]
[@class="my&class col-form-label col-sm-2 required"]
[.="[trans]Custom label[/trans]"]
'
);
Expand All @@ -126,7 +126,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="my&class col-form-label col-sm-2 form-control-label required"]
[@class="my&class col-form-label col-sm-2 required"]
[.="[trans]Custom label[/trans]"]
'
);
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function testLabelDoesNotRenderFieldAttributes()
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="form-control-label required"]
[@class="required"]
'
);
}
Expand All @@ -98,7 +98,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="my&class form-control-label required"]
[@class="my&class required"]
'
);
}
Expand All @@ -115,7 +115,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="my&class form-control-label required"]
[@class="my&class required"]
[.="[trans]Custom label[/trans]"]
'
);
Expand All @@ -135,7 +135,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
$this->assertMatchesXpath($html,
'/label
[@for="name"]
[@class="my&class form-control-label required"]
[@class="my&class required"]
[.="[trans]Custom label[/trans]"]
'
);
Expand Down
0