Merge branch 'dev' into patch-1

This commit is contained in:
James Panther
2025-06-22 11:59:27 +10:00
committed by GitHub
30 changed files with 1129 additions and 1026 deletions
+5 -5
View File
@@ -16,28 +16,28 @@ jobs:
- run: npm install
- run: npm run assets
- name: Commit and push Chart.js changes
uses: stefanzweifel/git-auto-commit-action@v5
uses: stefanzweifel/git-auto-commit-action@v6
with:
branch: "${{ github.head_ref }}"
push_options: "--dry-run"
file_pattern: "assets/lib/chart/*"
commit_message: "📦 Update packaged ChartJS"
- name: Commit Fuse changes
uses: stefanzweifel/git-auto-commit-action@v5
uses: stefanzweifel/git-auto-commit-action@v6
with:
branch: "${{ github.head_ref }}"
push_options: "--dry-run"
file_pattern: "assets/lib/fuse/*"
commit_message: "📦 Update packaged FuseJS"
- name: Commit KaTeX changes
uses: stefanzweifel/git-auto-commit-action@v5
uses: stefanzweifel/git-auto-commit-action@v6
with:
branch: "${{ github.head_ref }}"
push_options: "--dry-run"
file_pattern: "assets/lib/katex/*"
commit_message: "📦 Update packaged KaTeX"
- name: Commit Mermaid changes
uses: stefanzweifel/git-auto-commit-action@v5
uses: stefanzweifel/git-auto-commit-action@v6
with:
branch: "${{ github.head_ref }}"
push_options: "--dry-run"
@@ -45,7 +45,7 @@ jobs:
commit_message: "📦 Update packaged Mermaid"
- run: npm run build
- name: Commit CSS changes
uses: stefanzweifel/git-auto-commit-action@v5
uses: stefanzweifel/git-auto-commit-action@v6
with:
branch: "${{ github.head_ref }}"
push_options: "--dry-run"
+3
View File
@@ -21,3 +21,6 @@ hugo.linux
# Project specific files
TODO
# MacOS
.DS_Store
+17
View File
@@ -6,9 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
### Added
- New `canonicalUrl` parameter support in article front matter ([#1046](https://github.com/jpanther/congo/pull/1046))
- New icon for `goodreads` ([#1057](https://github.com/jpanther/congo/pull/1057))
### Changed
- ⚠️ Required Hugo version is now 0.146.0 or later
- Upgrade to Mermaid v11.7.0 ([#1035](https://github.com/jpanther/congo/pull/1035), [#1040](https://github.com/jpanther/congo/pull/1040))
- Upgrade to KaTeX v0.16.22 ([#1048](https://github.com/jpanther/congo/pull/1048))
- Upgrade to ChartJS v4.5.0 ([#1052](https://github.com/jpanther/congo/pull/1052), [#1067](https://github.com/jpanther/congo/pull/1067))
- Updated Czech translation ([#1055](https://github.com/jpanther/congo/pull/1055))
### Fixed
- Shortcodes placed after code blocks with line numbers are rendered with incorrect spacing ([#987](https://github.com/jpanther/congo/issues/987))
- Some localised date formats would be incorrectly formatted as Markdown ([#1028](https://github.com/jpanther/congo/pull/1028))
- Anchor links in articles displayed incorrectly in dark mode ([#1041](https://github.com/jpanther/congo/pull/1041))
- Error building site due to template system changes in Hugo v0.146.0 or later ([#1049](https://github.com/jpanther/congo/issues/1049))
- Article sharing links for LINE contained invalid URLs ([#1065](https://github.com/jpanther/congo/pull/1065))
## [2.11.0] - 2025-02-24
+2 -2
View File
@@ -2973,9 +2973,9 @@ code {
background-color: rgba(var(--color-primary-900), var(--tw-bg-opacity, 1));
}
.group:hover .dark\:group-hover\:text-neutral-700:is(.dark *) {
.group:hover .dark\:group-hover\:text-primary-700:is(.dark *) {
--tw-text-opacity: 1;
color: rgba(var(--color-neutral-700), var(--tw-text-opacity, 1));
color: rgba(var(--color-primary-700), var(--tw-text-opacity, 1));
}
.group:hover .dark\:group-hover\:text-primary-400:is(.dark *) {
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2024 Fonticons, Inc. --><path d="M299.9 191.2c5.1 37.3-4.7 79-35.9 100.7-22.3 15.5-52.8 14.1-70.8 5.7-37.1-17.3-49.5-58.6-46.8-97.2 4.3-60.9 40.9-87.9 75.3-87.5 46.9-.2 71.8 31.8 78.2 78.3zM448 88v336c0 30.9-25.1 56-56 56H56c-30.9 0-56-25.1-56-56V88c0-30.9 25.1-56 56-56h336c30.9 0 56 25.1 56 56zM330 313.2s-.1-34-.1-217.3h-29v40.3c-.8.3-1.2-.5-1.6-1.2-9.6-20.7-35.9-46.3-76-46-51.9.4-87.2 31.2-100.6 77.8-4.3 14.9-5.8 30.1-5.5 45.6 1.7 77.9 45.1 117.8 112.4 115.2 28.9-1.1 54.5-17 69-45.2.5-1 1.1-1.9 1.7-2.9.2.1.4.1.6.2.3 3.8.2 30.7.1 34.5-.2 14.8-2 29.5-7.2 43.5-7.8 21-22.3 34.7-44.5 39.5-17.8 3.9-35.6 3.8-53.2-1.2-21.5-6.1-36.5-19-41.1-41.8-.3-1.6-1.3-1.3-2.3-1.3h-26.8c.8 10.6 3.2 20.3 8.5 29.2 24.2 40.5 82.7 48.5 128.2 37.4 49.9-12.3 67.3-54.9 67.4-106.3z" fill="currentColor"></path></svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+666 -344
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -52,7 +52,7 @@
"line": {
"icon": "line",
"title": "sharing.line",
"url": "https://line.me/R/share?text=%s%s"
"url": "https://line.me/R/share?text=%s%%20%s"
},
"weibo": {
"icon": "weibo",
@@ -25,6 +25,7 @@ Front matter parameter default values are inherited from the theme's [base confi
|`thumbnail`|`"*thumb*"`_|The text pattern to match the thumbnail image filename for this article.|
|`thumbnailAlt`|`featureAlt`|The alternative text description for the thumbnail image.|
|`externalUrl`|_Not set_|If this article is published on a third-party website, the URL to this article. Providing a URL will prevent a content page being generated and any references to this article will link directly to the third-party website.|
|`canonicalUrl`|`.Permalink`|When set, this overrides the canonical URL metadata for the article.|
|`editURL`|`article.editURL`|When `showEdit` is active, the URL for the edit link.|
|`editAppendPath`|`article.editAppendPath`|When `showEdit` is active, whether or not the path to the current article should be appended to the URL set at `editURL`.|
|`groupByYear`|`list.groupByYear`|Whether or not articles are grouped by year on list pages.|
@@ -95,7 +95,7 @@ jobs:
publish = "public"
[build.environment]
HUGO_VERSION = "0.118.2"
HUGO_VERSION = "0.147.8"
NODE_ENV = "production"
GO_VERSION = "1.20"
TZ = "UTC" # Set to preferred timezone
@@ -100,7 +100,7 @@ Then in the root of your site repository, create a `netlify.toml` file:
publish = "public"
[build.environment]
HUGO_VERSION = "0.144.2"
HUGO_VERSION = "0.147.8"
NODE_ENV = "production"
TZ = "UTC" # Set to preferred timezone
@@ -99,7 +99,7 @@ jobs:
publish = "public"
[build.environment]
HUGO_VERSION = "0.118.2"
HUGO_VERSION = "0.147.8"
NODE_ENV = "production"
GO_VERSION = "1.20"
TZ = "UTC" # Set to preferred timezone
@@ -1,7 +1,7 @@
---
title: "Icons"
date: 2020-08-14
lastmod: 2023-01-23
lastmod: 2025-05-04
draft: false
description: "Icon-Unterstützung in Congo."
slug: "icons"
@@ -40,6 +40,7 @@ Die vollständige Liste der integrierten Icons und ihre entsprechenden Namen fin
| github | {{< icon github >}} |
| gitlab | {{< icon gitlab >}} |
| globe | {{< icon globe >}} |
| goodreads | {{< icon goodreads >}} |
| google | {{< icon google >}} |
| google-scholar | {{< icon google-scholar >}} |
| hashnode | {{< icon hashnode >}} |
@@ -86,6 +87,6 @@ Die vollständige Liste der integrierten Icons und ihre entsprechenden Namen fin
| weibo | {{< icon weibo >}} |
| whatsapp | {{< icon whatsapp >}} |
| x-twitter | {{< icon x-twitter >}} |
| xmark | {{< icon xmark >}} |
| xing | {{< icon xing >}} |
| xmark | {{< icon xmark >}} |
| youtube | {{< icon youtube >}} |
@@ -1,7 +1,7 @@
---
title: "Iconos"
date: 2020-08-14
lastmod: 2023-01-23
lastmod: 2025-05-04
draft: false
description: Soporte de iconos en Congo."
slug: "icons"
@@ -40,6 +40,7 @@ La lista completa de íconos incorporados y sus nombres correspondientes se pued
| github | {{< icon github >}} |
| gitlab | {{< icon gitlab >}} |
| globe | {{< icon globe >}} |
| goodreads | {{< icon goodreads >}} |
| google | {{< icon google >}} |
| google-scholar | {{< icon google-scholar >}} |
| hashnode | {{< icon hashnode >}} |
@@ -86,6 +87,6 @@ La lista completa de íconos incorporados y sus nombres correspondientes se pued
| weibo | {{< icon weibo >}} |
| whatsapp | {{< icon whatsapp >}} |
| x-twitter | {{< icon x-twitter >}} |
| xmark | {{< icon xmark >}} |
| xing | {{< icon xing >}} |
| xmark | {{< icon xmark >}} |
| youtube | {{< icon youtube >}} |
@@ -1,7 +1,7 @@
---
title: "アイコン"
date: 2020-08-14
lastmod: 2023-01-23
lastmod: 2025-05-04
draft: false
description: "Congoでサポートされるアイコン"
slug: "icons"
@@ -40,6 +40,7 @@ Congo は[FontAwesome 6](https://fontawesome.com/icons)のアイコンをサポ
| github | {{< icon github >}} |
| gitlab | {{< icon gitlab >}} |
| globe | {{< icon globe >}} |
| goodreads | {{< icon goodreads >}} |
| google | {{< icon google >}} |
| google-scholar | {{< icon google-scholar >}} |
| hashnode | {{< icon hashnode >}} |
@@ -86,6 +87,6 @@ Congo は[FontAwesome 6](https://fontawesome.com/icons)のアイコンをサポ
| weibo | {{< icon weibo >}} |
| whatsapp | {{< icon whatsapp >}} |
| x-twitter | {{< icon x-twitter >}} |
| xmark | {{< icon xmark >}} |
| xing | {{< icon xing >}} |
| xmark | {{< icon xmark >}} |
| youtube | {{< icon youtube >}} |
+3 -2
View File
@@ -1,7 +1,7 @@
---
title: "Icons"
date: 2020-08-14
lastmod: 2023-01-23
lastmod: 2025-05-04
draft: false
description: "Icon support in Congo."
slug: "icons"
@@ -40,6 +40,7 @@ The full list of built-in icons and their corresponding names can referenced bel
| github | {{< icon github >}} |
| gitlab | {{< icon gitlab >}} |
| globe | {{< icon globe >}} |
| goodreads | {{< icon goodreads >}} |
| google | {{< icon google >}} |
| google-scholar | {{< icon google-scholar >}} |
| hashnode | {{< icon hashnode >}} |
@@ -86,6 +87,6 @@ The full list of built-in icons and their corresponding names can referenced bel
| weibo | {{< icon weibo >}} |
| whatsapp | {{< icon whatsapp >}} |
| x-twitter | {{< icon x-twitter >}} |
| xmark | {{< icon xmark >}} |
| xing | {{< icon xing >}} |
| xmark | {{< icon xmark >}} |
| youtube | {{< icon youtube >}} |
@@ -1,7 +1,7 @@
---
title: "图标"
date: 2020-08-14
lastmod: 2023-01-23
lastmod: 2025-05-04
draft: false
description: "Congo中的图标支持"
slug: "icons"
@@ -40,6 +40,7 @@ Congo内置了对多个[FontAwesome 6](https://fontawesome.com/icons)图标的
| github | {{< icon github >}} |
| gitlab | {{< icon gitlab >}} |
| globe | {{< icon globe >}} |
| goodreads | {{< icon goodreads >}} |
| google | {{< icon google >}} |
| hashnode | {{< icon hashnode >}} |
| instagram | {{< icon instagram >}} |
@@ -81,6 +82,6 @@ Congo内置了对多个[FontAwesome 6](https://fontawesome.com/icons)图标的
| twitter | {{< icon twitter >}} |
| whatsapp | {{< icon whatsapp >}} |
| x-twitter | {{< icon x-twitter >}} |
| xmark | {{< icon xmark >}} |
| xing | {{< icon xing >}} |
| xmark | {{< icon xmark >}} |
| youtube | {{< icon youtube >}} |
+1
View File
@@ -87,6 +87,7 @@ The list below is just a handful of the websites that are built using the Congo
| [bitingbytes.de](https://bitingbytes.de) | Personal Site and Blog |
| [janela.digital](https://janela.digital/) | Personal Blog (in Portuguese) |
| [leavex.eu](https://leavex.eu) | Leave X Campaign Site |
| [andreaceccanti.com](https://andreaceccanti.com) | Personal Site (in Italian) |
| [cmp1315.com](https://cmp1315.com/) | Site for medical center |
**Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md).
+9 -9
View File
@@ -11,7 +11,7 @@ article:
table_of_contents: "Obsah"
word_count:
one: "{{ .Count }} slovo"
other: "{{ .Count }} slova"
other: "{{ .Count }} slov"
author:
byline_title: "Autor"
@@ -26,22 +26,22 @@ error:
404_description: "Zdá se, že požadovaná stránka neexistuje."
footer:
dark_appearance: "Přepněte na tmavý vzhled"
light_appearance: "Přepněte na světlý vzhled"
powered_by: "Poháněno {{ .Hugo }} &amp; {{ .Congo }}"
dark_appearance: "Přepněte na tmavý režim"
light_appearance: "Přepněte na světlý režim"
powered_by: "Využívá {{ .Hugo }} &amp; {{ .Congo }}"
list:
externalurl_title: "Odkaz na externí stránky"
no_articles: "Zde zatím nejsou k dispozici žádné články."
externalurl_title: "Odkaz na externí stránku"
no_articles: "Zatím zde nejsou k dispozici žádné články."
nav:
scroll_to_top_title: "Přejděte nahoru"
skip_to_main: "Přet na hlavní obsah"
scroll_to_top_title: "Zpět na začátek"
skip_to_main: "Přeskočit na hlavní obsah"
search:
open_button_title: "Vyhledávání (/)"
close_button_title: "Zavřít (Esc)"
input_placeholder: "Hledej"
input_placeholder: "Vyhledávání"
sharing:
email: "Odeslat e-mailem"
+4 -4
View File
@@ -1,5 +1,5 @@
{{- partial "partials/functions/warnings.html" .Site -}}
{{- partial "partials/functions/init.html" . -}}
{{- partial "functions/warnings.html" .Site -}}
{{- partial "functions/init.html" . -}}
<!doctype html>
<html
lang="{{- site.Language.LanguageCode | default "" -}}"
@@ -20,11 +20,11 @@
>{{ i18n "nav.skip_to_main" }}</a
>
</div>
{{ $header := print "partials/header/" .Site.Params.header.layout ".html" }}
{{ $header := print "header/" .Site.Params.header.layout ".html" }}
{{ if templates.Exists $header }}
{{ partial $header . }}
{{ else }}
{{ partial "partials/header/basic.html" . }}
{{ partial "header/basic.html" . }}
{{ end }}
<div class="relative flex grow flex-col">
<main id="main-content" class="grow">
+2 -2
View File
@@ -1,8 +1,8 @@
{{ define "main" }}
{{ $partial := print "partials/home/" .Site.Params.homepage.layout ".html" }}
{{ $partial := print "home/" .Site.Params.homepage.layout ".html" }}
{{ if templates.Exists $partial }}
{{ partial $partial . }}
{{ else }}
{{ partial "partials/home/page.html" . }}
{{ partial "home/page.html" . }}
{{ end }}
{{ end }}
+8 -2
View File
@@ -94,7 +94,11 @@
{{ with .Params.robots }}
<meta name="robots" content="{{ . }}" />
{{ end }}
<link rel="canonical" href="{{ .Permalink }}" />
{{ if .Params.canonicalUrl }}
<link rel="canonical" href="{{ .Params.canonicalUrl }}" />
{{ else }}
<link rel="canonical" href="{{ .Permalink }}" />
{{ end }}
{{ range .AlternativeOutputFormats -}}
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .RelPermalink ($.Site.Title | emojify) | safeHTML }}
{{ end -}}
@@ -129,7 +133,9 @@
{{/* Schema */}}
{{ partial "schema.html" . }}
{{/* Me */}}
{{ with .Site.Language.Params.Author.name }}<meta name="author" content="{{ . }}" />{{ end }}
{{ with .Site.Language.Params.Author.name }}
<meta name="author" content="{{ . }}" />
{{ end }}
{{ with .Site.Language.Params.Author.links }}
{{ range $links := . }}
{{ range $name, $url := $links }}<link href="{{ $url }}" rel="me" />{{ end }}
+1 -1
View File
@@ -1,4 +1,4 @@
<time datetime="{{ . }}">
{{- i18n "article.date_updated" (dict "Date" (partial "functions/date.html" .)) | markdownify | emojify -}}
{{- i18n "article.date_updated" (dict "Date" (partial "functions/date.html" .)) | emojify -}}
</time>
{{- /* Trim EOF */ -}}
+1 -1
View File
@@ -1,4 +1,4 @@
<time datetime="{{ . }}">
{{- i18n "article.date" (dict "Date" (partial "functions/date.html" .)) | markdownify | emojify -}}
{{- i18n "article.date" (dict "Date" (partial "functions/date.html" .)) | emojify -}}
</time>
{{- /* Trim EOF */ -}}
+1 -1
View File
@@ -1,5 +1,5 @@
{{ if .Get "default" }}
{{ template "_internal/shortcodes/figure.html" . }}
{{ template "_shortcodes/figure.html" . }}
{{ else }}
{{ $url := urls.Parse (.Get "src") }}
{{ $altText := .Get "alt" }}
+1 -1
View File
@@ -3,7 +3,7 @@
publish = "exampleSite/public"
[build.environment]
HUGO_VERSION = "0.144.2"
HUGO_VERSION = "0.147.8"
HUGO_THEMESDIR = "../.."
HUGO_THEME = "repo"
TZ = "Australia/Melbourne"
+378 -631
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -31,11 +31,11 @@
"homepage": "https://github.com/jpanther/congo#readme",
"devDependencies": {
"@tailwindcss/typography": "^0.5.16",
"chart.js": "^4.4.8",
"chart.js": "^4.5.0",
"fuse.js": "^7.1.0",
"jsdom": "^26.0.0",
"katex": "^0.16.21",
"mermaid": "^11.4.1",
"jsdom": "^26.1.0",
"katex": "^0.16.22",
"mermaid": "^11.7.0",
"prettier": "^3.5.3",
"prettier-plugin-go-template": "^0.0.15",
"prettier-plugin-tailwindcss": "^0.6.11",