diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass index 78f32cfb6e4ceac519ba52397052c43ccecabfc9..8470195ee92de76179643c94aa39d18ab8b4b636 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 79079be7881881058594a317003ea0c1f0501259..107123ae7f2a572442c8823203770a88c32a1948 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 bf3541613f265817706ad532a314c0e4ceea9197..77ca19f446bd45a98c377cc780d22556fcfb7978 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 9a66396ab61ae68b9faa7ce950d6c0b4bcb2b945..f14c571810e769bf2dcaecf1b3fc156a36ede58e 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">