From c164484993c9606c531bc3f6988b8750c9d0ef3c Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Sun, 5 Jul 2026 14:37:14 +0800 Subject: [PATCH 1/4] fix: global resources fallback incorrectly removed in #2978 --- layouts/partials/article-link/_shortcode.html | 5 ++++- layouts/partials/article-link/card-related.html | 9 +++++++-- layouts/partials/article-link/card.html | 9 +++++++-- layouts/partials/article-link/simple.html | 5 ++++- layouts/partials/hero/background.html | 5 ++++- layouts/partials/hero/basic.html | 5 ++++- layouts/partials/hero/big.html | 5 ++++- layouts/partials/hero/thumbAndBackground.html | 7 +++++-- layouts/partials/term-link/card.html | 12 +++++++++--- 9 files changed, 48 insertions(+), 14 deletions(-) diff --git a/layouts/partials/article-link/_shortcode.html b/layouts/partials/article-link/_shortcode.html index 52b25a92..beb592b9 100644 --- a/layouts/partials/article-link/_shortcode.html +++ b/layouts/partials/article-link/_shortcode.html @@ -47,6 +47,9 @@ {{ end }} {{ else }} {{ $featured = $p.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -89,7 +92,7 @@ role="presentation" loading="lazy" decoding="async" - class="not-prose absolute inset-0 w-full h-full object-cover"> + class="not-prose absolute inset-0 w-full h-full object-cover" /> {{ end }}
diff --git a/layouts/partials/article-link/card-related.html b/layouts/partials/article-link/card-related.html index e06d604a..8d0ff914 100644 --- a/layouts/partials/article-link/card-related.html +++ b/layouts/partials/article-link/card-related.html @@ -21,6 +21,9 @@ {{ end }} {{ else }} {{ $featured = $p.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -57,14 +60,16 @@
{{ with $featuredURL }} -
+
+ class="not-prose absolute inset-0 w-full h-full object-cover" />
{{ end }} {{ if and .Draft .Site.Params.article.showDraftLabel }} diff --git a/layouts/partials/article-link/card.html b/layouts/partials/article-link/card.html index 97f9f781..2f6a7fcf 100644 --- a/layouts/partials/article-link/card.html +++ b/layouts/partials/article-link/card.html @@ -24,6 +24,9 @@ {{ end }} {{ else }} {{ $featured = $p.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -61,13 +64,15 @@
{{ with $featuredURL }} -
+
+ class="not-prose absolute inset-0 w-full h-full object-cover" />
{{ end }} {{ if and .Draft .Site.Params.article.showDraftLabel }} diff --git a/layouts/partials/article-link/simple.html b/layouts/partials/article-link/simple.html index d14ecd0c..303b64d8 100644 --- a/layouts/partials/article-link/simple.html +++ b/layouts/partials/article-link/simple.html @@ -40,6 +40,9 @@ {{ end }} {{ else }} {{ $featured = $p.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -82,7 +85,7 @@ role="presentation" loading="lazy" decoding="async" - class="not-prose absolute inset-0 w-full h-full object-cover"> + class="not-prose absolute inset-0 w-full h-full object-cover" />
{{ end }}
diff --git a/layouts/partials/hero/background.html b/layouts/partials/hero/background.html index 362d7fff..83b5c002 100644 --- a/layouts/partials/hero/background.html +++ b/layouts/partials/hero/background.html @@ -12,6 +12,9 @@ {{ end }} {{ else }} {{ $featured = page.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -78,7 +81,7 @@ decoding="async" fetchpriority="high" class="absolute inset-0 w-full h-full object-cover" - {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}> + {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} />
+ {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} />
{{ end }} diff --git a/layouts/partials/hero/big.html b/layouts/partials/hero/big.html index 43dc265c..7e0d85d4 100644 --- a/layouts/partials/hero/big.html +++ b/layouts/partials/hero/big.html @@ -12,6 +12,9 @@ {{ end }} {{ else }} {{ $featured = page.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -66,7 +69,7 @@ decoding="async" fetchpriority="high" class="w-full rounded-lg single_hero_round nozoom" - {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}> + {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} /> {{ if $caption }}
{{ $caption | markdownify }} diff --git a/layouts/partials/hero/thumbAndBackground.html b/layouts/partials/hero/thumbAndBackground.html index 5ede6322..e342ebfd 100644 --- a/layouts/partials/hero/thumbAndBackground.html +++ b/layouts/partials/hero/thumbAndBackground.html @@ -46,6 +46,9 @@ {{ end }} {{ else }} {{ $featured = page.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -94,7 +97,7 @@ decoding="async" fetchpriority="high" class="w-full h-full nozoom object-cover" - {{ with $.Params.imagePositionFeature }}style="object-position: {{ . }};"{{ end }}> + {{ with $.Params.imagePositionFeature }}style="object-position: {{ . }};"{{ end }} />
{{ end }} @@ -114,7 +117,7 @@ decoding="async" fetchpriority="high" class="absolute inset-0 h-full w-full object-cover" - {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}> + {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} /> {{ end }}
diff --git a/layouts/partials/term-link/card.html b/layouts/partials/term-link/card.html index 63c7af83..5a67ed31 100644 --- a/layouts/partials/term-link/card.html +++ b/layouts/partials/term-link/card.html @@ -5,11 +5,15 @@ {{ $thumbnailAspectRatio := site.Params.thumbnailAspectRatio | default "1.5" }} {{ $thumbnailAspectRatio = replaceRE "[^0-9.]" "" $thumbnailAspectRatio }} {{ if eq $thumbnailAspectRatio "" }}{{ $thumbnailAspectRatio = "1.5" }}{{ end }} +{{ $p := .Page }} {{ with .Page.Params.featureimage }} {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} {{ $featured = resources.GetRemote . }} {{ else }} - {{ $featured = page.Resources.Get . }} + {{ $featured = $p.Resources.Get . }} + {{ if not $featured }} + {{ $featured = resources.Get . }} + {{ end }} {{ end }} {{ end }} @@ -31,14 +35,16 @@
{{ with $featuredURL }} -
+
{{ $.Page.Title }} + class="not-prose absolute inset-0 w-full h-full object-cover" />
{{ end }} {{ if site.Params.taxonomy.showTermCount | default true }} From 0f060c2e64f29b1efe21fa2990797686e08a2618 Mon Sep 17 00:00:00 2001 From: MaikelChan Date: Sun, 12 Jul 2026 04:15:23 +0200 Subject: [PATCH 2/4] Fixed custom taxonomies not appearing as badges --- layouts/partials/article-meta/basic.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/layouts/partials/article-meta/basic.html b/layouts/partials/article-meta/basic.html index d83c703d..a5dc249a 100644 --- a/layouts/partials/article-meta/basic.html +++ b/layouts/partials/article-meta/basic.html @@ -100,20 +100,26 @@ {{ range $taxonomy, $terms := .Site.Taxonomies }} {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }} {{ range $context.GetTerms $taxonomy }} - {{ if .Params.showCategories | default (.Site.Params.article.showCategories | default true) }} - {{ if (eq $taxonomy "categories") }} + {{ if (or (eq $taxonomy "authors") (eq $taxonomy "series"))}} + {{/* Ignore authors and series, since they are handled in other places */}} + {{ continue }} + {{ else if (eq $taxonomy "categories") }} + {{ if .Params.showCategories | default (.Site.Params.article.showCategories | default true) }} {{ $useSecondaryColor := .Params.showCategoriesInSecondaryColor | default (.Site.Params.article.showCategoriesInSecondaryColor | default false) }} {{ partial "badge.html" (dict "linkTitle" .LinkTitle "useSecondaryColor" $useSecondaryColor) }} {{ end }} - {{ end }} - {{ if .Params.showTags | default (.Site.Params.article.showTags | default true) }} - {{ if (eq $taxonomy "tags") }} + {{ else if (eq $taxonomy "tags") }} + {{ if .Params.showTags | default (.Site.Params.article.showTags | default true) }} {{ partial "badge.html" .LinkTitle }} {{ end }} + {{ else }} + + {{ partial "badge.html" .LinkTitle }} + {{ end }} {{ end }} {{ end }} From a734e5e3207df072978daf0e993f7679e086f04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= Date: Thu, 16 Jul 2026 22:31:33 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=8C=90=20German=20localization=20for?= =?UTF-8?q?=20admonition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exampleSite/content/docs/shortcodes/index.de.md | 3 ++- i18n/de.yaml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/exampleSite/content/docs/shortcodes/index.de.md b/exampleSite/content/docs/shortcodes/index.de.md index cbfd6c9b..643a4595 100644 --- a/exampleSite/content/docs/shortcodes/index.de.md +++ b/exampleSite/content/docs/shortcodes/index.de.md @@ -92,7 +92,8 @@ Das Alert-Zeichen (`+` oder `-`) ist optional, um zu steuern, ob die Admonition > **GitHub-Typen:** `NOTE`, `TIP`, `IMPORTANT`, `WARNING`, `CAUTION` > **Obsidian-Typen:** `note`, `abstract`, `info`, `todo`, `tip`, `success`, `question`, `warning`, `failure`, `danger`, `bug`, `example`, `quote` -


+> [!INFO]- Admonition anpassen +> Siehe die [Anleitung zur Anpassung von Admonition](https://github.com/nunocoracao/blowfish/blob/main/layouts/_default/_markup/render-blockquote.html). ## Article diff --git a/i18n/de.yaml b/i18n/de.yaml index 43bf3a46..76c5ecaf 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -87,6 +87,23 @@ shortcode: recent: show_more: "Zeige Mehr" +admonition: + abstract: "Kurzfassung" + bug: "Bug" + caution: "Vorsicht" + danger: "Gefahr" + example: "Beispiel" + failure: "Fehler" + important: "Wichtig" + info: "Info" + note: "Hinweis" + question: "Frage" + quote: "Zitat" + success: "Erfolg" + tip: "Tipp" + todo: "To-Do" + warning: "Warnung" + cookie_notice: message_with_link: "Diese Website verwendet Cookies und ähnliche Technologien. Lesen Sie unsere Datenschutzerklärung" message: "Diese Website verwendet Cookies und ähnliche Technologien. Mit der Nutzung dieser Website akzeptierst du das." From 60cf2ea44e48a8c5f525abf37bae2cfe1b4af97e Mon Sep 17 00:00:00 2001 From: Yao Chius Date: Fri, 24 Jul 2026 14:23:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=93=9D=20Add=20chius.cc=20to=20showca?= =?UTF-8?q?se=20users?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add personal blog https://chius.cc/ (source: https://github.com/chius-me/chius.cc) to the Blowfish users list. --- exampleSite/content/users/users.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/exampleSite/content/users/users.json b/exampleSite/content/users/users.json index fc289098..91737d13 100644 --- a/exampleSite/content/users/users.json +++ b/exampleSite/content/users/users.json @@ -1138,5 +1138,14 @@ "Personal site", "Blog" ] + }, + { + "title": "chius.cc", + "url": "https://chius.cc/", + "source": "https://github.com/chius-me/chius.cc", + "tags": [ + "Personal site", + "Blog" + ] } ] \ No newline at end of file