From 7a75176aa8a5b2440f7a74c755e6ba2ff8a01cc2 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Tue, 2 Apr 2024 12:29:52 +0200
Subject: [PATCH] heading spacing
---
assets/sass/_theme/_variables.sass | 17 ++++++++++-------
assets/sass/_theme/configuration/blocks.sass | 9 ++++-----
.../sass/_theme/configuration/components.sass | 1 -
assets/sass/_theme/configuration/icons.sass | 1 -
assets/sass/_theme/configuration/sections.sass | 3 ---
.../sass/_theme/configuration/typography.sass | 1 -
6 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/assets/sass/_theme/_variables.sass b/assets/sass/_theme/_variables.sass
index 5f9e94a1..c085e5cd 100644
--- a/assets/sass/_theme/_variables.sass
+++ b/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}
diff --git a/assets/sass/_theme/configuration/blocks.sass b/assets/sass/_theme/configuration/blocks.sass
index b2ae6034..25331466 100644
--- a/assets/sass/_theme/configuration/blocks.sass
+++ b/assets/sass/_theme/configuration/blocks.sass
@@ -1,14 +1,13 @@
// 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
diff --git a/assets/sass/_theme/configuration/components.sass b/assets/sass/_theme/configuration/components.sass
index 62289c62..4d77d7bc 100644
--- a/assets/sass/_theme/configuration/components.sass
+++ b/assets/sass/_theme/configuration/components.sass
@@ -1,4 +1,3 @@
-
// Button
$btn-font-family: $heading-font-family !default
$btn-font-size: $meta-size !default
diff --git a/assets/sass/_theme/configuration/icons.sass b/assets/sass/_theme/configuration/icons.sass
index 5076bf49..0a0f0fc8 100644
--- a/assets/sass/_theme/configuration/icons.sass
+++ b/assets/sass/_theme/configuration/icons.sass
@@ -1,4 +1,3 @@
-
// Icons
$icons: ()
$icons: map-merge($icons, ("arrow": "\ff01"))
diff --git a/assets/sass/_theme/configuration/sections.sass b/assets/sass/_theme/configuration/sections.sass
index 3e927be1..02d16519 100644
--- a/assets/sass/_theme/configuration/sections.sass
+++ b/assets/sass/_theme/configuration/sections.sass
@@ -1,4 +1,3 @@
-
// 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
diff --git a/assets/sass/_theme/configuration/typography.sass b/assets/sass/_theme/configuration/typography.sass
index 7425b17a..c43edc02 100644
--- a/assets/sass/_theme/configuration/typography.sass
+++ b/assets/sass/_theme/configuration/typography.sass
@@ -1,5 +1,4 @@
// TYPOGRAPHY
-
// Fonts family
$body-font-family: "Baskerville", "Times New Roman", "Times", serif !default
$heading-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif !default
--
GitLab