Update Blowfish to v2.106.0 #56

Open
hauke wants to merge 3 commits from hauke/www:blowfish-update into staging
5 changed files with 65 additions and 56 deletions

View file

@ -76,8 +76,9 @@ This deletes `public/` and runs `hugo` with the parameters from `.hugo-params`.
- After entering the shell with `nix develop`, hugo is available and `hugo serve` and `./build.sh` should work - After entering the shell with `nix develop`, hugo is available and `hugo serve` and `./build.sh` should work
- You can build the staging and production builds with `nix build .#staging-content` and - You can build the staging and production builds with `nix build .#staging-content` and
`nix build .#production-content` `nix build .#production-content`
- Do not update the nixpkgs branch - 25.05 contains a newer hugo version that is incompatible with the theme (last - The theme accepts a limited range of Hugo versions, declared as `[module.hugoVersion]` in
checked June 2025) `themes/blowfish/config.toml`. Blowfish v2.106.0 wants 0.158.0 to 0.165.0, the nixpkgs branch pinned in `flake.nix`
carries 0.163.3. Keep the two in range when updating either of them, Hugo warns on every build otherwise.
--- ---

View file

@ -33,7 +33,7 @@ post = "/post/:year/:month/:day/:slug/"
[outputs] [outputs]
home = ["html", "rss", "json"] home = ["html", "rss", "json"]
section = ["html", "Calendar", "rss", "xml"] section = ["html", "Calendar", "rss", "xml"]
page = ["html", "Calendar"] page = ["html"]
# Output Formats Configuration # Output Formats Configuration
[outputFormats.Calendar] [outputFormats.Calendar]

View file

@ -1,6 +1,6 @@
disabled = false disabled = false
languageCode = "de" locale = "de"
languageName = "Deutsch" label = "Deutsch"
weight = 1 weight = 1
title = "Chaos Computer Club Berlin" title = "Chaos Computer Club Berlin"

View file

