heading spacing

assets/sass/_theme/_variables.sass

@@ -161,13 +161,16 @@
     --grid-gutter-negative: #{-$grid-gutter-xxl}
 
   // -------------- //
-  //     MARGIN     //
+  //     HEADING    //
   // ---------------//
+
   --heading-margin-top: #{$heading-margin-top}
   --heading-margin-bottom: #{$heading-margin-bottom}
-  @include in-page-with-sidebar
-    --heading-margin-top: #{ $heading-margin-top-with-sidebar}
-    --heading-margin-bottom: #{$heading-margin-bottom-with-sidebar}
-  @include in-page-without-sidebar
-    --heading-margin-top: #{ $heading-margin-top-desktop}
-    --heading-margin-bottom: #{$heading-margin-bottom-desktop}
+  // In page without sidebar
+  @include media-breakpoint-up(desktop)
+    body:not(.full-width)
+      --heading-margin-top: #{ $heading-margin-top-with-sidebar}
+      --heading-margin-bottom: #{$heading-margin-bottom-with-sidebar}
+    main > .blocks, body.full-width
+      --heading-margin-top: #{ $heading-margin-top-desktop}
+      --heading-margin-bottom: #{$heading-margin-bottom-desktop}

assets/sass/_theme/configuration/blocks.sass

 // HEADING
-
 // Under desktop breakpoint
 $heading-margin-top: $spacing-4 !default
-$heading-margin-bottom: 0 !default
+$heading-margin-bottom: $spacing-2 !default
 // Upper desktop breakpoint without sidebar 
 $heading-margin-top-desktop: $spacing-6 !default
-$heading-margin-bottom-desktop: $heading-margin-bottom !default
+$heading-margin-bottom-desktop: $spacing-3 !default
 // Upper desktop breakpoint with sidebar 
-$heading-margin-top-with-sidebar: $spacing-5 !default
-$heading-margin-bottom-with-sidebar: $heading-margin-bottom !default
+$heading-margin-top-with-sidebar: $spacing-6 !default
+$heading-margin-bottom-with-sidebar: $spacing-3 !default
 
 // BLOCKS
 // Base

assets/sass/_theme/configuration/components.sass

-
 // Button
 $btn-font-family: $heading-font-family !default
 $btn-font-size: $meta-size !default

assets/sass/_theme/configuration/icons.sass

-
 // Icons
 $icons: ()
 $icons: map-merge($icons, ("arrow": "\ff01"))

assets/sass/_theme/configuration/sections.sass

-
 // Sections
 $article-media-aspect-ratio: 2 !default
 
@@ -22,5 +21,3 @@ $project-infos-color-accent: $color-accent !default
 $program-essential-font-size: $meta-size !default
 $program-essential-font-size-desktop: $meta-size-desktop !default
 $program-zindex-toc: $zindex-toc !default
-
-// MISC
\ No newline at end of file

assets/sass/_theme/configuration/typography.sass

 // TYPOGRAPHY
-
 // Fonts family
 $body-font-family: "Baskerville", "Times New Roman", "Times", serif !default
 $heading-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif !default