Fix the white background on pages

diff --git a/app/templates/pages/departmentpage.html b/app/templates/pages/departmentpage.html
index 277f0b6cd2c01b0bd18998c91edc0138d5eeb1e7..2619c233af921eb6c4b36d2f0f3345eec64b26ac 100644 (file)
--- a/app/templates/pages/departmentpage.html
+++ b/app/templates/pages/departmentpage.html
@@ -69,22 +69,24 @@
 {% block page_related_content %}
     {% if page.departmentpage.department.articles.all %}
         <div class="white-bg pb2">
-            <div class="container">
-                <div class="row tac">
-                    <div class="col-xs-12">
-                        <h2 class="dashed dashed--center">{% trans "Also discover" %}</h2>
-                    </div>
-                </div>
-                <div class="row tac">
-                    {% for article in page.departmentpage.department.articles.all %}
-                        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
-                            {% include 'magazine/article/includes/article_card.html' %}
+            <div class="page__block">
+                <hr />
+                <div class="container">
+                    <div class="row tac">
+                        <div class="col-xs-12">
+                            <h2 class="dashed dashed--center">{% trans "Also discover" %}</h2>
                         </div>
-                    {% endfor %}
+                    </div>
+                    <div class="row tac">
+                        {% for article in page.departmentpage.department.articles.all %}
+                            <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
+                                {% include 'magazine/article/includes/article_card.html' %}
+                            </div>
+                        {% endfor %}
+                    </div>
                 </div>
             </div>
         </div>
-
     {% endif %}
 
 {% endblock %}
@@ -92,8 +94,8 @@
 {% block logo %}
     {% with page.departmentpage.images.all|get_type:'logo' as images %}
         {% if images %}
-            <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
-                <div class="white-bg pb2">
+            <div class="white-bg">
+                <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
                     <div class="container">
                         <div class="row" data-summary-content>
                             <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index 1ec1830138e6a1f90fc12d2a9606cc3f1e918912..40d89fc6fa141d9419c899582752f2ecab08453b 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -106,32 +106,35 @@
             {% endfor %}
         {% endblock %}
 
-        {% block page_person_list %}
-        {% endblock %}
+        <div class="white-bg">
 
-        {% block page_sub_content %}
-            {% with object.blocks.all as blocks %}
-                {% include "core/inc/block.html" %}
-            {% endwith %}
-        {% endblock %}
+            {% block page_person_list %}
+            {% endblock %}
 
-        {% block related_project %}
-        {% endblock %}
+            {% block page_sub_content %}
+                {% with object.blocks.all as blocks %}
+                    {% include "core/inc/block.html" %}
+                {% endwith %}
+            {% endblock %}
 
-        {% block products %}
-        {% endblock %}
+            {% block related_project %}
+            {% endblock %}
 
-        {% block logo %}
-        {% endblock %}
-    </div>
+            {% block products %}
+            {% endblock %}
 
-    <div>
+            {% block logo %}
+            {% endblock %}
+
+            {% block page_related_content %}
+                {% with page.dynamic_content_pages.all as dynamic_content %}
+                    {% include "core/inc/related_content.html" %}
+                {% endwith %}
+            {% endblock %}
+
+        </div>
 
-        {% block page_related_content %}
-            {% with page.dynamic_content_pages.all as dynamic_content %}
-                {% include "core/inc/related_content.html" %}
-            {% endwith %}
-        {% endblock %}
     </div>
 
+
 {% endblock %}