diff --git a/assets/css/010_spacing.css b/assets/css/010_spacing.css index 600f9fa..f142edf 100644 --- a/assets/css/010_spacing.css +++ b/assets/css/010_spacing.css @@ -61,7 +61,7 @@ p + p { /* Figures */ -{{- $elementsWithXLBlockMargins := "blockquote, .figure--code, .figure--image, .figure--youtube, .codeblock, .highlight, table" -}} +{{- $elementsWithXLBlockMargins := "blockquote, table, .codeblock, .figure--code, .figure--image, .figure--youtube, .highlight" -}} p + :is({{ $elementsWithXLBlockMargins }}) { margin-block-start: var(--space-xl); diff --git a/assets/css/010_structure.css b/assets/css/010_structure.css index c420ee5..76d41a9 100644 --- a/assets/css/010_structure.css +++ b/assets/css/010_structure.css @@ -83,14 +83,12 @@ body { } .main--list { - .page-header, - .main--list__page-list - { + .page-header { grid-column: main-start / main-end; } .page-header, - .main--list__content + .main__content { margin-block-end: var(--space-xl); } diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index ea61005..ece912f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,18 +1,16 @@ - {{ partial "base/head.html" . }} - {{ block "head_css" . }}{{ end }} + {{- partial "base/head.html" . -}} + {{- block "head_css" . }}{{ end -}}
{{ partial "site/header.html" . }}
-
- {{ block "main" . }}{{ end }} - -
+ {{ block "main" . }}{{ end }} + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 7e0be87..641f3d0 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,14 +4,10 @@ {{ partial "page_header.html" (dict "page" .) }} - {{ with .Content -}} -
{{ . }}
- {{- end }} + {{- .Content -}} -
- {{ range .Pages.ByTitle }} - {{ .Render "page_summary" }} - {{ end }} -
+ {{- range .Pages.ByTitle -}} + {{ .Render "page_summary" }} + {{- end -}} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index c4cf3af..9485c33 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,14 +4,14 @@ {{ partial "page_header.html" (dict "page" .) }} - {{ if .Params.renderTableofContents | default false }} + {{ if .Params.tableOfContents | default .Params.renderTableofContents | default false -}}
{{ i18n "tableOfContents" }} {{ .TableOfContents }}
- {{ end }} + {{- end }} - {{ .Content }} + {{- .Content -}}