From d35553a1e2a27c20edc39d88ff2094f5e5ce4919 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 14 Jul 2021 18:15:14 +0200
Subject: [PATCH] content bloc: fix margins and breakpoints

---
 .../Activity/editAccompanyingCourse.html.twig |  2 +-
 .../views/Activity/editPerson.html.twig       |  2 +-
 .../Activity/newAccompanyingCourse.html.twig  |  2 +-
 .../views/Activity/newPerson.html.twig        |  2 +-
 .../Activity/showAccompanyingCourse.html.twig |  2 +-
 .../views/Activity/showPerson.html.twig       |  2 +-
 .../views/AccompanyingCourse/layout.html.twig |  2 +-
 .../Resources/views/Address/new.html.twig     |  2 +-
 .../views/Household/layout.html.twig          |  2 +-
 .../Resources/views/Person/create.html.twig   |  8 ++++--
 .../views/Person/create_review.html.twig      |  6 +++--
 .../Resources/views/Person/edit.html.twig     |  2 +-
 .../Resources/views/Person/layout.html.twig   |  2 +-
 .../Resources/views/Person/view.html.twig     | 27 +++++++++----------
 14 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index 0289937f0..6160f652e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="activity-edit">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
index ae969573d..34e1e109c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -23,7 +23,7 @@
 {% block personcontent %}
 <div class="activity-edit">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 9c9c3066a..c554131b5 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="activity-new">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index 8ac5bf315..d39091389 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -7,7 +7,7 @@
 {% block personcontent %}
 <div class="activity-new">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index 30c1c0c70..218ed0551 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -9,7 +9,7 @@
 {% block content -%}
 <div class="activity-show">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
             
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 6e32ecb59..c0fb2ea7e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -9,7 +9,7 @@
 {% block personcontent -%}
 <div class="activity-show">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
             
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
index d0c474b05..12a1b90c1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    <div class="mt-3">
+    <div class="mt-5">
         {% block content %}{% endblock %}
     </div>
 {% endblock  %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index b6272d0b6..0770c83a6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -23,7 +23,7 @@
 {% block personcontent %}
 <div class="address-new">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
             
 
     {% block content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
index ff14acc56..e6e8fbd4f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    <div class="mt-3">
+    <div class="mt-5">
         {% block content %}{% endblock %}
     </div>
 {% endblock  %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 517a041d3..9d17cba9d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -19,8 +19,10 @@
 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
     
 {% block content %}
-    <div class="col-12 mt-3" >
-        <div class="col-md-10 offset-md-1">
+<div class="person-new col-12 my-5">
+    <div class="row justify-content-center">
+        
+        <div class="col-md-10 col-xxl">
             {{ form_start(form) }}
             
                 <h1>{{ 'Add a person'|trans }}</h1>
@@ -47,5 +49,7 @@
                 
             {{ form_end(form) }}
         </div>
+        
     </div>
+</div>
 {% endblock content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
index f60d21656..845606f24 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
@@ -19,8 +19,10 @@
 {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
     
 {% block content %}
-    <div class="col-12 parent" >
-        <div class="col-md-10 offset-md-1 parent">
+<div class="person-new col-12 my-5">
+    <div class="row justify-content-center">
+        
+        <div class="col-md-10 col-xxl">
             
             <div class="warning flash_message">
                 <span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 4680991b3..b87b00367 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -23,7 +23,7 @@
 {% block personcontent %}
 <div class="person-edit">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
     
     <h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
index a104d30c6..0d339ec36 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    <div class="mt-3">
+    <div class="mt-5">
         {% block personcontent %}{# block personcontent empty #}{% endblock %}
     </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 8d58c9178..5a1aa94ac 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -38,7 +38,7 @@ This view should receive those arguments:
 {% block personcontent %}
 <div class="person-view">
     <div class="row justify-content-center">
-        <div class="col-md-10">
+        <div class="col-md-10 col-xxl">
 
             <div class="row">
                 {% if person.memo is not empty and chill_person.fields.memo == 'visible' %}
@@ -230,7 +230,7 @@ This view should receive those arguments:
                 </div>
                 {%- endif -%}
             </div>
-        
+            
             {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
             <div class="row">
                 <div class="col-12 custom-fields">
@@ -239,23 +239,22 @@ This view should receive those arguments:
                     </figure>
                 </div>
             </div>
-        
+            
             <div class="row">
                 <figure class="person-details"></figure>
             </div>
             {% endif %}
-    
+            
+            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+            <ul class="sticky-form-buttons record_actions">
+                <li>
+                    <a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
+                        {{ 'Edit'|trans }}
+                    </a>
+                </li>
+            </ul>
+            {% endif %}
         </div>
-        
-        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-        <ul class="col-md-10 sticky-form-buttons record_actions ">
-            <li>
-                <a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
-                   {{ 'Edit'|trans }}
-                </a>
-            </li>
-        </ul>
-        {% endif %}
 
     </div>
 </div>