Skip to content

Commit

Permalink
Merge branch '2.8' into 3.0
Browse files Browse the repository at this point in the history
* 2.8:
  [Console] remove readline support
  [Routing] added a suggestion to add the HttpFoundation component.
  [travis] Add some comments
  changed operator from and to &&
  Fixed the Bootstrap form theme for inlined checkbox/radio
  • Loading branch information
nicolas-grekas committed Feb 4, 2016
2 parents 9f25144 + 92830d8 commit 7535f67
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Resources/views/Form/bootstrap_3_layout.html.twig
Expand Up @@ -115,7 +115,7 @@
{%- endblock choice_widget_expanded %}

{% block checkbox_widget -%}
{% set parent_label_class = parent_label_class|default('') -%}
{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
{% if 'checkbox-inline' in parent_label_class %}
{{- form_label(form, null, { widget: parent() }) -}}
{% else -%}
Expand All @@ -126,7 +126,7 @@
{%- endblock checkbox_widget %}

{% block radio_widget -%}
{%- set parent_label_class = parent_label_class|default('') -%}
{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
{% if 'radio-inline' in parent_label_class %}
{{- form_label(form, null, { widget: parent() }) -}}
{% else -%}
Expand Down

0 comments on commit 7535f67

Please sign in to comment.