From 5b76bb0c4fc1964f7a50470b272c11886b6ba776 Mon Sep 17 00:00:00 2001
From: Daan De Deckere <daan@sumocoders.be>
Date: Mon, 21 Mar 2016 17:37:28 +0100
Subject: [PATCH] Don't put collection-items in a form-group because this
 messes up the margins

---
 .../Resources/assets/sass/plugins/_collections.scss           | 4 +---
 .../FrameworkCoreBundle/Resources/views/Form/fields.html.twig | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/plugins/_collections.scss b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/plugins/_collections.scss
index 0ad6b25..82b0cfb 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/plugins/_collections.scss
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/plugins/_collections.scss
@@ -3,10 +3,8 @@
 }
 
 .collection-item {
-  @extend .row;
+  @include clearfix;
   @extend .well;
   @extend .well-sm;
   margin-bottom: $font-size-base * .7;
-  margin-left: 0;
-  margin-right: 0;
 }
diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/views/Form/fields.html.twig b/src/SumoCoders/FrameworkCoreBundle/Resources/views/Form/fields.html.twig
index 742bef6..b925bfb 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/views/Form/fields.html.twig
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/views/Form/fields.html.twig
@@ -197,7 +197,7 @@
       {% set widget_form_group_attr = widget_form_group_attr|merge({'class': widget_form_group_attr.class|default('row') ~ ' ' ~ attr.class}) %}
     {% endif %}
     {# collection item adds class {form_id}_form-group  too #}
-    {% set widget_form_group_attr = widget_form_group_attr|merge({'id': 'collection' ~ id ~ '_form_group', 'class': widget_form_group_attr.class ~ ' collection-items ' ~ id ~ '_form_group'}) %}
+    {% set widget_form_group_attr = widget_form_group_attr|merge({'id': 'collection' ~ id ~ '_form_group', 'class': 'collection-items ' ~ id ~ '_form_group'}) %}
 
     <div {% for attrname,attrvalue in widget_form_group_attr %} {{attrname}}="{{attrvalue}}"{% endfor %}>
       {# Add initial prototype form #}