diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 706117c..7943483 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,10 +4,9 @@ {{- partial "head.html" . -}} -
- {{ partial "nav.html" . }} -
- {{ block "main" . }}{{ end }} + {{ partial "nav.html" . }} + {{ block "header" . }}{{ end }} + {{ block "content" . }}{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 2be3e17..16ef30c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,26 +1,24 @@ -{{ define "main" }} -
-
- -
-

{{ .Title }}

- {{ with .Description }}

{{ . }}

{{ end }} -
- -
- {{ range .Pages }} -
-
-

{{ .Title }}

-

- -

-
- {{ with .Summary }}

{{ . }}

{{ end }} -
- {{ end }} -
- -
-
+{{ define "header" }} +
+

{{ .Title }}

+ {{ with .Description }}

{{ . }}

{{ end }} +
+{{ end }} + +{{ define "content" }} +
+
+ {{ range .Pages }} +
+
+

{{ .Title }}

+

+ +

+
+ {{ with .Summary }}

{{ . }}

{{ end }} +
+ {{ end }} +
+
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index a2cf10c..ff6ac82 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,25 +1,24 @@ -{{ define "main" }} -
-
- -
-
- {{ with .Params.eyebrow }}

{{ . }}

{{ end }} -

{{ .Title }}

- {{ with .Description }}

{{ . }}

{{ end }} -
-

- - {{ with .Params.author }} · {{ . }}{{ end }} -

-
- - {{ .Content }} - - - -
-
+{{ define "header" }} +
+
+ {{ with .Params.eyebrow }}

{{ . }}

{{ end }} +

{{ .Title }}

+ {{ with .Description }}

{{ . }}

{{ end }} +
+

+ + {{ with .Params.author }} · {{ . }}{{ end }} +

+
+{{ end }} + +{{ define "content" }} +
+ {{ .Content }} + {{ with .Params.footer }} + + {{ end }} +
{{ end }} diff --git a/layouts/docs/single.html b/layouts/docs/single.html index cf07bbb..70a28cf 100644 --- a/layouts/docs/single.html +++ b/layouts/docs/single.html @@ -1,107 +1,87 @@ -{{ define "main" }} -
-
- - {{/* ── Left sidebar ─────────────────────────────────────────────── */}} - - - - - {{/* ── Main content ──────────────────────────────────────────────── */}} - -
- - {{- if .Description -}} -
-

{{ .Title }}

-

{{ .Description }}

-
- {{- else -}} -

{{ .Title }}

- {{- end }} - - {{ .Content }} - - {{- if or .PrevInSection .NextInSection -}} -
- {{- with .NextInSection -}} - - {{- end -}} - {{- with .PrevInSection -}} - - {{- end -}} -
- {{- end -}} - -
- - - {{/* ── Right TOC ────────────────────────────────────────────────── */}} - - {{- with .TableOfContents -}} - - {{- end -}} - -
-
+{{ define "header" }} +
+ {{- if .Description -}} +
+

{{ .Title }}

+

{{ .Description }}

+
+ {{- else -}} +

{{ .Title }}

+ {{- end }} +
+{{ end }} + +{{ define "content" }} + {{/* Docs sidebar — this is navigation, not an aside */}} + + +
+ {{ .Content }} + + {{- if or .PrevInSection .NextInSection -}} + + {{- end -}} +
+ + {{- with .TableOfContents -}} + + {{- end -}} {{ end }} diff --git a/layouts/index.html b/layouts/index.html index 4331f72..662bed5 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,32 +1,30 @@ {{ define "title" }}{{ .Site.Title }}{{ end }} -{{ define "main" }} -
-
- -
-
-

{{ .Site.Title }}

-

{{ .Site.Params.description | default "An agent-first approach to web generation." }}

-
-
- -
-

Recent

- {{ range first 10 .Site.RegularPages }} -
-
-

{{ .Title }}

-

- - {{ with .Params.eyebrow }} · {{ . }}{{ end }} -

-
- {{ with .Summary }}

{{ . }}

{{ end }} -
- {{ end }} -
- -
-
+{{ define "header" }} +
+
+

{{ .Site.Title }}

+

{{ .Site.Params.description | default "An agent-first approach to web generation." }}

+
+
+{{ end }} + +{{ define "content" }} +
+
+

Recent

+ {{ range first 10 .Site.RegularPages }} +
+
+

{{ .Title }}

+

+ + {{ with .Params.eyebrow }} · {{ . }}{{ end }} +

+
+ {{ with .Summary }}

{{ . }}

{{ end }} +
+ {{ end }} +
+
{{ end }} diff --git a/layouts/paper/single.html b/layouts/paper/single.html index 7332068..f8d5295 100644 --- a/layouts/paper/single.html +++ b/layouts/paper/single.html @@ -1,59 +1,40 @@ -{{ define "main" }} -
-
- -
- -

{{ .Title }}

- - {{- with .Description -}} -

{{ . }}

- {{- end -}} - - {{/* Byline: date and/or author */}} - {{- $hasDate := not .Date.IsZero -}} - {{- $hasAuthor := .Params.author -}} - {{- if or $hasDate $hasAuthor -}} -

- {{- if $hasDate -}} - - {{- end -}} - {{- if and $hasDate $hasAuthor -}} - - {{- end -}} - {{- with .Params.author -}} - {{ . }} - {{- end -}} -

- {{- end -}} - - {{/* Tags */}} - {{- with .GetTerms "tags" -}} - - {{- end -}} - -
- - - {{ .Content }} - - - {{/* ── Prev / Next footer ──────────────────────────────────────── */}} - {{- if or .PrevInSection .NextInSection -}} - +{{ define "header" }} +
+

{{ .Title }}

+ {{ with .Description }}

{{ . }}

{{ end }} + {{- $hasDate := not .Date.IsZero -}} + {{- $hasAuthor := .Params.author -}} + {{- if or $hasDate $hasAuthor -}} +

+ {{- if $hasDate -}} + {{- end -}} - -

-
+ {{- if and $hasDate $hasAuthor }} · {{ end -}} + {{- with .Params.author }}{{ . }}{{ end -}} +

+ {{- end }} + {{- with .GetTerms "tags" }} + + {{- end }} + +{{ end }} + +{{ define "content" }} +
+ {{ .Content }} + {{- if or .PrevInSection .NextInSection }} + + {{- end }} +
{{ end }} diff --git a/layouts/vault/single.html b/layouts/vault/single.html index fa0726e..c6be8cf 100644 --- a/layouts/vault/single.html +++ b/layouts/vault/single.html @@ -1,113 +1,92 @@ -{{ define "main" }} -
-
- - {{/* ── Left sidebar ─────────────────────────────────────────────── */}} - - - - - {{/* ── Main content ──────────────────────────────────────────────── */}} - -
- - {{- if .Description -}} -
-

{{ .Title }}

-

{{ .Description }}

-
- {{- else -}} -

{{ .Title }}

- {{- end }} - - {{ .Content }} - - {{/* ── Prev / Next — from front matter, not Hugo section order ── */}} - {{- $prevURL := index .Params "prev-url" -}} - {{- $prevTitle := index .Params "prev-title" -}} - {{- $nextURL := index .Params "next-url" -}} - {{- $nextTitle := index .Params "next-title" -}} - {{- if or $prevURL $nextURL -}} -
- {{- if $prevURL -}} - - {{- end -}} - {{- if and $nextURL $nextTitle -}} - - {{- end -}} -
- {{- end -}} - -
- - - {{/* ── Right TOC ────────────────────────────────────────────────── */}} - - {{- with .TableOfContents -}} - - {{- end -}} - -
-
+{{ define "header" }} +
+ {{- if .Description -}} +
+

{{ .Title }}

+

{{ .Description }}

+
+ {{- else -}} +

{{ .Title }}

+ {{- end }} +
+{{ end }} + +{{ define "content" }} + {{/* Vault sidebar navigation */}} + + +
+ {{ .Content }} + + {{- $prevURL := index .Params "prev-url" -}} + {{- $prevTitle := index .Params "prev-title" -}} + {{- $nextURL := index .Params "next-url" -}} + {{- $nextTitle := index .Params "next-title" -}} + {{- if or $prevURL $nextURL -}} + + {{- end -}} +
+ + {{- with .TableOfContents -}} + + {{- end -}} {{ end }}