From 220485e1b9adcbfb95404934747577a36e6ab1e1 Mon Sep 17 00:00:00 2001 From: matason Date: Fri, 17 Jan 2025 17:15:02 +0000 Subject: [PATCH 1/2] Use css.Sass (resources.ToCss is deprecated) --- layouts/doc/partials/head.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/doc/partials/head.html b/layouts/doc/partials/head.html index f0668a7..c96073a 100644 --- a/layouts/doc/partials/head.html +++ b/layouts/doc/partials/head.html @@ -3,6 +3,6 @@ {{ block "title" . }}{{ with .Params.Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - {{ $style := resources.Get "css/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }} + {{ $style := resources.Get "css/main.scss" | css.Sass | resources.Minify | resources.Fingerprint }} - \ No newline at end of file + From fe11716c3dc4d07524d95ecd45995e70e28f3c89 Mon Sep 17 00:00:00 2001 From: matason Date: Fri, 17 Jan 2025 18:58:46 +0000 Subject: [PATCH 2/2] Fix stylesheet link generation --- ce-dev/ansible/provision.yml | 3 +-- layouts/basic/partials/head.html | 7 ++++--- layouts/doc/partials/head.html | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ce-dev/ansible/provision.yml b/ce-dev/ansible/provision.yml index ea444af..688e9b1 100644 --- a/ce-dev/ansible/provision.yml +++ b/ce-dev/ansible/provision.yml @@ -2,10 +2,9 @@ - hosts: wikis2pages-hugo become: true tasks: - # CSS breaks after v0.122.0 - name: Install Hugo ansible.builtin.apt: - deb: https://github.com/gohugoio/hugo/releases/download/v0.122.0/hugo_extended_0.122.0_linux-amd64.deb + deb: https://github.com/gohugoio/hugo/releases/download/v0.141.0/hugo_extended_0.141.0_linux-amd64.deb state: present - ansible.builtin.include_vars: diff --git a/layouts/basic/partials/head.html b/layouts/basic/partials/head.html index f0668a7..597242a 100644 --- a/layouts/basic/partials/head.html +++ b/layouts/basic/partials/head.html @@ -3,6 +3,7 @@ {{ block "title" . }}{{ with .Params.Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - {{ $style := resources.Get "css/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }} - - \ No newline at end of file + {{ $style := resources.Get "css/main.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ $href := replace $style.Permalink .Site.BaseURL "/" }} + + diff --git a/layouts/doc/partials/head.html b/layouts/doc/partials/head.html index c96073a..597242a 100644 --- a/layouts/doc/partials/head.html +++ b/layouts/doc/partials/head.html @@ -4,5 +4,6 @@ {{ block "title" . }}{{ with .Params.Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} {{ $style := resources.Get "css/main.scss" | css.Sass | resources.Minify | resources.Fingerprint }} - + {{ $href := replace $style.Permalink .Site.BaseURL "/" }} +