8000 [TwigBridge] Bootstrap 4 form theme fixes by vudaltsov · Pull Request #24703 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[TwigBridge] Bootstrap 4 form theme fixes #24703

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

Closed
wants to merge 2 commits into from
Closed

[TwigBridge] Bootstrap 4 form theme fixes #24703

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4e1b1
Fix unnecessary legend class
vudaltsov Oct 27, 2017
7b8b9d1
Use legends instead of labels for compound fields
vudaltsov Oct 27, 2017
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
7 changes: 4 additions & 3 deletions src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@
{# Labels #}

{% bl 7FB4 ock form_label -%}
{%- if expanded is defined and expanded -%}
{%- if compound is defined and compound -%}
{%- set element = 'legend' -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-legend')|trim}) -%}
{%- else -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
{%- endif -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
{{- parent() -}}
{%- endblock form_label %}

Expand Down Expand Up @@ -107,7 +108,7 @@
{# Rows #}

{% block form_row -%}
{%- if expanded is defined and expanded -%}
{%- if compound is defined and compound -%}
{%- set element = 'fieldset' -%}
{%- endif -%}
<{{ element|default('div') }} class="form-group">
Expand Down
0