Update .Site to site function

kirillbobyrev · Jun 5, 2023 · 8e3822f · 8e3822f
1 parent 91f9861
commit 8e3822f
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
+          # TODO: Use matrix and also test with min version?
           hugo-version: "latest"
       - name: Build website
         run: hugo --gc --minify --source exampleSite --baseURL "${{ steps.pages.outputs.base_url }}/"

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.Language.Lang }}">
+<html lang="{{ site.Language.Lang }}">
 
 <head>
   {{- partial "head.html" . -}}

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -12,7 +12,7 @@
 <!-- TODO: Move to a separate layout. -->
 <small>
   <ul class="tag-cloud">
-    {{ range .Site.Taxonomies.tags }}
+    {{ range site.Taxonomies.tags }}
     <li><a href="{{ .Page.Permalink }}">#{{ .Page.Title }}</a></li>
     {{ end }}
   </ul>

diff --git a/layouts/_default/post.html b/layouts/_default/post.html
@@ -2,7 +2,7 @@
   <article>
     {{ if .Date }}
     <time datetime="{{ .Date }}" pubdate>
-      {{ .Date | dateFormat .Site.Params.dateDisplayFormat }}
+      {{ .Date | dateFormat site.Params.dateDisplayFormat }}
     </time>
     {{ end }}
     <a href="{{ .Permalink }}">{{ .Title }}</a>

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -7,7 +7,7 @@ <h1>
   {{ if .Date }}
   <p>
     <time datetime="{{ .Date }}" pubdate>
-      {{ .Date | dateFormat .Site.Params.dateDisplayFormat }}
+      {{ .Date | dateFormat site.Params.dateDisplayFormat }}
     </time>
   </p>
   {{ end }}
@@ -27,7 +27,7 @@ <h1>
 
 </article>
 
-{{ if and .IsPage .Site.Params.enableDisqus }}
+{{ if and .IsPage site.Params.enableDisqus }}
 {{ template "_internal/disqus.html" . }}
 {{ end }}
 

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -1,16 +1,16 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<base href="{{ .Site.BaseURL }}">
+<base href="{{ site.BaseURL }}">
 
 <title>
   {{ with .Title }}
   {{ . }} |
   {{ end }}
-  {{ .Site.Title }}
+  {{ site.Title }}
 </title>
 
-{{ with .Site.Params }}
+{{ with site.Params }}
 {{ with .author }}
 <meta name="author" content="{{ . }}">
 {{ end }}
@@ -22,23 +22,23 @@
 {{ end }}
 {{ end }}
 
-{{ if .Site.Params.icons }}
+{{ if site.Params.icons }}
 {{ partial "icons.html" . }}
 {{ end }}
 
 {{ template "_internal/google_analytics.html" . }}
 
-{{ if .Site.Params.twitterCards }}
+{{ if site.Params.twitterCards }}
 {{ template "_internal/twitter_cards.html" . }}
 {{ end }}
 
-{{ if .Site.Params.opengraph }}
+{{ if site.Params.opengraph }}
 {{ template "_internal/opengraph.html" . }}
 {{ end }}
 
 {{ range .AlternativeOutputFormats -}}
 {{ printf `
-<link rel="%s" type="%s" href="%s" title="%s">` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }}
+<link rel="%s" type="%s" href="%s" title="%s">` .Rel .MediaType.Type .RelPermalink site.Title | safeHTML }}
 {{ end -}}
 
 {{ $style := resources.Get "css/style.css" }}
@@ -50,10 +50,10 @@
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 {{ end }}
 
-{{ with .Site.Params.mastodon }}
+{{ with site.Params.mastodon }}
 <link href="https://social.example.com/@{{ . }}" rel="me">
 {{ end }}
 
-{{ if or .Params.math .Site.Params.math }}
+{{ if or .Params.math site.Params.math }}
 {{ partial "math.html" . }}
 {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -1,4 +1,4 @@
-{{ with .Site }}
+{{ with site }}
 <a href="{{ .BaseURL }}" class="blog-title">
   {{ .Title }}
 </a>

diff --git a/layouts/partials/icons.html b/layouts/partials/icons.html
@@ -1,8 +1,8 @@
-<link rel="apple-touch-icon" sizes="180x180" href="{{ .Site.BaseURL }}/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ .Site.BaseURL }}/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ .Site.BaseURL }}/favicon-16x16.png">
-<link rel="manifest" href="{{ .Site.BaseURL }}/site.webmanifest">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ site.BaseURL }}/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="{{ site.BaseURL }}/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="{{ site.BaseURL }}/favicon-16x16.png">
+<link rel="manifest" href="{{ site.BaseURL }}/site.webmanifest">
 <!-- TODO: The specific colors would be better off as extension points. -->
-<link rel="mask-icon" href="{{ .Site.BaseURL }}/safari-pinned-tab.svg" color="#5bbad5">
+<link rel="mask-icon" href="{{ site.BaseURL }}/safari-pinned-tab.svg" color="#5bbad5">
 <meta name="msapplication-TileColor" content="#da532c">
 <meta name="theme-color" content="#ffffff">
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
@@ -1,5 +1,5 @@
 <nav class="menu">
-  {{- range .Site.Menus.main }}
+  {{- range site.Menus.main }}
   <a href="{{ .URL }}" class="menu-link">{{ .Name }}</a>
   {{- end }}
 </nav>
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 <ul>
-  {{ range .Site.Taxonomies.tags }}
+  {{ range site.Taxonomies.tags }}
   <li><a href="{{ .Page.Permalink }}">#{{ .Page.Title }}</a>: {{ .Count }}</li>
   {{ end }}
 </ul>

diff --git a/layouts/taxonomy/term.html b/layouts/taxonomy/term.html
@@ -7,6 +7,6 @@
   {{ end }}
 </ul>
 <p>
-Filtered by <a href="{{ .Site.BaseURL }}/tags/{{ $tag | urlize }}">#{{ $tag }}</a>
+Filtered by <a href="{{ site.BaseURL }}/tags/{{ $tag | urlize }}">#{{ $tag }}</a>
 </p>
 {{ end }}
diff --git a/theme.toml b/theme.toml
@@ -8,7 +8,7 @@ demosite = 'https://kirillbobyrev.github.io/minimis'
 
 tags = ['blog', 'personal', 'minimal', 'clean', 'mobile']
 features = ['katex', 'tags', 'toc', 'mastodon']
-min_version = '0.111.3'
+min_version = '0.113.0'
 
 [author]
   name = 'Kirill Bobyrev'