From 4e66d98adf877b932eeb4138a0f9190c748a7a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 20 Dec 2022 17:08:57 +0100 Subject: [PATCH] Update theme --- .../layouts/_default/baseof.html | 166 +++++++++++------- _vendor/modules.txt | 2 +- go.mod | 2 +- go.sum | 2 + 4 files changed, 109 insertions(+), 63 deletions(-) diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html index 04261a886..d8e7dc014 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html @@ -1,75 +1,119 @@ - - - - - {{/* https://www.zachleat.com/web/preload/ */}} - - - - - - {{/* NOTE: the Site's title, and if there is a page title, that is set too */}} - {{ block "title" . }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - - - {{ hugo.Generator }} - - {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - + + en-us {{ end }} + "> + + + {{/* https://www.zachleat.com/web/preload/ */}} + + + - {{ range .AlternativeOutputFormats -}} - - {{ end -}} + + {{/* NOTE: the Site's title, and if there is a page title, that is set too */}} + + {{ block "title" . }} + {{ with .Title }}{{ . }} |{{ end }}{{ .Site.Title }} + {{ end }} - {{ $isDev := eq hugo.Environment "development" }} - {{ $stylesheet := resources.Get "output/css/app.css" }} - {{ if not $isDev }} - {{ $stylesheet = $stylesheet | minify | fingerprint }} - {{ end }} - {{ with $stylesheet }} - {{ if $isDev }} - <link rel="stylesheet" href="{{ .RelPermalink }}" crossorigin="anonymous"> - {{ else }} - <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous"> - {{ end }} - {{ $.Scratch.Set "stylesheet" . }} - {{end}} + - + + {{ hugo.Generator }} - {{ block "scripts" . }} - {{- partial "site-scripts.html" . -}} - {{ end }} - {{ partial "site-manifest.html" . }} - {{- partial "head-additions.html" . -}} - {{- partial "opengraph/opengraph.html" . -}} - {{- template "_internal/schema.html" . -}} - {{- partial "opengraph/twitter_cards.html" . -}} + {{ if hugo.IsProduction }} + + {{ else }} + + {{ end }} - {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} - {{ partial "gtag" . }} - {{ end }} + {{ range .AlternativeOutputFormats -}} + + {{ end -}} - + {{ $isDev := eq hugo.Environment "development" }} + {{ $stylesheet := resources.Get "output/css/app.css" }} + {{ if not $isDev }} + {{ $stylesheet = $stylesheet | minify | fingerprint }} + {{ end }} + {{ with $stylesheet }} + {{ if $isDev }} + + {{ else }} + + {{ end }} + {{ $.Scratch.Set "stylesheet" . }} + {{ end }} - - {{ partial "hooks/after-body-start" . }} - {{ block "nav" . }}{{ partial "site-nav.html" . }}{{ end }} - {{ block "header" . }}{{ end }} -
- {{ block "main" . }}{{ end }} -
- {{ block "footer" . }}{{ partialCached "site-footer.html" . }}{{ end }} - - {{ partial "hooks/before-body-end" . }} - + - + {{ block "scripts" . }} + {{- partial "site-scripts.html" . -}} + {{ end }} + {{ partial "site-manifest.html" . }} + {{- partial "head-additions.html" . -}} + {{- partial "opengraph/opengraph.html" . -}} + {{- template "_internal/schema.html" . -}} + {{- partial "opengraph/twitter_cards.html" . -}} + {{ if hugo.IsProduction }} + {{ partial "gtag" . }} + {{ end }} + + + + + {{ partial "hooks/after-body-start" . }} + {{ block "nav" . }}{{ partial "site-nav.html" . }}{{ end }} + {{ block "header" . }}{{ end }} +
+ {{ block "main" . }}{{ end }} +
+ + {{ block "footer" . }}{{ partialCached "site-footer.html" . }}{{ end }} + + {{ partial "hooks/before-body-end" . }} + + diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 787da8ac2..fff8a6dfe 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1 +1 @@ -# github.com/gohugoio/gohugoioTheme v0.0.0-20221217122332-1c1752ad8f14 +# github.com/gohugoio/gohugoioTheme v0.0.0-20221220160735-8ffa1ef883b6 diff --git a/go.mod b/go.mod index 6f4856f66..fbf5b5b89 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/gohugoio/hugoDocs go 1.16 -require github.com/gohugoio/gohugoioTheme v0.0.0-20221217122332-1c1752ad8f14 // indirect +require github.com/gohugoio/gohugoioTheme v0.0.0-20221220160735-8ffa1ef883b6 // indirect diff --git a/go.sum b/go.sum index 465e50591..5a3d939b4 100644 --- a/go.sum +++ b/go.sum @@ -49,3 +49,5 @@ github.com/gohugoio/gohugoioTheme v0.0.0-20221206093948-1408550ab675 h1:wjpYa1cT github.com/gohugoio/gohugoioTheme v0.0.0-20221206093948-1408550ab675/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs= github.com/gohugoio/gohugoioTheme v0.0.0-20221217122332-1c1752ad8f14 h1:K6tPFpi7W0zb89QIf+lNdgdTXfDFemU6NKk46MlX9lQ= github.com/gohugoio/gohugoioTheme v0.0.0-20221217122332-1c1752ad8f14/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs= +github.com/gohugoio/gohugoioTheme v0.0.0-20221220160735-8ffa1ef883b6 h1:yEoQecRBoLGfc7yTybMD3Mhm03bTScZFYPvwe0p75vA= +github.com/gohugoio/gohugoioTheme v0.0.0-20221220160735-8ffa1ef883b6/go.mod h1:GOYeAPQJ/ok8z7oz1cjfcSlsFpXrmx6VkzQ5RpnyhZM=