diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass index ec12c21b3e1694806f2eb7e9372a917e21c1b1e1..0b29cce30b8358276e4b608c4cd0d025d8ec84e7 100644 --- a/assets/sass/_theme/sections/persons.sass +++ b/assets/sass/_theme/sections/persons.sass @@ -141,6 +141,8 @@ ol.persons--list .persons__section * + .persons margin-top: $spacing-section-y + .persons:last-child + padding-bottom: $spacing3 .persons__page .hero diff --git a/config.yaml b/config.yaml index a3e5b61ea5713611f8dea419a1493ada6b3ae9be..f926a8e11fe05a84832e11318a2c4517b92a9f61 100644 --- a/config.yaml +++ b/config.yaml @@ -16,7 +16,7 @@ params: truncate_description: 200 # Set to 0 to disable truncate persons: index: - layout: grid # grid | list + layout: list # grid | list home: toc: disabled: true diff --git a/layouts/organizations/list.html b/layouts/organizations/list.html index f8148b252e96b58bc90b1f8e4d73207a430afd98..77d7a6d6eab549a42f5ad234f0d6a9dd86375207 100644 --- a/layouts/organizations/list.html +++ b/layouts/organizations/list.html @@ -1,15 +1,24 @@ {{ define "main" }} + {{- $is_partners_block_present := false -}} + {{ range .Params.blocks }} + {{- if eq .template "partners" -}} + {{- $is_partners_block_present = true -}} + {{ end }} + {{ end }} + {{ partial "organizations/hero.html" . }} <div class="document-content"> + {{ partial "blocks/list.html" . }} + <div class="container"> {{ partial "pages/summary.html" (dict "context" . ) }} - {{ partial "organizations/organizations.html" . }} - {{ partial "commons/pagination.html" . }} + {{- if not $is_partners_block_present -}} + {{ partial "organizations/organizations.html" . }} + {{ partial "commons/pagination.html" . }} + {{ end }} </div> - - {{ partial "blocks/list.html" . }} </div> {{ end }} diff --git a/layouts/persons/list.html b/layouts/persons/list.html index 6197b5ffed85f41d4b91a04436fd77ecce800f67..c40bba59311fa0d850ab0caef7aad847fd4b9312 100644 --- a/layouts/persons/list.html +++ b/layouts/persons/list.html @@ -30,6 +30,8 @@ "block_wrapped" $summary_block ) }} + {{ partial "blocks/list.html" . }} + <div class="container"> {{- if not $is_organigram_present -}} {{ partial "persons/taxonomies.html" . }} @@ -40,7 +42,6 @@ {{- end -}} </div> - {{ partial "blocks/list.html" . }} </div> {{ end }}