diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 6430d0ad..ab41ec02 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -46,7 +46,7 @@ jobs: --output data/publications.json - name: Restore build cache - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: path: ${{ env.HUGO_CACHE_HOST_DIR }} key: hugo-${{ runner.os }}-${{ github.run_id }} @@ -69,7 +69,7 @@ jobs: - name: Save build cache if: always() - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 with: path: ${{ env.HUGO_CACHE_HOST_DIR }} key: hugo-${{ runner.os }}-${{ github.run_id }} diff --git a/AGENTS.md b/AGENTS.md index f223c344..ecf2ad67 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -46,6 +46,10 @@ Agent-generated artifacts must be written under `.agent/`. - Do not store secrets, tokens, or private credentials. - Use UTC timestamps in checkpoints and handoffs when possible. +## Static asset paths + +- Prefer base-path-safe asset references (`relURL`, relative paths, or equivalent template-aware indirection) over hardcoded root-relative paths like `/images/...` or `/fonts/...` for deployable site assets. + ## Important dependency versions - Hugo (Docker build arg): `0.161.1` (`Dockerfile`) diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss index b70cf32a..7c6eb905 100644 --- a/assets/scss/_variables_project.scss +++ b/assets/scss/_variables_project.scss @@ -8,108 +8,6 @@ $enable-shadows: true; $white: #fff; $black: #000; -// -// Self-hosted font loading (WOFF2 only) -// - -@font-face { - font-family: "Public Sans"; - font-style: normal; - font-weight: 300; - font-display: swap; - src: - local("Public Sans Light"), - local("PublicSans-Light"), - url("/fonts/public-sans/public-sans-latin-300-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "Public Sans"; - font-style: normal; - font-weight: 400; - font-display: swap; - src: - local("Public Sans Regular"), - local("PublicSans-Regular"), - url("/fonts/public-sans/public-sans-latin-400-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "Public Sans"; - font-style: normal; - font-weight: 600; - font-display: swap; - src: - local("Public Sans SemiBold"), - local("PublicSans-SemiBold"), - url("/fonts/public-sans/public-sans-latin-600-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "Source Serif 4"; - font-style: normal; - font-weight: 400; - font-display: swap; - src: - local("Source Serif 4 Regular"), - local("SourceSerif4-Regular"), - url("/fonts/source-serif-4/source-serif-4-latin-400-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "Source Serif 4"; - font-style: normal; - font-weight: 600; - font-display: swap; - src: - local("Source Serif 4 SemiBold"), - local("SourceSerif4-SemiBold"), - url("/fonts/source-serif-4/source-serif-4-latin-600-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "Source Serif 4"; - font-style: normal; - font-weight: 700; - font-display: swap; - src: - local("Source Serif 4 Bold"), - local("SourceSerif4-Bold"), - url("/fonts/source-serif-4/source-serif-4-latin-700-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "IBM Plex Mono"; - font-style: normal; - font-weight: 400; - font-display: swap; - src: - local("IBM Plex Mono"), - local("IBMPlexMono-Regular"), - url("/fonts/ibm-plex-mono/ibm-plex-mono-latin-400-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "IBM Plex Mono"; - font-style: normal; - font-weight: 500; - font-display: swap; - src: - local("IBM Plex Mono Medium"), - local("IBMPlexMono-Medium"), - url("/fonts/ibm-plex-mono/ibm-plex-mono-latin-500-normal.woff2") format("woff2"); -} - -@font-face { - font-family: "IBM Plex Mono"; - font-style: normal; - font-weight: 600; - font-display: swap; - src: - local("IBM Plex Mono SemiBold"), - local("IBMPlexMono-SemiBold"), - url("/fonts/ibm-plex-mono/ibm-plex-mono-latin-600-normal.woff2") format("woff2"); -} $omf-primary: #0f2742; $omf-secondary: #0e7490; diff --git a/content/en/_index.html b/content/en/_index.html index ab908690..efbdbbb9 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -6,7 +6,7 @@ {{< blocks/section color="primary" >}}
- OMF Logo + OMF Logo

The Open Modeling Foundation is an alliance of modeling organizations that coordinates and administers a common, community developed body of standards and best practices among diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 3ef94f6a..b81cb195 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -2,7 +2,7 @@
- Digital Research Alliance of Canada + Digital Research Alliance of Canada
This work was enabled in part by generous support from the Alfred P. Sloan Foundation @@ -11,7 +11,7 @@ {{ with .Site.Params.copyright }}© {{ now.Year }} {{ .}} {{ T "footer_all_rights_reserved" }}{{ end }}
- +
diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html index 5452d53e..638e1722 100644 --- a/layouts/partials/hooks/head-end.html +++ b/layouts/partials/hooks/head-end.html @@ -9,9 +9,84 @@ "fonts/ibm-plex-mono/ibm-plex-mono-latin-400-normal.woff2" -}} + + {{- range $path := $fontPreloads -}} {{- if fileExists (printf "static/%s" $path) -}} - + {{- end -}} {{- end -}}