vertical spacings

assets/sass/_theme/blocks/base.sass

-.blocks
-    .block
-        padding-top: $spacing2
-        padding-bottom: $spacing2
-        // &-with-title
-            // margin-top: $spacing4
-        &:last-of-type
-            padding-bottom: $spacing2
-
 .block
+    padding-top: $spacing3
+    padding-bottom: $spacing3
     // Mobile & full-width
     h2, h3
         @include h2
@@ -19,4 +12,5 @@
     .top
         h2, h3
             + .description
-                margin-top: $spacing2
\ No newline at end of file
+                margin-top: $spacing2
+

assets/sass/_theme/blocks/call_to_action.sass

@@ -88,8 +88,10 @@
                         padding-top: calc(#{$grid-gutter} + #{$spacing3})
   
         @include in-page-without-sidebar
+            background-color: var(--cta-background-color)
+            padding-top: 0
+            padding-bottom: 0
             .block-content
-                background-color: var(--cta-background-color)
                 padding: $spacing4 $grid-gutter
                 margin-left: -$grid-gutter
                 margin-right: -$grid-gutter

assets/sass/_theme/blocks/chapo.sass

+.block-chapo
+    @include in-page-without-sidebar
+        padding-top: 0
+        margin-top: $spacing3
+    @include in-page-with-sidebar
+        padding-top: 0
+    .lead
+        margin-bottom: 0
\ No newline at end of file

assets/sass/_theme/blocks/chapter.sass

@@ -30,6 +30,10 @@
             a
                 @include link($block-chapter-layout-accent-color)
 
+    @include media-breakpoint-down(desktop)
+        &--with-image
+            &.block-chapter--alt_background, &.block-chapter--accent_background
+                padding-top: half($grid-gutter-sm)
     @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             &--alt_background, &--accent_background

assets/sass/_theme/blocks/timeline.sass

@@ -63,7 +63,6 @@
         --min-title-height: 0px
         background: $block-timeline-horizontal-background
         color: $block-timeline-horizontal-color
-        margin-bottom: 8rem
         overflow: hidden
         padding-bottom: $grid-gutter
         padding-top: $grid-gutter

assets/sass/_theme/design-system/grid.sass

-.container
-    @include container
-
-.document-content
-    position: relative
-    @include in-page-with-sidebar
-        .block
-            .block-content
-                @include media-breakpoint-up(desktop)
-                    padding-left: offset(4)
-                // @include media-breakpoint-up(xxl)
-                //     padding-left: offset(5)
-

assets/sass/_theme/design-system/hero.sass

@@ -73,6 +73,8 @@
     //             margin-top: $spacing3
 
     @include media-breakpoint-down(desktop)
+        // &:not(.hero--with-image)
+        //     margin-bottom: 0
         &--with-image
             padding-bottom: 0
         &--image-landscape

assets/sass/_theme/design-system/layout.sass

@@ -30,7 +30,10 @@ body
 
 main
     &:not(.page-with-blocks)
-        padding-bottom: $spacing-section-y
+        padding-bottom: $spacing3
+
+[id]
+    scroll-margin-top: var(--header-height)
 
 .container
     @include container
@@ -38,29 +41,24 @@ main
         margin-top: $spacing3
 
 ul
-    padding-left: px2rem(15)
+    padding-left: $spacing0
+
+.document-content
+    .container > .lead
+        margin-bottom: $spacing3
 
-.document-content, .blocks
-    margin-top: $spacing-section-y
-    > * + *
-        margin-top: $spacing-section-y
-    // > *
-    //     margin-top: $spacing3
-    //     padding-bottom: $spacing3
-    //     &:last-child
-    //         padding-bottom: $spacing4
-    // > *:not(:last-child)
-    //     padding-bottom: $spacing3
-    // > *:last-child
-    //     padding-bottom: $spacing4
-    // section
-    //     * + p
-    //         margin-bottom: 0 // TODO : vérifier les cas particuliers
-    //         margin-top: $spacing1
+// .document-content
+//     margin-top: $spacing-section-y
 
 .document-content
-    > .container:last-of-type
-        margin-bottom: $spacing4
+    position: relative
+    @include in-page-with-sidebar
+        .block
+            .block-content
+                @include media-breakpoint-up(desktop)
+                    padding-left: offset(4)
+    // > .container:last-of-type
+    //     margin-bottom: $spacing4
 
 details
     &:not([open]):hover
@@ -86,6 +84,3 @@ details
         &:hover
             summary::after
                 transform: translateY(-5px)
-
-section
-    scroll-margin-top: var(--header-height)
\ No newline at end of file

assets/sass/_theme/design-system/pagination.sass

@@ -6,7 +6,6 @@
     display: flex
     flex-wrap: wrap
     margin-top: $spacing3
-    margin-bottom: $spacing4
     li
         a
             color: inherit
@@ -37,8 +36,6 @@
 
 .posts-navigation
     border-top: 1px solid $color-border
-    margin-top: $spacing3
-    padding-bottom: $spacing4
     ul
         @include list-reset
         display: flex

assets/sass/_theme/design-system/typography.sass

@@ -112,10 +112,6 @@ h2, .h2
 
 .lead
     @include lead
-    margin-top: 0
-    margin-bottom: $spacing3
-    @include media-breakpoint-up(desktop)
-        margin-bottom: $spacing4
 
 .p,
 .li
@@ -165,8 +161,8 @@ small, .small
 @mixin rich-text
     h1, h2, h3, h4, h5, h6, p
         margin-top: 2em
-    &:first-child, meta + &
-        margin-top: 0
+        &:first-child, meta + &
+            margin-top: 0
 
 .rich-text
     @include rich-text

assets/sass/_theme/hugo-osuny.sass

@@ -19,7 +19,6 @@
 @import "design-system/a11y"
 @import "design-system/breadcrumb"
 @import "design-system/footer"
-@import "design-system/grid"
 @import "design-system/header"
 @import "design-system/hero"
 @import "design-system/image"
@@ -31,6 +30,7 @@
 
 // Blocks
 @import "blocks/base"
+@import "blocks/chapo"
 @import "blocks/datatable"
 @import "blocks/call_to_action"
 @import "blocks/chapter"

assets/sass/_theme/sections/pages.sass

@@ -15,5 +15,3 @@
 .pages__section:not(.full-width)
     .lead
         @include h3
-        @include media-breakpoint-up(desktop)
-            margin-bottom: $spacing3
\ No newline at end of file

assets/sass/_theme/sections/persons.sass

@@ -164,8 +164,6 @@ ol.persons
                 .avatar
                     margin-bottom: 0
                     width: col(3)
-    .lead
-        margin-bottom: $spacing2
     .roles
         a
             @include small

assets/sass/_theme/sections/posts.sass

@@ -54,22 +54,6 @@
             @include grid(2, desktop)
             @include grid($posts-grid-columns, xxl)
 
-.categories__term
-    @if $posts-layout-list
-        @include media-breakpoint-down(desktop)
-            .posts 
-                grid-gap: $spacing3
-                article 
-                    border: none
-                    padding-bottom: 0
-                    margin-bottom: 0
-                    flex-direction: column
-                    div:not(.media)
-                        margin-left: unset
-                        margin-top: $spacing0
-                    .media
-                        width: 100%
-
 .posts__page
     @include media-breakpoint-down(desktop)
         .document-content
@@ -96,8 +80,7 @@
             min-height: 350px
     .lead
         @include h3
-        @include media-breakpoint-up(desktop)
-            margin-bottom: $spacing3
+
 
 .post-categories
     @include list-reset

assets/sass/_theme/sections/programs.sass

@@ -81,11 +81,16 @@ ol.programs
                 font-size: $program-share-font-size-desktop
 
     .document-content
+        @include media-breakpoint-up(desktop)
+            .lead
+                padding: $spacing2 0
         .content
             padding-bottom: $spacing2
-            section > * + *
+            section:not(.block) > * + *
                 margin-top: 1em
             .blocks
+                section > * + *
+                    margin-top: 0
                 h3
                     @include h3
                 @include media-breakpoint-down(desktop)
@@ -97,7 +102,13 @@ ol.programs
                         padding-right: 0
                     .block-content
                         padding-left: 0
-
+    @include media-breakpoint-down(desktop)
+        .document-content
+            .content
+                h2
+                    margin-bottom: $spacing2
+            section:not(:first-child):not(.block)
+                margin-top: $spacing3
     @include media-breakpoint-up(desktop)
         .document-content
             .content
@@ -115,9 +126,8 @@ ol.programs
                     align-self: start
                     grid-column: 1/5
                     margin-bottom: 0
-                section:not(:first-of-type)
+                section:not(:first-child):not(.block)
                     margin-top: $spacing4
-                
             section:first-of-type
                 .content
                     border-top: none

layouts/index.html

@@ -10,7 +10,7 @@
     }}
 
     {{ partial "home/chapo.html" (dict
-        "with_container" true
+        "block_wrapped" true
         "context" .
       ) }}
 

layouts/partials/programs/abstract.html

 {{ if (partial "GetTextFromHTML" .) }}
+<div class="container">
   <p class="lead" itemprop="abstract">
     {{ partial "PrepareHTML" . }}
   </p>
-{{ end }}
+</div>
+{{ end }}
\ No newline at end of file

layouts/partials/programs/single.html

@@ -21,9 +21,7 @@
       <meta itemprop="image" content="{{ $url }}">
     {{- end -}}
   {{- end -}}
-  <div class="container">
-    {{- partial "programs/abstract.html" .Params.presentation -}}
-  </div>
+  {{- partial "programs/abstract.html" .Params.presentation -}}
   {{- partial "programs/presentation.html" . -}}
   {{- partial "programs/children.html" .Pages -}}
   {{- partial "programs/pedagogy.html" . -}}