From 195437bc5e0202ebe01cd17c41435a9c4bd6eaa3 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Tue, 15 Nov 2022 11:32:38 +0100
Subject: [PATCH] fix offset cols

---
 assets/sass/_theme/blocks/call_to_action.sass | 12 +++---------
 assets/sass/_theme/blocks/testimonials.sass   |  2 +-
 assets/sass/_theme/blocks/timeline.sass       |  2 +-
 assets/sass/_theme/design-system/footer.sass  |  1 +
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index ed9944f0..c1904c15 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -54,7 +54,7 @@
     @include in-page-without-aside
         .block-content
             background-color: $block-call-to-action-background
-            padding: $grid-gutter-sm
+            padding: offset(1)
         .call_to_action--with-image
             @include media-breakpoint-down(md)
                 display: flex
@@ -62,20 +62,14 @@
                 > *
                     order: 2
                 picture
-                    margin-bottom: col(1)
+                    margin-bottom: offset(1)
                     order: 1
             @include media-breakpoint-up(md)
-                // @include make-row
                 @include grid(2, md)
                 align-items: center
-                > *
-                    // @include make-col-ready
                 > div
-                    // @include make-col(6)
                     > *
-                        margin-right: col(1, 5)
-                picture
-                    // @include make-col(6)
+                        margin-right: offset(1, 5) // ???
                 div + div
                     a
                         margin-right: 1rem
diff --git a/assets/sass/_theme/blocks/testimonials.sass b/assets/sass/_theme/blocks/testimonials.sass
index 50b13401..79028ac1 100644
--- a/assets/sass/_theme/blocks/testimonials.sass
+++ b/assets/sass/_theme/blocks/testimonials.sass
@@ -92,7 +92,7 @@
     @include in-page-without-aside
         .testimonials
             @include media-breakpoint-up(md)
-                padding-right: calc(#{col(4)} + #{$grid-gutter})
+                padding-right: offset(4)
 
         // TODO : en discuter en créa
         // figure
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index beb8bb2c..5bc746d8 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/assets/sass/_theme/blocks/timeline.sass
@@ -105,7 +105,7 @@
 
     @include media-breakpoint-up(md)
         .timeline
-            padding-left: calc(#{col(5)} + #{$grid-gutter})
+            padding-left: offset(5)
 
     @include media-breakpoint-down(md)
         .events
diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass
index e4fb5d7e..ed68da17 100644
--- a/assets/sass/_theme/design-system/footer.sass
+++ b/assets/sass/_theme/design-system/footer.sass
@@ -3,6 +3,7 @@ footer[role="contentinfo"]
     color: $footer-color
     padding-bottom: $spacing3
     padding-top: $spacing3
+    margin-top: $spacing4
     address
         font-size: px2rem(14)
         line-height: px2rem(26)
-- 
GitLab