commit b406570c821686d1b12178a81769672a1a2aecc5
parent 6be61c5623d83e11da79d75c2577862f642231b1
Author: Lou Woell <lou.woell@posteo.de>
Date:   Sun, 14 Dec 2025 02:17:12 +0100

templates: white space

The goal is to make the html output more readable.

Diffstat:
Mlayouts/_partials/header.html | 17++++++++---------
Mlayouts/_partials/logo.html | 21++++++++++++++++-----
Mlayouts/_partials/menu.html | 43++++++++++++++++++++++++-------------------
Mlayouts/_partials/mobile-menu.html | 16++++++++--------
Mlayouts/baseof.html | 25+++++++++++++++----------
Mlayouts/single.html | 141+++++++++++++++++++++++++++++++++++++++++--------------------------------------
6 files changed, 144 insertions(+), 119 deletions(-)

diff --git a/layouts/_partials/header.html b/layouts/_partials/header.html @@ -1,16 +1,15 @@ + <header class="header"> <div class="header__inner"> - <div class="header__logo"> - {{ partial "logo.html" . }} - </div> - {{ if len $.Site.Menus }} + {{ partial "logo.html" . -}} + {{ if len $.Site.Menus -}} {{ partial "mobile-menu.html" . }} - {{ end }} - {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) }} + {{- end }} + {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) -}} {{ partial "language-menu.html" . }} - {{ end }} + {{- end }} </div> - {{ if len $.Site.Menus }} + {{- if len $.Site.Menus }} {{ partial "menu.html" . }} - {{ end }} + {{- end }} </header> diff --git a/layouts/_partials/logo.html b/layouts/_partials/logo.html @@ -1,5 +1,16 @@ -<a href="{{ if $.Site.Params.Logo.LogoHomeLink }}{{ $.Site.Params.Logo.LogoHomeLink }}{{else}}{{ $.Site.BaseURL }}{{ end }}"> - <div class="logo"> - {{ with $.Site.Params.Logo.logoText }}{{ . }}{{ else }}Terminal{{ end }} - </div> -</a> + +<div class="header__logo"> + <a href="{{- if $.Site.Params.Logo.LogoHomeLink -}} + {{- $.Site.Params.Logo.LogoHomeLink -}} + {{- else -}} + {{- $.Site.BaseURL -}} + {{- end }}"> + <div class="logo"> + {{ with $.Site.Params.Logo.logoText -}} + {{ . }} + {{- else -}} + Terminal + {{- end }} + </div> + </a> +</div> diff --git a/layouts/_partials/menu.html b/layouts/_partials/menu.html @@ -1,33 +1,38 @@ <nav class="navigation-menu"> <ul class="navigation-menu__inner menu--desktop"> - {{ if or $.Site.Params.showMenuItems ( eq .Site.Params.showMenuItems 0 ) }} - {{ range first $.Site.Params.showMenuItems $.Site.Menus.main }} - {{ if not .HasChildren }} - <li><a href="{{ .URL }}" {{ if .Params.NewTab -}} target="_blank" {{- end }}>{{ .Name }}</a></li> - {{ end }} - {{ end }} - {{ if gt (len $.Site.Menus.main) $.Site.Params.showMenuItems }} + {{- if or $.Site.Params.showMenuItems ( eq .Site.Params.showMenuItems 0 ) -}} + {{- range first $.Site.Params.showMenuItems $.Site.Menus.main }} + {{ if not .HasChildren -}} + <li><a href="{{ .URL }}" {{- if .Params.NewTab -}} target="_blank" {{- end }}> + {{- .Name -}} + </a></li> + {{- end }} + {{- end }} + {{ if gt (len $.Site.Menus.main) $.Site.Params.showMenuItems -}} <li> <ul class="menu"> <li class="menu__trigger">{{ $.Site.Params.MenuMore }}&nbsp;▾</li> <li> <ul class="menu__dropdown"> - {{ range last (sub (len $.Site.Menus.main) $.Site.Params.showMenuItems) $.Site.Menus.main }} - {{ if not .HasChildren }} + {{- range last (sub (len $.Site.Menus.main) $.Site.Params.showMenuItems) $.Site.Menus.main }} + {{ if not .HasChildren -}} <li><a href="{{ .URL }}" {{ if .Params.NewTab -}} target="_blank" {{- end }}>{{ .Name }}</a></li> - {{ end }} - {{ end }} + {{- end }} + {{- end }} </ul> </li> </ul> </li> - {{ end }} - {{ else }} - {{ range $.Site.Menus.main }} - {{ if not .HasChildren }} - <li><a href="{{ .URL }}" {{ if .Params.NewTab -}} target="_blank" {{- end }}>{{ .Name }}</a></li> - {{ end }} - {{ end }} - {{ end }} + {{- end }} + {{- else -}} + {{- range $.Site.Menus.main }} + {{ if not .HasChildren -}} + <li><a href="{{ .URL }}" + {{- if .Params.NewTab -}} target="_blank" {{- end }}> + {{- .Name -}} + </a></li> + {{- end }} + {{- end }} + {{- end }} </ul> </nav> diff --git a/layouts/_partials/mobile-menu.html b/layouts/_partials/mobile-menu.html @@ -2,19 +2,19 @@ <li class="menu__trigger">Menu&nbsp;▾</li> <li> <ul class="menu__dropdown"> - {{ range $.Site.Menus.main }} - {{ if not .HasChildren }} + {{- range $.Site.Menus.main }} + {{ if not .HasChildren -}} <li><a href="{{ .URL }}">{{ .Name }}</a></li> - {{ end }} - {{ end }} - {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) }} + {{- end }} + {{- end }} + {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) -}} <hr /> - {{ range $.Site.Home.AllTranslations }} + {{- range $.Site.Home.AllTranslations }} <li> <a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a> </li> - {{ end }} - {{ end }} + {{- end }} + {{- end }} </ul> </li> </ul> diff --git a/layouts/baseof.html b/layouts/baseof.html @@ -10,24 +10,29 @@ {{- end -}} </title> {{- end }} - {{- partial "head.html" . }} + {{- partial "head.html" . -}} </head> <body class="{{- ( or .Params.color $.Site.Params.ThemeColor ) -}}"> <script>0</script> - {{ $container := cond ($.Site.Params.FullWidthTheme | default false) "container full" (cond ($.Site.Params.CenterTheme | default false) "container center" "container") }} + {{- $container := cond + ($.Site.Params.FullWidthTheme | default false) + "container full" + (cond ($.Site.Params.CenterTheme | default false) + "container center" "container") }} + <div class="{{- $container -}} + {{- cond ($.Site.Params.oneHeadingSize | default true) + " headings--one-size" "" -}}"> - <div class="{{- $container -}}{{- cond ($.Site.Params.oneHeadingSize | default true) " headings--one-size" "" }}"> - - {{ partial "header.html" . }} + {{- partial "header.html" . -}} <div class="content"> - {{ block "main" . }} - {{ end }} + {{- block "main" . -}} + {{- end -}} </div> - {{ block "footer" . }} - {{ partial "footer.html" . }} - {{ end }} + {{- block "footer" . -}} + {{- partial "footer.html" . -}} + {{- end -}} </div> </body> </html> diff --git a/layouts/single.html b/layouts/single.html @@ -1,83 +1,88 @@ {{ define "main" }} -<article class="post"> + <article class="post"> + {{ with .Params.series -}} + <h3 class="post-series"> + <a href= "{{ (urlize (printf "series/%s/" . )) | absLangURL }}"> + {{- . -}} + </a> + </h3> + {{- end -}} - {{- with .Params.series -}} - <h3 class="post-series"> - <a href= "{{ (urlize (printf "series/%s/" . )) | absLangURL }}"> - {{- . -}} - </a> - </h3> - {{- end -}} + {{ if .Params.tags }} + <span class="post-tags"> + {{- range .Params.tags }} + #<a href="{{ (urlize (printf "tags/%s/" .)) | absLangURL }}"> + {{- . -}} + </a>&nbsp; + {{- end }} + </span> + {{ end }} - {{ if .Params.tags }} - <span class="post-tags"> - {{ range .Params.tags }} - #<a href="{{ (urlize (printf "tags/%s/" .)) | absLangURL }}"> - {{- . -}} - </a>&nbsp; - {{ end }} - </span> - {{ end }} + <h1 class="post-title"> + <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> + </h1> - <h1 class="post-title"> - <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> - </h1> - <div class="post-meta"> - {{- if .Date -}} - <time class="post-date"> - {{- .Date.Format "2006-01-02" -}} - </time> - {{- end -}} - {{- with .Params.Author -}} - <span class="post-author">{{ . }}</span> - {{- end -}} - {{- if $.Site.Params.showLastUpdated -}} - <time class="post-date" > - {{- or $.Site.Params.updatedDatePrefix "Updated " -}} {{- .Lastmod.Format "2006-01-02" -}} - </time> - {{- end -}} - {{- if and (.Param "readingTime") (eq (.Param "readingTime") true) -}} - <span class="post-reading-time">{{ .ReadingTime }} {{ $.Site.Params.minuteReadingTime | default "min read" }} ({{ .WordCount }} {{ $.Site.Params.words | default "words" }})</span> - {{- end -}} - </div> - - {{ partial "cover.html" . }} + <div class="post-meta"> + {{ if .Date -}} + <time class="post-date"> + {{- .Date.Format "2006-01-02" -}} + </time> + {{- end }} + {{ with .Params.Author -}} + <span class="post-author">{{ . }}</span> + {{- end }} + {{- if $.Site.Params.showLastUpdated }} + <time class="post-date" > + {{- or $.Site.Params.updatedDatePrefix "Updated " -}} + {{- .Lastmod.Format "2006-01-02" -}} + </time> + {{- end }} + {{ if and (.Param "readingTime") (eq (.Param "readingTime") true) -}} + <span class="post-reading-time"> + {{- .ReadingTime -}} + {{- $.Site.Params.minuteReadingTime | default "min read" -}} + ({{- .WordCount }} {{ $.Site.Params.words | default "words" -}}) + </span> + {{- end }} + </div> - {{ if (.Params.LiveDoc) }} - <div class="index-content framed", style="margin: 3em"> + {{ partial "cover.html" . }} - This is a living document and subject to change. <br> + {{ if (.Params.LiveDoc) -}} + <div class="index-content framed", style="margin: 3em"> - <time class="post-date post-meta" > - {{ "Last Updated: " }} {{- .Lastmod.Format "2006-01-02" -}} - </time> + This is a living document and subject to change. <br> - </div> - {{ end }} + <time class="post-date post-meta" > + {{ "Last Updated: " }} {{- .Lastmod.Format "2006-01-02" -}} + </time> - {{ if (.Params.Toc | default .Site.Params.Toc) }} - <div class="table-of-contents"> - <h2> - {{ (.Params.TocTitle | default .Site.Params.TocTitle) | default "Table of Contents" }} - </h2> - {{ .TableOfContents }} - </div> - {{ end }} + </div> + {{- end }} - <div class="post-content"> - {{- with .Content -}} - <div> - {{ . | replaceRE "(<h[1-9] id=\"([^\"]+)\".+)(</h[1-9]+>)" `${1}<a href="#${2}" class="hanchor" ariaLabel="Anchor">&#8983;</a> ${3}` | safeHTML }} + {{ if (.Params.Toc | default .Site.Params.Toc) -}} + <div class="table-of-contents"> + <h2> + {{ (.Params.TocTitle | default .Site.Params.TocTitle) | default "Table of Contents" }} + </h2> + {{ .TableOfContents }} </div> {{- end -}} - </div> - {{ if eq .Type $.Site.Params.contentTypeName }} - {{ partial "posts_pagination.html" . }} - {{ end }} + <div class="post-content"> + {{ with .Content -}} + <div> + {{ . | replaceRE "(<h[1-9] id=\"([^\"]+)\".+)(</h[1-9]+>)" `${1}<a href="#${2}" class="hanchor" ariaLabel="Anchor">&#8983;</a> ${3}` | safeHTML -}} + </div> + {{- end }} + </div> - {{ if not (.Params.hideComments | default false) }} - {{ partial "comments.html" . }} - {{ end }} -</article> + {{- if eq .Type $.Site.Params.contentTypeName -}} + {{ partial "posts_pagination.html" . }} + {{- end -}} + + {{- if not (.Params.hideComments | default false) -}} + {{ partial "comments.html" . }} + {{- end -}} + </article> {{ end }}