From 2bf9e45015acae34beae6a63b498c0a82d43e89f Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Tue, 13 Dec 2022 11:27:34 +0100
Subject: [PATCH] add page chapo / change typo system / add space to dropdown
menus
---
assets/sass/_theme/_configuration.sass | 4 ++--
assets/sass/_theme/design-system/grid.sass | 2 +-
assets/sass/_theme/design-system/nav.sass | 8 ++++----
layouts/pages/list.html | 16 +++++++++++++++-
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index b69d6a60..2c2ababe 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -17,7 +17,7 @@ $link-color: $color-text !default
// TYPOGRAPHY
// Fonts family
-$body-font-family: "Adobe Garamond Pro", "Garamond", "Times New Roman", "Times", serif !default
+$body-font-family: "Baskerville", "Times New Roman", "Times", serif !default
$heading-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif !default
// Base
@@ -155,7 +155,7 @@ $header-color: $color-text !default
$header-hover-color: $color-accent !default // TODO : Réflechir à plus élégant / générique
$header-background: transparent !default
$header-transition: 0.3s !default
-$header-dropdown-full: true !default
+$header-dropdown-full: false !default
$header-dropdown-background: $header-background !default
$header-dropdown-color: $header-color !default
$header-dropdown-transition: $header-transition !default
diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass
index 79079be7..107123ae 100644
--- a/assets/sass/_theme/design-system/grid.sass
+++ b/assets/sass/_theme/design-system/grid.sass
@@ -4,7 +4,7 @@
.document-content
position: relative
@include in-page-with-sidebar
- .blocks
+ .block
.block-content
@include media-breakpoint-up(md)
padding-left: offset(4)
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index bf354161..77ca19f4 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -104,10 +104,10 @@
.dropdown-menu
margin-top: $header-nav-padding-y
min-width: 400px
- padding-bottom: half($spacing0)
- padding-left: $spacing0
- padding-top: half($spacing0)
- padding-right: $spacing0
+ padding-bottom: $spacing0
+ padding-left: $spacing1
+ padding-top: $spacing0
+ padding-right: $spacing1
right: 0
text-align: right
.nav-level-2
diff --git a/layouts/pages/list.html b/layouts/pages/list.html
index 9a66396a..f14c5718 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -2,6 +2,8 @@
{{ partial "pages/hero.html" . }}
<div class="document-content">
+
+ {{/* TOC PART */}}
{{- $category := site.GetPage (printf "/categories%s" .Params.category) -}}
{{- if .Params.blocks }}
{{ $need_aside := false }}
@@ -17,7 +19,19 @@
"context" .
)
}}
- {{ partial "hooks/after-page-hero.html" . }}
+ {{ end }}
+
+ {{ partial "hooks/after-page-hero.html" . }}
+
+ <section class="block block-chapo">
+ <div class="container">
+ <div class="block-content">
+ {{- partial "pages/chapo.html" .Params.description_short -}}
+ </div>
+ </div>
+ </section>
+
+ {{ if .Params.blocks }}
{{ partial "blocks/list.html" . }}
{{ else }}
<section class="block block-pages block-pages--grid">
--
GitLab