From e9914bf9bb58c428bff1d3ddd62c6e66c64dc1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Wed, 13 Nov 2024 18:39:36 +0100 Subject: [PATCH] Move most assets from `/static` to `/assets` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows to only serve the file that we actually use. Signed-off-by: Kévin Commaille --- {static => assets}/css/fonts/Inter.css | 0 {static => assets}/css/fonts/README.md | 2 +- .../css/fonts/download_google_fonts_css.py | 0 {static => assets}/css/fonts/requirements.txt | 0 {static => assets}/diagrams/README.md | 0 {static => assets}/diagrams/membership.drawio | 0 {static => assets}/diagrams/membership.png | Bin .../diagrams/threaded-dag-threads.drawio | 0 .../diagrams/threaded-dag-threads.png | Bin {static => assets}/diagrams/threaded-dag.drawio | 0 {static => assets}/diagrams/threaded-dag.png | Bin {static => assets}/js/toc.js | 0 config.toml | 9 --------- layouts/partials/hooks/body-end.html | 4 ++-- layouts/partials/hooks/head-end.html | 5 +++-- 15 files changed, 6 insertions(+), 14 deletions(-) rename {static => assets}/css/fonts/Inter.css (100%) rename {static => assets}/css/fonts/README.md (97%) rename {static => assets}/css/fonts/download_google_fonts_css.py (100%) rename {static => assets}/css/fonts/requirements.txt (100%) rename {static => assets}/diagrams/README.md (100%) rename {static => assets}/diagrams/membership.drawio (100%) rename {static => assets}/diagrams/membership.png (100%) rename {static => assets}/diagrams/threaded-dag-threads.drawio (100%) rename {static => assets}/diagrams/threaded-dag-threads.png (100%) rename {static => assets}/diagrams/threaded-dag.drawio (100%) rename {static => assets}/diagrams/threaded-dag.png (100%) rename {static => assets}/js/toc.js (100%) diff --git a/static/css/fonts/Inter.css b/assets/css/fonts/Inter.css similarity index 100% rename from static/css/fonts/Inter.css rename to assets/css/fonts/Inter.css diff --git a/static/css/fonts/README.md b/assets/css/fonts/README.md similarity index 97% rename from static/css/fonts/README.md rename to assets/css/fonts/README.md index aca33304..8c939e26 100644 --- a/static/css/fonts/README.md +++ b/assets/css/fonts/README.md @@ -16,7 +16,7 @@ load them. Example call: ```sh python3 download_google_fonts_css.py \ "https://fonts.googleapis.com/css?family=Inter:300,300i,400,400i,700,700i" \ - ../../fonts \ + ../../../static/fonts \ ../../fonts ``` diff --git a/static/css/fonts/download_google_fonts_css.py b/assets/css/fonts/download_google_fonts_css.py similarity index 100% rename from static/css/fonts/download_google_fonts_css.py rename to assets/css/fonts/download_google_fonts_css.py diff --git a/static/css/fonts/requirements.txt b/assets/css/fonts/requirements.txt similarity index 100% rename from static/css/fonts/requirements.txt rename to assets/css/fonts/requirements.txt diff --git a/static/diagrams/README.md b/assets/diagrams/README.md similarity index 100% rename from static/diagrams/README.md rename to assets/diagrams/README.md diff --git a/static/diagrams/membership.drawio b/assets/diagrams/membership.drawio similarity index 100% rename from static/diagrams/membership.drawio rename to assets/diagrams/membership.drawio diff --git a/static/diagrams/membership.png b/assets/diagrams/membership.png similarity index 100% rename from static/diagrams/membership.png rename to assets/diagrams/membership.png diff --git a/static/diagrams/threaded-dag-threads.drawio b/assets/diagrams/threaded-dag-threads.drawio similarity index 100% rename from static/diagrams/threaded-dag-threads.drawio rename to assets/diagrams/threaded-dag-threads.drawio diff --git a/static/diagrams/threaded-dag-threads.png b/assets/diagrams/threaded-dag-threads.png similarity index 100% rename from static/diagrams/threaded-dag-threads.png rename to assets/diagrams/threaded-dag-threads.png diff --git a/static/diagrams/threaded-dag.drawio b/assets/diagrams/threaded-dag.drawio similarity index 100% rename from static/diagrams/threaded-dag.drawio rename to assets/diagrams/threaded-dag.drawio diff --git a/static/diagrams/threaded-dag.png b/assets/diagrams/threaded-dag.png similarity index 100% rename from static/diagrams/threaded-dag.png rename to assets/diagrams/threaded-dag.png diff --git a/static/js/toc.js b/assets/js/toc.js similarity index 100% rename from static/js/toc.js rename to assets/js/toc.js diff --git a/config.toml b/config.toml index 581214b2..2494ad1e 100644 --- a/config.toml +++ b/config.toml @@ -134,15 +134,6 @@ sidebar_menu_compact = true [[module.imports]] path = "github.com/matrix-org/docsy" disable = false - # Mounting /assets and /static as assets directories helps Hugo to generate - # the correct URL. - [[module.mounts]] - source = 'assets' - target = 'assets' - [[module.mounts]] - source = 'static' - target = 'assets' - # custom output formats diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html index 377470d9..5848b74f 100644 --- a/layouts/partials/hooks/body-end.html +++ b/layouts/partials/hooks/body-end.html @@ -13,5 +13,5 @@ in the document. */}} - - +{{ $toc := resources.Get "js/toc.js" -}} + diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html index c0153669..2284701b 100644 --- a/layouts/partials/hooks/head-end.html +++ b/layouts/partials/hooks/head-end.html @@ -13,5 +13,6 @@ Google Fonts manually via a script: https://github.com/matrix-org/matrix-spec/tree/main/static/css/fonts */}} - - +{{ $inter := resources.Get "css/fonts/Inter.css" -}} + +