From: Jérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Date: Wed, 14 Sep 2016 16:22:33 +0000 (+0200)
Subject: Fix the black page block style
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b5ff77f6d641bfa7a51d4563aceaa8f87864fbe4;p=mezzo.git

Fix the black page block style
---

diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss
index 3234b26e..df2520ab 100644
--- a/app/static/src/sass/modules/_page.scss
+++ b/app/static/src/sass/modules/_page.scss
@@ -81,12 +81,20 @@ $module: ".page";
             color: white;
             @include padding-top(2);
             @include padding-bottom(2);
-            @include margin(2 0);
+            @include margin(2 0 0 0);
 
             h2:first-child {
                 margin-top: 0;
             }
 
+            & + hr {
+                margin-top: 1px;
+            }
+
+            & + .page__block {
+                @include margin-top(2);
+            }
+
         }
 
         &--red {
diff --git a/app/templates/core/inc/block.html b/app/templates/core/inc/block.html
index 8883640f..92ed63b1 100644
--- a/app/templates/core/inc/block.html
+++ b/app/templates/core/inc/block.html
@@ -3,13 +3,13 @@
     <div class="white-bg pb2 ">
         <hr class="mt0" />
         {% for block in blocks %}
+            {% if not forloop.first and block.with_separator %}
+                <hr />
+            {% endif %}
             <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">
-                            {% if not forloop.first and block.with_separator %}
-                                <hr />
-                            {% endif %}
                             <h2 class="dotted">{{ block.title }}</h2>
                             {% if block.content %}
                                  {{ block.content|richtext_filters|safe }}