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

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

Browse Source
This commit is contained in:
Valentin 2018-07-07 15:17:51 +03:00 committed by Nicolas Grekas
parent 601cc0827d
commit cb3e712698
4 changed files with 11 additions and 11 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

@ -187,7 +187,7 @@
{%- set element = 'legend' -%} {%- set element = 'legend' -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%} {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
{%- else -%} {%- 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 -%} {%- endif -%}
{% if required -%} {% if required -%}
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %} {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}

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

@ -23,7 +23,7 @@
"symfony/asset": "~2.8|~3.0|~4.0", "symfony/asset": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~2.8|~3.0|~4.0", "symfony/dependency-injection": "~2.8|~3.0|~4.0",
"symfony/finder": "~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-foundation": "^3.3.11|~4.0",
"symfony/http-kernel": "~3.2|~4.0", "symfony/http-kernel": "~3.2|~4.0",
"symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-intl-icu": "~1.0",
@ -41,7 +41,7 @@
"symfony/workflow": "~3.3|~4.0" "symfony/workflow": "~3.3|~4.0"
}, },
"conflict": { "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" "symfony/console": "<3.4"
}, },
"suggest": { "suggest": {

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

@ -72,7 +72,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@for="name"]
[@class="col-form-label col-sm-2 form-control-label required"] [@class="col-form-label col-sm-2 required"]
' '
); );
} }
@ -89,7 +89,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@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"]
' '
); );
} }
@ -106,7 +106,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@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]"] [.="[trans]Custom label[/trans]"]
' '
); );
@ -126,7 +126,7 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@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]"] [.="[trans]Custom label[/trans]"]
' '
); );

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

@ -81,7 +81,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@for="name"]
[@class="form-control-label required"] [@class="required"]
' '
); );
} }
@ -98,7 +98,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@for="name"]
[@class="my&class form-control-label required"] [@class="my&class required"]
' '
); );
} }
@ -115,7 +115,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@for="name"]
[@class="my&class form-control-label required"] [@class="my&class required"]
[.="[trans]Custom label[/trans]"] [.="[trans]Custom label[/trans]"]
' '
); );
@ -135,7 +135,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
$this->assertMatchesXpath($html, $this->assertMatchesXpath($html,
'/label '/label
[@for="name"] [@for="name"]
[@class="my&class form-control-label required"] [@class="my&class required"]
[.="[trans]Custom label[/trans]"] [.="[trans]Custom label[/trans]"]
' '
); );