From: Jérémy Fabre Date: Thu, 15 Sep 2016 12:07:17 +0000 (+0200) Subject: Fix some block margins X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=27b54731ce0cd7ab6e663bde5cba62e6853793ab;p=mezzo.git Fix some block margins --- diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss index a47d19c8..0b52dd4d 100644 --- a/app/static/src/sass/modules/_page.scss +++ b/app/static/src/sass/modules/_page.scss @@ -79,12 +79,20 @@ $module: ".page"; background-color: $color-main; @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); + } + } &--black { diff --git a/app/templates/core/inc/block.html b/app/templates/core/inc/block.html index 92ed63b1..0a0985f8 100644 --- a/app/templates/core/inc/block.html +++ b/app/templates/core/inc/block.html @@ -1,6 +1,6 @@ {% load i18n mezzanine_tags keyword_tags pages_tags organization_tags %} {% if blocks %} -
+

{% for block in blocks %} {% if not forloop.first and block.with_separator %}