diff --git a/assets/js/theme/design-system/toc.js b/assets/js/theme/design-system/toc.js
index 50a9f797ea4352486a17aaa494afc0745a130329..233156befef836edd550df532dd67abf4e655780 100644
--- a/assets/js/theme/design-system/toc.js
+++ b/assets/js/theme/design-system/toc.js
@@ -21,11 +21,12 @@ class TableOfContents {
this.state = {
opened: false,
currentId: null,
- currentLink: 0
+ currentLink: 0,
+ isOffcanvas : this.isOffcanvas()
}
this.listen();
- if (this.isOffcanvas) {
+ if (this.state.isOffcanvas) {
this.element.setAttribute("aria-hidden", true);
}
}
@@ -124,10 +125,10 @@ class TableOfContents {
}
}
updateScrollspy(scroll) {
- const container = this.isOffcanvas() ? this.nav : this.content;
- if (this.state.currentLink) {
+ const container = this.state.isOffcanvas ? this.nav : this.content;
+ if (this.state.currentLink && scroll > window.innerHeight) {
let progress = (this.getAbsoluteOffsetTop(this.state.currentLink) - container.offsetHeight/2);
- progress = this.isOffcanvas() ? progress : progress - scroll;
+ progress = this.state.isOffcanvas ? progress : progress - scroll;
container.scrollTo({
top: progress
})
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 9a7b55c80d7611cca3dc2823abc006dd8e48a33b..030967901dbd19a46277f4530b8639fe42d8ae2c 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -120,11 +120,6 @@ $btn-padding-x: px2rem(20) !default
$btn-padding-y: px2rem(13) !default
$btn-border-radius: px2rem(4) !default
-// Breadcrumb
-$breadcrumb-below-h1: false !default // NOT READY YET!
-$breadcrumb-color: $color-text !default
-$breadcrumb-icon: "caret-right" !default
-$breadcrumb-icon-color: $color-text-alt !default
// Spacing
$spacing0: px2rem(12) !default
@@ -188,6 +183,12 @@ $hero-height-desktop: 400px !default
$hero-color: $color-text !default
$hero-background-color: $color-background-alt !default
+// Breadcrumb
+$breadcrumb-below-h1: false !default // NOT READY YET!
+$breadcrumb-color: $hero-color !default
+$breadcrumb-icon: "caret-right" !default
+$breadcrumb-icon-color: $color-text-alt !default
+
// Icons
$icons: ()
$icons: map-merge($icons, ("arrow": "\e905"))
@@ -248,6 +249,12 @@ $block-call-to-action-color: $color-background !default
$block-call-to-action-button-background: $color-background !default
$block-call-to-action-button-color: $color-text !default
+// Block chapter
+$block-chapter-layout-accent-background: $color-accent !default
+$block-chapter-layout-accent-color: white !default
+$block-chapter-layout-alt-background: $color-background-alt !default
+$block-chapter-layout-alt-color: black !default
+
// Block definitions
$block-definition-border-color: $color-border !default
$block-definition-border-color-hovered: $color-accent !default
diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 47d5a7510ef9a1c7d5b7bd03f3f561ea0b568270..9267e3763f9c0d7af25dcdf466833c241737158d 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -1,14 +1,6 @@
-.blocks
- .block
- margin-top: $spacing4
- &:first-of-type
- margin-top: 0
- // &-with-title
- // margin-top: $spacing4
- &:last-of-type
- margin-bottom: $spacing4
-
.block
+ padding-top: $spacing3
+ padding-bottom: $spacing3
// Mobile & full-width
h2, h3
@include h2
@@ -16,4 +8,9 @@
@include media-breakpoint-up(desktop)
@include in-page-without-sidebar
h2, h3
- @include h5
\ No newline at end of file
+ @include h5
+ .top
+ h2, h3
+ + .description
+ 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 d64c33776a094a77f97828fe54d3de03c14992b3..9dcf2b3a954b542b31c9438fd651a06b79086627 100644
--- a/assets/sass/_theme/blocks/chapter.sass
+++ b/assets/sass/_theme/blocks/chapter.sass
@@ -10,22 +10,49 @@
figcaption
@include small
margin-top: 0.5rem
- .block-content
+ .chapter
flex-direction: column
display: flex
- .chapter
+ .text
order: 2
figure
margin-bottom: $spacing1
+ &--alt_background
+ background: $block-chapter-layout-alt-background
+ .block-content
+ color: $block-chapter-layout-alt-color
+ a
+ @include link($block-chapter-layout-accent-color)
+ &--accent_background
+ background: $block-chapter-layout-accent-background
+ .block-content
+ color: $block-chapter-layout-accent-color
+ 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
- picture
- margin-top: $spacing1
+ &--alt_background, &--accent_background
+ background: none
+ .chapter .text
+ padding: $grid-gutter col(1, 8)
+ figcaption
+ padding: 0 col(1, 8)
+ &--alt_background
+ .chapter
+ background: $block-chapter-layout-alt-background
+ &--accent_background
+ .chapter
+ background: $block-chapter-layout-accent-background
@include in-page-without-sidebar
- .block-content
+ .chapter
flex-direction: row
align-items: center
- .chapter
+ .text
order: 0
width: col(7)
figure
@@ -34,4 +61,4 @@
margin-bottom: 0
@include in-page-with-or-without-sidebar
h2, h3
- @include h2
\ No newline at end of file
+ @include h2
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 f675deddf7eb46c9203f8d884eaa431a36b652f3..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
- margin-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 90b4a1bbdeef7107df4ab0b8e3ca75f6fb0d0c0e..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,12 +161,16 @@ 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
+figcaption
+ a
+ color: inherit
+
@mixin inherit-text
font-family: inherit
font-weight: inherit
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/pages/list.html b/layouts/pages/list.html
index 919a013aed297f61bd14ac8a1246eda4fe60b73c..3a0bf4f3992b70f9cf57350918b919e52f012885 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -5,13 +5,35 @@
{{/* TOC PART */}}
{{- $category := site.GetPage (printf "/categories%s" .Params.category) -}}
- {{- if .Params.blocks }}
- {{ $need_aside := false }}
- {{ range .Params.blocks }}
- {{ if .title }}
- {{ $need_aside = true }}
- {{ end }}
- {{ end }}
+ {{- $show_aside := false -}}
+
+ {{- $has_blocks := false -}}
+ {{- range .Params.blocks -}}
+ {{- $has_blocks = true -}}
+ {{- if .title -}}
+ {{- $show_aside = true -}}
+ {{- end -}}
+ {{- end -}}
+
+ {{- if .Pages -}}
+ {{- if eq $has_blocks false -}}
+ {{- $show_aside = true -}}
+ {{- end -}}
+ {{- end -}}
+
+ {{- if .Content -}}
+ {{- if eq $has_blocks false -}}
+ {{- $show_aside = true -}}
+ {{- end -}}
+ {{- end -}}
+
+ {{- if $category -}}
+ {{- if eq $has_blocks false -}}
+ {{- $show_aside = true -}}
+ {{- end -}}
+ {{- end -}}
+
+ {{- if $show_aside }}
{{ partial "toc/container.html"
(dict
"category" $category
diff --git a/layouts/partials/blocks/templates/chapter.html b/layouts/partials/blocks/templates/chapter.html
index 991d7028c372ac2d2f852c36fec846f9483e9db9..b8075a6f16055b4401f3b5e98036e9ded106051d 100644
--- a/layouts/partials/blocks/templates/chapter.html
+++ b/layouts/partials/blocks/templates/chapter.html
@@ -1,49 +1,55 @@
{{- $context := .context -}}
{{- $position := .block.position -}}
{{- $title := .block.title -}}
+{{- $layout := .block.data.layout | default "no_background" -}}
{{- $class := "block block-chapter" -}}
{{- with .block.data -}}
{{ if .image }}
{{- $class = printf "%s block-chapter--with-image" $class -}}
{{ end }}
+ {{- $layout_class := printf "block-chapter--%s" $layout -}}
+ {{- $class = printf "%s %s" $class $layout_class -}}
+
<section class="{{ $class }}{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
<div class="container">
<div class="block-content">
-
+
<div class="chapter">
- {{ if $title -}}
- <div class="top">
- {{ partial "blocks/title" (dict
- "title" $title
- "context" $context
- ) }}
+ <div class="text">
+ {{ if $title -}}
+ <div class="top">
+ {{ partial "blocks/title" (dict
+ "title" $title
+ "context" $context
+ ) }}
+ </div>
+ {{ end -}}
+ {{ if (partial "GetTextFromHTML" .text) -}}
+ <div class="rich-text">
+ {{ partial "PrepareHTML" .text }}
</div>
- {{ end -}}
- {{ if (partial "GetTextFromHTML" .text) -}}
- <div class="rich-text">
- {{ partial "PrepareHTML" .text }}
+ {{ end -}}
+ {{ if (partial "GetTextFromHTML" .notes) }}
+ <div class="notes">
+ {{ partial "PrepareHTML" .notes }}
+ </div>
+ {{ end -}}
</div>
- {{ end -}}
- {{ if (partial "GetTextFromHTML" .notes) }}
- <div class="notes">
- {{ partial "PrepareHTML" .notes }}
- </div>
- {{ end -}}
- </div>
- {{ with .image }}
+ {{ if .image }}
<figure>
{{ partial "commons/image.html"
(dict
- "image" .
- "mobile" "351x351"
- "tablet" "336x336"
- "desktop" "636x636"
+ "image" .image
+ "mobile" "350x350"
+ "tablet" "450x450"
+ "desktop" "1280x1280"
)}}
{{ if partial "GetTextFromHTML" .credit }}
<figcaption>{{ partial "PrepareHTML" .credit }}</figcaption>
{{ end }}
</figure>
{{ end -}}
+ </div>
</div>
</div>
</section>
diff --git a/layouts/partials/pages/toc.html b/layouts/partials/pages/toc.html
index 581af8846c2feaa839413c959bf766980d9c1a85..41e837c2dc92fc1a508b7d459763c4bb1d03fb96 100644
--- a/layouts/partials/pages/toc.html
+++ b/layouts/partials/pages/toc.html
@@ -1,73 +1,40 @@
-{{- $show_aside := false -}}
+<nav class="toc toc-pages" id="nav-toc" aria-labelledby="toc-title">
+ <ol>
-{{- $has_blocks := false -}}
-{{- range .context.Params.blocks -}}
- {{- $has_blocks = true -}}
- {{- if .title -}}
- {{- $show_aside = true -}}
- {{- end -}}
-{{- end -}}
+ {{- if .context.Params.blocks -}}
-{{- if .context.Pages -}}
- {{- if eq $has_blocks false -}}
- {{- $show_aside = true -}}
- {{- end -}}
-{{- end -}}
+ {{- partial "blocks/toc.html" .context.Params.blocks -}}
-{{- if .context.Content -}}
- {{- if eq $has_blocks false -}}
- {{- $show_aside = true -}}
- {{- end -}}
-{{- end -}}
+ {{- else -}}
-{{- if .category -}}
- {{- if eq $has_blocks false -}}
- {{- $show_aside = true -}}
- {{- end -}}
-{{- end -}}
+ {{/* TODO: Delete it */}}
+ {{ $h2s := partial "H2Extract" .context.Content }}
+ {{- if and (not $h2s) (partial "GetTextFromHTML" .context.Content) }}
+ <li>
+ <a href="#page-informations">{{ i18n "pages.informations" }}</a>
+ </li>
+ {{ end -}}
-{{- if $show_aside }}
- <nav class="toc toc-pages" id="nav-toc" aria-labelledby="toc-title">
- <ol>
+ {{- range $index, $h2 := $h2s }}
+ <li>
+ <a href="#page-h2-{{$index}}">{{ plainify $h2 }}</a>
+ </li>
+ {{ end -}}
- {{- if .context.Params.blocks -}}
+ {{- if .context.Pages }}
+ <li>
+ <a href="#page-children">{{ i18n "pages.details" }}</a>
+ </li>
+ {{ end -}}
- {{- partial "blocks/toc.html" .context.Params.blocks -}}
+ {{- if .category.Pages }}
+ <li>
+ <a href="#page-posts">{{ i18n "pages.posts" }}</a>
+ </li>
+ {{ end -}}
- {{- else -}}
-
- {{/* TODO: Delete it */}}
- {{ $h2s := partial "H2Extract" .context.Content }}
- {{- if and (not $h2s) (partial "GetTextFromHTML" .context.Content) }}
- <li>
- <a href="#page-informations">{{ i18n "pages.informations" }}</a>
- </li>
- {{ end -}}
-
- {{- range $index, $h2 := $h2s }}
- <li>
- <a href="#page-h2-{{$index}}">{{ plainify $h2 }}</a>
- </li>
- {{ end -}}
-
- {{- if .context.Pages }}
- <li>
- <a href="#page-children">{{ i18n "pages.details" }}</a>
- </li>
- {{ end -}}
-
- {{- if .category.Pages }}
- <li>
- <a href="#page-posts">{{ i18n "pages.posts" }}</a>
- </li>
- {{ end -}}
-
- {{- end -}}
-
- </ol>
-
- </nav>
-
-{{ end -}}
+ {{- end -}}
+ </ol>
+</nav>
diff --git a/layouts/partials/posts/image.html b/layouts/partials/posts/image.html
index 40868e727950f41c194bdb7ed27a4580fd33944d..eb398d084b434d3b76847294e820fba650f2d982 100644
--- a/layouts/partials/posts/image.html
+++ b/layouts/partials/posts/image.html
@@ -3,9 +3,9 @@
{{ partial "commons/image.html"
(dict
"image" .
- "mobile" "351x168"
- "tablet" "456x219"
- "desktop" "856x410"
+ "mobile" "350x350"
+ "tablet" "450x450"
+ "desktop" "900x900"
"itemprop" true
)}}
{{- if isset . "credit" -}}
diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html
index 683d6ba8b750c50cb14c812126219ca6991dc9e5..e48b9bc2c8603316482432286d1e87a55024e94b 100644
--- a/layouts/partials/posts/post.html
+++ b/layouts/partials/posts/post.html
@@ -12,9 +12,9 @@
{{- partial "commons/image.html"
(dict
"image" .Params.image
- "mobile" "351x291"
- "tablet" "334x167"
- "desktop" "634x317"
+ "mobile" "350x350"
+ "tablet" "450x450"
+ "desktop" "900x900"
) -}}
{{- else -}}
{{- partial "commons/image-default.html" -}}
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" . -}}