diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 0ad079301f75432a4e5f6a8c8e48d7e2140951b9..9267e3763f9c0d7af25dcdf466833c241737158d 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -1,13 +1,6 @@
-.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
+
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index 8624134c6933433ba14ce5782320a1c42fa2e89a..ed23d4136863d8d12e751450a5005a9879d276df 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/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
diff --git a/assets/sass/_theme/blocks/chapo.sass b/assets/sass/_theme/blocks/chapo.sass
new file mode 100644
index 0000000000000000000000000000000000000000..a5d9f80b138fde53a74be91548bdb26532d1bc7a
--- /dev/null
+++ b/assets/sass/_theme/blocks/chapo.sass
@@ -0,0 +1,8 @@
+.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
diff --git a/assets/sass/_theme/blocks/chapter.sass b/assets/sass/_theme/blocks/chapter.sass
index 371aecf781a1500179aa2c6c440862998adf42ec..9dcf2b3a954b542b31c9438fd651a06b79086627 100644
--- a/assets/sass/_theme/blocks/chapter.sass
+++ b/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
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index 66d898705299058c64d9f62f51833bb7ecd8d07f..ef43b1909cdb90f8eccf5a2847d3901e2a1f3f44 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/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
diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass
deleted file mode 100644
index ed1fe7577d8538dd3bdef16ae7370b35a265fe23..0000000000000000000000000000000000000000
--- a/assets/sass/_theme/design-system/grid.sass
+++ /dev/null
@@ -1,13 +0,0 @@
-.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)
-
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index fa27327656cc8b998299014f6ce36edfc08767bc..71761d0886d128c9385d122a375fd1a7ea7b3dad 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/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
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 9521632baf66eacd037af80897b65d1442f01b0a..4aa0298b2d5845e62a0e496c7974984464dcc1d4 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/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
diff --git a/assets/sass/_theme/design-system/pagination.sass b/assets/sass/_theme/design-system/pagination.sass
index f289963451108bf700bf0782d7596a004d26215b..420b97346d6245bd298dae5d2d5f6d8fe585466f 100644
--- a/assets/sass/_theme/design-system/pagination.sass
+++ b/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
diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass
index d7b8823d115ed986ef0cc55c743c4af130534ba8..1b7d93a3a4a8ee47a3c26855e56378bfee4729aa 100644
--- a/assets/sass/_theme/design-system/typography.sass
+++ b/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
diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass
index 5a7c24685ef9bc7e4a868b3e79fc9b3f8c7352be..1934d92e285795de283404c6c5af28cc09b8ff03 100644
--- a/assets/sass/_theme/hugo-osuny.sass
+++ b/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"
diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass
index cdd936ecd13560909a7189a85b854de9c73094be..2d809210cce3fe18066cfc81843b4b9b82608825 100644
--- a/assets/sass/_theme/sections/pages.sass
+++ b/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
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index 3f4ba036a27fade7c8bbf2c31f731904a43d2713..7cb0c9054609f6d94bc8054ef90170fd1903d4ae 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/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
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 033c350ee98a8ddf4e86cf8f794683489f4a09ae..a27d3c481d645b67a17ea63f1b0e5d1c0924624d 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/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
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 29d11181c20e261154e1640f28fd47700d42a7da..ae336f95d17b47802fe14f32add20bd0efb2954c 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/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
diff --git a/layouts/index.html b/layouts/index.html
index 051db4d7498444ee03e477f59e76339204ddcb78..e9b336ea4f2c1ce5b55d2c6eacbaec1f788c9618 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -10,7 +10,7 @@
}}
{{ partial "home/chapo.html" (dict
- "with_container" true
+ "block_wrapped" true
"context" .
) }}
diff --git a/layouts/partials/programs/abstract.html b/layouts/partials/programs/abstract.html
index 7ce21617fb7574f5550435b9ae5d94db472e3689..3e0d225b3957a4b4ea4ec12f2f3c40c03c7ad87a 100644
--- a/layouts/partials/programs/abstract.html
+++ b/layouts/partials/programs/abstract.html
@@ -1,5 +1,7 @@
{{ if (partial "GetTextFromHTML" .) }}
+<div class="container">
<p class="lead" itemprop="abstract">
{{ partial "PrepareHTML" . }}
</p>
-{{ end }}
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/programs/single.html b/layouts/partials/programs/single.html
index 52e6dce70d13339c62f2b968be6e2a83c1dedc69..5248c78232f5f47352dbddbae63ee24f85f6106e 100644
--- a/layouts/partials/programs/single.html
+++ b/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" . -}}