diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 2669479499655ac7862c51d0761886f804804386..67aa545c199fefb90c60615a3a3dfa7d74f3026d 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -12,7 +12,9 @@
.top
h2, h3
+ .description
- margin-top: $spacing2
+ margin-top: $spacing1
+ @include media-breakpoint-up(desktop)
+ margin-top: $spacing2
// Specific
$backgrounded_blocks: ".block-call_to_action, .block-chapter--accent_background, .block-chapter--alt_background, .block-timeline--horizontal, .block-pages--cards"
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 9ef5f3a5f3ecf87ea9a4402de4248f0e6f28f12b..53298a0a078b96367d4c2298b52847dc20966b93 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -19,7 +19,7 @@
aspect-ratio: 16/9
object-fit: cover
width: 100%
- h1
+ h3
@include h3
a
text-decoration: none
@@ -33,7 +33,7 @@
@include media-breakpoint-down(desktop)
.top
- h2, h3
+ h2
@include h5
.description
@include h2
@@ -44,7 +44,7 @@
@include media-breakpoint-up(desktop)
.top
@include grid
- h2, h3
+ h2
grid-column: 1 / 5
a
text-decoration: none
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index 472ef37d30d42da2014c4451ce832b2ca387a9c4..1197ee05232cfe37b89972fb0575789d2dded4a1 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/assets/sass/_theme/blocks/timeline.sass
@@ -111,8 +111,9 @@
width: 50%
.title
+ display: block
min-height: var(--min-title-height)
- margin-bottom: $spacing1
+ padding-bottom: $spacing1
@include signature
.description
@include small
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 0c080965a1dcb939456573a7ffa30caf5d01fa7d..19b8db695408f11ecc135b2b30ebb8a4d8521b01 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -1,7 +1,7 @@
.organization
@include article
position: relative
- h1
+ h2
@include meta
a
@include stretched-link
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 352fdb7e4df9c61e2e96e4a3a3c5a616f4ccf6dd..cbf241a8a7dc8909b72717475a7cdc564ac7648e 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -28,7 +28,7 @@
margin-bottom: $spacing1
padding-bottom: $spacing1
flex-direction: row
- h1 + p
+ h2 + p, h3 + p
margin-top: $spacing0
@include media-breakpoint-up(desktop)
@include grid
@@ -58,7 +58,7 @@
right: 0
top: 0
div:not(.media)
- h1, h2, h3,
+ h2, h3,
p
max-width: col(6, 9)
.posts--grid
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index f3fc2944807e0aadd0e61839dcfb0b3d520a09a6..cee274383e3067218ae558e0e20fd35185d16c94 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -103,11 +103,13 @@ ol.programs
.blocks
section > * + *
margin-top: 0
- h3
+ h2
@include h3
@include media-breakpoint-down(desktop)
+ padding-top: $spacing3
margin-left: half(-$grid-gutter-sm)
margin-right: half(-$grid-gutter-sm)
+
@include media-breakpoint-up(desktop)
.container
padding-left: 0
@@ -117,7 +119,7 @@ ol.programs
@include media-breakpoint-down(desktop)
.document-content
.content
- h2
+ > h2
margin-bottom: $spacing2
section:not(:first-child):not(.block)
margin-top: $spacing3
diff --git a/layouts/partials/blocks/templates/image.html b/layouts/partials/blocks/templates/image.html
index a43230f2ed1cf2403fca09e15b0b4dbc195fddc0..2bc4ef561c90b319677aa6348178501b123eeada 100644
--- a/layouts/partials/blocks/templates/image.html
+++ b/layouts/partials/blocks/templates/image.html
@@ -14,7 +14,9 @@
{{- if not $title -}}
{{ partial "blocks/default_title.html" $template }}
{{ else }}
- <h2>{{ partial "PrepareHTML" $title }}</h2>
+ <div class="top">
+ <h2>{{ partial "PrepareHTML" $title }}</h2>
+ </div>
{{ end -}}
{{- with .image -}}
diff --git a/layouts/partials/blocks/templates/partners.html b/layouts/partials/blocks/templates/partners.html
index 21c3c954785d8bbf75b8db4ed7ae3f347a2a7b25..20ce1f6c01183be94956f2b12f22242848de2fe3 100644
--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -33,7 +33,7 @@
{{ if .name }}
<div>
{{ $title = partial "PrepareHTML" .name -}}
- <h1>
+ <h3>
{{- if .url }}
<a href="{{ .url }}" title="{{ safeHTML (i18n "commons.link.blank_aria" (dict "Title" $title)) }}">
{{ end }}
@@ -41,7 +41,7 @@
{{ if .url }}
</a>
{{ end -}}
- </h1>
+ </h3>
</div>
{{ end -}}
<div class="media">
diff --git a/layouts/partials/blocks/templates/timeline/vertical.html b/layouts/partials/blocks/templates/timeline/vertical.html
index f8205582b65d4cfc0babd8d537dc6f15c1dabf0f..0d465e692ebc4f1141ccba0419a1a2aa52a4cddb 100644
--- a/layouts/partials/blocks/templates/timeline/vertical.html
+++ b/layouts/partials/blocks/templates/timeline/vertical.html
@@ -12,7 +12,7 @@
{{ range .events -}}
<article class="event">
{{ if .title }}
- <h1 class="event-title">{{ partial "PrepareHTML" .title }}</h1>
+ <h3 class="event-title">{{ partial "PrepareHTML" .title }}</h3>
{{ end }}
{{ if .text }}
<p>{{ partial "PrepareText" .text }}</p>
diff --git a/layouts/partials/organizations/organization.html b/layouts/partials/organizations/organization.html
index e434c3d8633d8fbf5dcbf541bf5d8dae7a6a5bcb..a82c6cc2991269d6327df5c96d3137d61d2d24e0 100644
--- a/layouts/partials/organizations/organization.html
+++ b/layouts/partials/organizations/organization.html
@@ -1,7 +1,7 @@
<article class="organization">
<div>
{{ $title := partial "PrepareHTML" .Title }}
- <h1><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h1>
+ <h2><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h2>
</div>
<div class="media">
{{- if .Params.logo -}}
diff --git a/layouts/partials/programs/program.html b/layouts/partials/programs/program.html
index 45e780431772043dd71f792a40f84b8fa894ff55..caa4fd805e6724997644b30253e191658b4eb909 100644
--- a/layouts/partials/programs/program.html
+++ b/layouts/partials/programs/program.html
@@ -1,11 +1,11 @@
{{- $title := partial "PrepareHTML" .Title -}}
<article class="program">
<div>
- <h1>
+ <h2>
<a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
{{- $title -}}
</a>
- </h1>
+ </h2>
{{ if (partial "GetTextFromHTML" .Params.presentation) }}
<p>{{- partial "PrepareHTML" .Params.presentation -}}</p>
{{ end }}