@ -2,69 +2,77 @@
{{/* Footer menu */}} {{/* Footer menu */}}
{{ if .Site.Params.footer.showMenu | default true }} {{ if .Site.Params.footer.showMenu | default true }}
{{ if .Site.Menus.footer }} {{ if .Site.Menus.footer }}
<nav class="flex flex-row pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400"> {{ $onlyIcon := true }}
<ul class="flex flex-col list-none sm:flex-row"> {{ range .Site.Menus.footer }}
{{ range .Site.Menus.footer }} {{ if .Name }}
<li class="flex mb-1 ltr:text-right rtl:text-left sm:mb-0 ltr:sm:mr-7 ltr:sm:last:mr-0 rtl:sm:ml-7 rtl:sm:last:ml-0"> {{ $onlyIcon = false }}
<a class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2 flex items-center" href="{{ .URL }}" {{ break }}
title="{{ .Title }}">
{{ if .Pre }}
<span {{ if and .Pre .Name}} class="mr-1" {{ end }}>
{{ partial "icon.html" .Pre }}
</span>
{{ end }}
{{ .Name | markdownify }}
</a>
</li>
{{ end }} {{ end }}
</ul> {{ end }}
</nav> {{ $navClass := printf "flex flex-row pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400 %s" (cond $onlyIcon "overflow-x-auto py-2" "") }}
{{ $ulClass := printf "flex list-none %s" (cond $onlyIcon "flex-row" "flex-col sm:flex-row") }}
{{ $liClass := printf "flex mb-1 text-end sm:mb-0 sm:me-7 sm:last:me-0 %s" (cond $onlyIcon "me-4" "") }}
<nav class="{{ $navClass }}">
<ul class="{{ $ulClass }}">
{{ range .Site.Menus.footer }}
<li class=" {{ $liClass }}">
<a
class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2 flex items-center"
href="{{ .URL }}"
title="{{ .Title }}">
{{ if .Pre }}
<span {{ if and .Pre .Name }}class="mr-1"{{ end }}>
{{ partial "icon.html" .Pre }}
</span>
{{ end }}
{{ .Name | markdownify }}
</a>
</li>
{{ end }}
</ul>
</nav>
{{ end }} {{ end }}
{{ end }} {{ end }}
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
{{/* Copyright */}} {{/* Copyright */}}
{{ if .Site.Params.footer.showCopyright | default true }} {{ if .Site.Params.footer.showCopyright | default true }}
<p class="text-sm text-neutral-500 dark:text-neutral-400"> <p class="text-sm text-neutral-500 dark:text-neutral-400">
{{- with replace .Site.Params.copyright "{ year }" now.Year }} {{- with replace .Site.Params.copyright "{ year }" now.Year }}
{{ . | markdownify }} {{ . | markdownify }}
{{- else }} {{- else }}
&copy; &copy;
{{ now.Format "2006" }} {{ now.Format "2006" }}
{{ .Site.Params.Author.name | markdownify }} {{ .Site.Params.Author.name | markdownify }}
{{- end }} {{- end }}
</p> </p>
{{ end }} {{ end }}
{{/* Theme attribution */}} {{/* Theme attribution */}}
{{ if .Site.Params.footer.showThemeAttribution | default true }} {{ if .Site.Params.footer.showThemeAttribution | default true }}
<p class="text-xs text-neutral-500 dark:text-neutral-400"> <p class="text-xs text-neutral-500 dark:text-neutral-400">
{{ $hugo := printf `<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" {{ $hugo := printf `<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500"
href="https://gohugo.io/" target="_blank" rel="noopener noreferrer">Hugo</a>` href="https://gohugo.io/" target="_blank" rel="noopener noreferrer">Hugo</a>`
}} }}
{{ $blowfish := printf `<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" {{ $blowfish := printf `<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500"
href="https://blowfish.page/" target="_blank" rel="noopener noreferrer">Blowfish</a>` }} href="https://blowfish.page/" target="_blank" rel="noopener noreferrer">Blowfish</a>`
{{ i18n "footer.powered_by" (dict "Hugo" $hugo "Theme" $blowfish) | safeHTML }} }}
(<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" {{ i18n "footer.powered_by" (dict "Hugo" $hugo "Theme" $blowfish) | safeHTML }}
href="https://git.berlin.ccc.de/cccb-website-team/www">Git-Repo</a>) (<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500"
</p> href="https://git.berlin.ccc.de/cccb-website-team/www">Git-Repo</a>)
</p>
{{ end }} {{ end }}
</div> </div>
<script> {{ if not .Site.Params.disableImageZoom | default true }}
{{ if not .Site.Params.disableImageZoom | default true }} <script>
mediumZoom(document.querySelectorAll("img:not(.nozoom)"), { mediumZoom(document.querySelectorAll("img:not(.nozoom)"), {
margin: 24, margin: 24,
background: 'rgba(0,0,0,0.5)', background: "rgba(0,0,0,0.5)",
scrollOffset: 0, scrollOffset: 0,
}) });
{{ end }} </script>
</script> {{ end }}
{{ $jsProcess := resources.Get "js/process.js" }}
{{ $jsProcess = $jsProcess | resources.Minify | resources.Fingerprint "sha512" }}
<script type="text/javascript" src="{{ $jsProcess.RelPermalink }}" integrity="{{ $jsProcess.Data.Integrity }}"></script>
{{/* Extend footer - eg. for extra scripts, etc. */}} {{/* Extend footer - eg. for extra scripts, etc. */}}
{{ if templates.Exists "partials/extend-footer.html" }} {{ if templates.Exists "partials/extend-footer.html" }}
{{ partialCached "extend-footer.html" . }} {{ partialCached "extend-footer.html" . }}
{{ end }} {{ end }}
</footer> </footer>

@ -1 +1 @@
Subproject commit 0b06a64139beba6287e7685f4c810ad4ff772fde Subproject commit a89d96e4dd63b0a1c1129d795ef4b56e491da1df