Changed tab styles to use the grid

Resources/views/CRUD/base_edit_form.html.twig

@@ -39,7 +39,7 @@
                             <div class="tab-content">
                                 {% for code, form_tab in admin.formtabs %}
                                     <div class="tab-pane fade{% if loop.first %} in active{% endif %}" id="tab_{{ loop.index }}">
-                                        <div class="box-body">
+                                        <div class="box-body  container-fluid">
                                             <div class="sonata-ba-collapsed-fields">
                                                 {% if form_tab.description != false %}
                                                     <p>{{ form_tab.description|raw }}</p>

Resources/views/CRUD/base_edit_form_macro.html.twig

@@ -7,6 +7,22 @@
 
     {% for code in groups %}
         {% set form_group = admin.formgroups[code] %}
+<<<<<<< HEAD
+=======
+        <div class="col-md-12 {{ form_group.class }}">
+            <div class="box box-success">
+                <div class="box-header">
+                    <h4 class="box-title">
+                        {{ admin.trans(form_group.name, {}, form_group.translation_domain) }}
+                    </h4>
+                </div>
+                {#<div class="box{% if loop.first %} in{% endif %}" id="{{ admin.uniqid }}_{{ loop.index }}">#}
+                <div class="box-body">
+                    <div class="sonata-ba-collapsed-fields">
+                        {% if form_group.description != false %}
+                            <p>{{ form_group.description|raw }}</p>
+                        {% endif %}
+>>>>>>> Changed tab styles to use the grid
 
         {# Manage calculation to determinate if a new row is necessary #}
         {% set group_class = form_group.class | default('col-md-12') %}