From 1ba4ec100707b346911f1fa0be478e44cf2d18af Mon Sep 17 00:00:00 2001 From: alexisben <alex@noesya.coop> Date: Thu, 15 Dec 2022 15:15:41 +0100 Subject: [PATCH] footer-spacing --- assets/sass/_theme/blocks/base.sass | 8 +++++--- assets/sass/_theme/blocks/pages.sass | 2 ++ assets/sass/_theme/design-system/footer.sass | 1 - assets/sass/_theme/design-system/layout.sass | 3 +++ assets/sass/_theme/design-system/pagination.sass | 2 ++ layouts/partials/commons/chapo.html | 1 - 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass index 9fe5bbd4..47d5a751 100644 --- a/assets/sass/_theme/blocks/base.sass +++ b/assets/sass/_theme/blocks/base.sass @@ -1,10 +1,12 @@ .blocks .block - margin-top: $spacing1 + margin-top: $spacing4 &:first-of-type margin-top: 0 - &-with-title - margin-top: $spacing4 + // &-with-title + // margin-top: $spacing4 + &:last-of-type + margin-bottom: $spacing4 .block // Mobile & full-width diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass index e79555dc..e6a38d31 100644 --- a/assets/sass/_theme/blocks/pages.sass +++ b/assets/sass/_theme/blocks/pages.sass @@ -70,6 +70,8 @@ background-color: $block-pages-card-background padding-bottom: $grid-gutter padding-top: $grid-gutter + .blocks &:last-of-type + margin-bottom: 0 .cards @include grid(2, md) @include in-page-with-sidebar diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass index 160e0eb8..f755af28 100644 --- a/assets/sass/_theme/design-system/footer.sass +++ b/assets/sass/_theme/design-system/footer.sass @@ -3,7 +3,6 @@ footer[role="contentinfo"] color: $footer-color padding-bottom: $spacing3 padding-top: $spacing3 - margin-top: $spacing4 a color: inherit .logo diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass index efd00d71..4b3f37e7 100644 --- a/assets/sass/_theme/design-system/layout.sass +++ b/assets/sass/_theme/design-system/layout.sass @@ -58,6 +58,9 @@ ul // margin-bottom: 0 // TODO : vérifier les cas particuliers // margin-top: $spacing1 +.document-content + > .container:last-of-type + margin-bottom: $spacing4 details &:not([open]):hover diff --git a/assets/sass/_theme/design-system/pagination.sass b/assets/sass/_theme/design-system/pagination.sass index b13d1474..6210ee77 100644 --- a/assets/sass/_theme/design-system/pagination.sass +++ b/assets/sass/_theme/design-system/pagination.sass @@ -5,6 +5,7 @@ align-items: center display: flex margin-top: $spacing3 + margin-bottom: $spacing4 li a color: inherit @@ -36,6 +37,7 @@ .posts-navigation border-top: 1px solid $color-border margin-top: $spacing3 + margin-bottom: $spacing4 ul @include list-reset display: flex diff --git a/layouts/partials/commons/chapo.html b/layouts/partials/commons/chapo.html index 0e9ed839..ceeb7302 100644 --- a/layouts/partials/commons/chapo.html +++ b/layouts/partials/commons/chapo.html @@ -14,7 +14,6 @@ {{ partial "PrepareHTML" .context.Params.description_short }} </p> - {{- if .block_wrapped -}} </div> </div> -- GitLab