From e1532f0ff7eb422f9e4b09881bfbcb9c15355e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 30 Mar 2026 11:48:12 +0200 Subject: [PATCH 1/4] Upgrade docsy to WIP branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- go.mod | 2 ++ go.sum | 2 ++ 2 files changed, 4 insertions(+) diff --git a/go.mod b/go.mod index 6b13c46b..862b982e 100644 --- a/go.mod +++ b/go.mod @@ -3,3 +3,5 @@ module github.com/matrix-org/matrix-spec go 1.12 require github.com/matrix-org/docsy v0.0.0-20260106184755-71d103ebb20a // indirect + +replace github.com/matrix-org/docsy v0.0.0-20260106184755-71d103ebb20a => github.com/zecakeh/matrix-org-docsy v0.0.0-20260330090302-c8561ffa244e diff --git a/go.sum b/go.sum index 3897374a..53acbb2b 100644 --- a/go.sum +++ b/go.sum @@ -2,3 +2,5 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod h1 github.com/matrix-org/docsy v0.0.0-20260106184755-71d103ebb20a h1:WB3unuZJy7ewAf33sxbtEwYnC+i+Jt1sJpAR3BtzvEo= github.com/matrix-org/docsy v0.0.0-20260106184755-71d103ebb20a/go.mod h1:mdn1m5HJug6ZddQgrOyCrXNegbtdl5evHiqqbEQLzdI= github.com/twbs/bootstrap v5.3.8+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= +github.com/zecakeh/matrix-org-docsy v0.0.0-20260330090302-c8561ffa244e h1:6fDwyGJlfkiuxC4NERnqasxv77+26zA0yL9TAD79MrY= +github.com/zecakeh/matrix-org-docsy v0.0.0-20260330090302-c8561ffa244e/go.mod h1:mdn1m5HJug6ZddQgrOyCrXNegbtdl5evHiqqbEQLzdI= From a9c34473a02e55cf4e8708564cb5412a1c1b0fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 30 Mar 2026 11:49:20 +0200 Subject: [PATCH 2/4] Upgrade Hugo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Docsy 0.14 requires at least Hugo 0.155. Signed-off-by: Kévin Commaille --- .github/workflows/main.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92b841f4..587a9aa9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: "Spec" env: - HUGO_VERSION: 0.153.3 + HUGO_VERSION: 0.155.3 PYTHON_VERSION: 3.13 NODE_VERSION: 24 diff --git a/README.md b/README.md index 0678713b..9e553a8b 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ place after an MSC has been accepted, not as part of a proposal itself. 1. Install the extended version (often the OS default) of Hugo: . Note that at least Hugo - v0.146.0 is required. + v0.155.0 is required. Alternatively, use the Docker image at https://hub.docker.com/r/klakegg/hugo/. (The "extended edition" is required From 27074f78466570595ddb50331e9e992aeb766ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 30 Mar 2026 11:49:51 +0200 Subject: [PATCH 3/4] Update modified docsy partials MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To reflect changes from upstream. Signed-off-by: Kévin Commaille --- layouts/_markup/render-heading.html | 2 +- layouts/_partials/navbar.html | 8 ++++---- layouts/_partials/sidebar-tree.html | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/layouts/_markup/render-heading.html b/layouts/_markup/render-heading.html index d16aac8f..6b11f3ea 100644 --- a/layouts/_markup/render-heading.html +++ b/layouts/_markup/render-heading.html @@ -1,7 +1,7 @@ {{- /* This is a heading render hook (https://gohugo.io/render-hooks/headings/) - using Docsy's heading self-links hook (https://www.docsy.dev/docs/adding-content/navigation/#heading-self-links). + using Docsy's heading self-links hook (https://www.docsy.dev/docs/content/navigation/#heading-self-links). This is used when a heading is encountered in markdown content to generate the HTML for that heading. A self-link anchor is added at the end of the diff --git a/layouts/_partials/navbar.html b/layouts/_partials/navbar.html index 0a563d8f..6e7c8836 100644 --- a/layouts/_partials/navbar.html +++ b/layouts/_partials/navbar.html @@ -2,7 +2,6 @@ A copy of the navbar.html partial in Docsy, modified to: - * remove `data-bs-theme` at L20, otherwise the title disappears on hover. * replace the site title with "specification" at L31. * include the spec version from the config at L34-35, which is calculated using an inline `version-string` partial. @@ -16,7 +15,8 @@ {{ $baseURL := urls.Parse $.Site.Params.Baseurl -}}