Skip to content

Commit

Permalink
Removed class "row" from form-group. Fixes #168
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Eckerstorfer committed Apr 3, 2014
1 parent 681d1dd commit bcb10b3
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions Resources/views/Form/bootstrap.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
{% set widget_col = widget_col|default(bootstrap_get_widget_col()) %}
{% set label_col = label_col|default(bootstrap_get_label_col()) %}
{% set class = 'col-' ~ col_size ~ '-' ~ widget_col ~ ' col-' ~ col_size ~ '-offset-' ~ label_col %}
<div class="form-group row{% if not form.vars.valid %} has-error{% endif %}">
<div class="form-group {% if not form.vars.valid %} has-error{% endif %}">
<div class="{{ class }}">
{% elseif no_form_group is not defined or no_form_group == false %}
<div class="form-group{% if not form.vars.valid %} has-error{% endif %}">
Expand Down Expand Up @@ -303,7 +303,7 @@
{% set widget_col = widget_col|default(bootstrap_get_widget_col()) %}
{% set label_col = label_col|default(bootstrap_get_label_col()) %}
{% set class = ' col-'~ col_size ~ '-' ~ widget_col ~ ' col-' ~ col_size ~ '-offset-' ~ label_col %}
<div class="form-group row{% if not form.vars.valid %} has-error{% endif %}">
<div class="form-group {% if not form.vars.valid %} has-error{% endif %}">
<div class="{{ class }}">
{% elseif no_form_group is not defined or no_form_group == false %}
<div class="form-group{% if not form.vars.valid %} has-error{% endif %}">
Expand Down Expand Up @@ -585,12 +585,7 @@
{% set label_col = label_col|default(bootstrap_get_label_col()) %}
{% set widget_col = widget_col|default(bootstrap_get_widget_col()) %}

{% set row_class = '' %}
{% if style == 'horizontal' %}
{% set row_class = ' row' %}
{% endif %}

<div class="form-group{{ row_class }}{% if not form.vars.valid %} has-error{% endif %}">
<div class="form-group{% if not form.vars.valid %} has-error{% endif %}">
{% if style == 'horizontal' %}
{{ form_label(form) }}
<div class="col-{{ col_size }}-{{ widget_col }}">
Expand Down

0 comments on commit bcb10b3

Please sign in to comment.