diff --git a/layouts/_partials/defercss.html b/layouts/_partials/defercss.html index 291e2a7..bd5cd8a 100644 --- a/layouts/_partials/defercss.html +++ b/layouts/_partials/defercss.html @@ -1,2 +1,2 @@ - - + + diff --git a/layouts/_partials/head.html b/layouts/_partials/head.html index 173ac41..8676a7b 100644 --- a/layouts/_partials/head.html +++ b/layouts/_partials/head.html @@ -14,8 +14,8 @@ {{ if not (.Site.Params.noCss) }} - {{ $fonts := resources.Get "scss/fonts.scss" | css.Sass | resources.Minify }} - + {{ $fonts := resources.Get "scss/fonts.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ end }} @@ -30,22 +30,25 @@ {{ end -}} - {{ $style := resources.Get "scss/style.scss" | css.Sass | resources.Minify }} - {{ $sidenotes := resources.Get "scss/sidenotes.scss" | css.Sass | resources.Minify }} - {{ $code := resources.Get "scss/code.scss" | css.Sass | resources.Minify }} - {{ $icon := resources.Get "img/favicon.png" }} + {{ $style := resources.Get "scss/style.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ $sidenotes := resources.Get "scss/sidenotes.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ $code := resources.Get "scss/code.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ $icon := resources.Get "img/favicon.png" | resources.Fingerprint }} {{ if not (.Site.Params.noCss) }} - - {{ partial "defercss.html" (dict "url" $sidenotes.Permalink "extra" "") }} - {{ partial "defercss.html" (dict "url" $code.Permalink "extra" "") }} + + {{ partial "defercss.html" (dict "url" $sidenotes.Permalink "integrity" $sidenotes.Data.Integrity "extra" "") }} + {{ partial "defercss.html" (dict "url" $code.Permalink "integrity" $code.Data.Integrity "extra" "") }} {{ end }} - + {{ if .Params.custom_js }} {{ range $customJs := .Params.custom_js }} - + {{ with page.Resources.Get $customJs }} + {{ $customJsResource := . | resources.Fingerprint }} + + {{ end }} {{ end }} {{ end }} @@ -66,14 +69,14 @@ - {{ $katexComponentJs := resources.Get "js/katex-component.js" | resources.Minify }} - + {{ $katexComponentJs := resources.Get "js/katex-component.js" | resources.Minify | resources.Fingerprint }} + - {{ $bergamotHelpers := resources.Get "js/bergamot-helpers.js" | resources.Minify }} - - {{ $bergamotStyle := resources.Get "scss/bergamot.scss" | css.Sass | resources.Minify }} - {{ partial "defercss.html" (dict "url" $bergamotStyle.Permalink "extra" "") }} + {{ $bergamotHelpers := resources.Get "js/bergamot-helpers.js" | resources.Minify | resources.Fingerprint }} + + {{ $bergamotStyle := resources.Get "scss/bergamot.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ partial "defercss.html" (dict "url" $bergamotStyle.Permalink "integrity" $bergamotStyle.Data.Integrity "extra" "") }} {{ if .Params.bergamot.render_presets }} {{ range $name, $rulefile := .Params.bergamot.render_presets }} {{ $file := default (resources.Get $rulefile) (page.Resources.Get $rulefile) }} diff --git a/layouts/search/single.html b/layouts/search/single.html index eaa0349..40d917d 100644 --- a/layouts/search/single.html +++ b/layouts/search/single.html @@ -2,8 +2,8 @@

{{ .Title }}

{{ .Content }} -{{ $search := resources.Get "scss/search.scss" | css.Sass | resources.Minify }} - +{{ $search := resources.Get "scss/search.scss" | css.Sass | resources.Minify | resources.Fingerprint }} +
diff --git a/layouts/writing/baseof.html b/layouts/writing/baseof.html index 68543c9..ffaa4e3 100644 --- a/layouts/writing/baseof.html +++ b/layouts/writing/baseof.html @@ -4,13 +4,13 @@ {{- partial "head.html" . -}} - {{ $writingcss := resources.Get "scss/writing.scss" | css.Sass | resources.Minify }} - + {{ $writingcss := resources.Get "scss/writing.scss" | css.Sass | resources.Minify | resources.Fingerprint }} + {{ if .Params.custom_css }} {{ range $customCss := .Params.custom_css }} - {{ $renderedCustomCss := page.Resources.Get $customCss | css.Sass (dict "includePaths" (slice "themes/vanilla/assets/scss")) | resources.Minify }} - + {{ $renderedCustomCss := page.Resources.Get $customCss | css.Sass (dict "includePaths" (slice "themes/vanilla/assets/scss")) | resources.Minify | resources.Fingerprint }} + {{ end }} {{ end }}