From e21a3141ca659bf6140dc1350b4552b6ddddf357 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Thu, 5 May 2022 08:39:57 +0200 Subject: Add Highlight.js support --- layouts/partials/custom-scripts.html | 5 +++++ layouts/partials/head.html | 5 +++-- layouts/partials/hljs.html | 15 +++++++++++++++ layouts/partials/scripts.html | 1 - layouts/partials/styles.html | 27 ++++++++++++++++++++------- 5 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 layouts/partials/custom-scripts.html create mode 100644 layouts/partials/hljs.html delete mode 100644 layouts/partials/scripts.html (limited to 'layouts/partials') diff --git a/layouts/partials/custom-scripts.html b/layouts/partials/custom-scripts.html new file mode 100644 index 0000000..c275701 --- /dev/null +++ b/layouts/partials/custom-scripts.html @@ -0,0 +1,5 @@ +{{- /* Head custom scripts area start */ -}} +{{- /* A partial to be overwritten by the user. */ -}} +{{- /* Simply place a custom-scripts.html into your local /layouts/partials-directory. */ -}} +{{- /* Its content will appear before any scripts in . */ -}} +{{- /* Head custom scripts area end */ -}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 7d06d79..f11c57d 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -16,8 +16,9 @@ {{ hugo.Generator }} - {{ partial "styles.html" . -}} - {{ partial "scripts.html" . -}} + {{- partial "styles.html" . }} + {{- partial "hljs.html" . }} + {{- partial "custom-scripts.html" . }} {{- /* Favicons */}} diff --git a/layouts/partials/hljs.html b/layouts/partials/hljs.html new file mode 100644 index 0000000..db01de9 --- /dev/null +++ b/layouts/partials/hljs.html @@ -0,0 +1,15 @@ +{{- /* Highlight.js */}} +{{- $isHLJSdisabled := (site.Params.assets.disable_highlight_js | default .Params.disable_highlight_js ) }} +{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} + {{- if not site.Params.assets.disable_fingerprinting }} + {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }} + + {{- else }} + {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} + + {{- end }} +{{- end }} + diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html deleted file mode 100644 index e6462a9..0000000 --- a/layouts/partials/scripts.html +++ /dev/null @@ -1 +0,0 @@ -{{/* For Users's overwrite */}} diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html index f50dad5..af7c709 100644 --- a/layouts/partials/styles.html +++ b/layouts/partials/styles.html @@ -1,8 +1,21 @@ -{{- $sass := resources.Get "sass/style.scss" -}} +{{- /* Styles */}} +{{- $theme := resources.Get "sass/style.scss" | resources.ToCSS }} + +{{- /* include hljs' css if hljs is on */}} +{{- $isHLJSdisabled := (site.Params.assets.disable_highlight_js | default false) }} +{{- $hljs := (cond ($isHLJSdisabled) (" " | resources.FromString "assets/css/hljs-blank.css") (resources.Get "css/hljs/hljs-default.min.css")) }} + +{{- /* order is important */}} +{{- $core := (slice $theme $hljs) | resources.Concat "assets/css/core.css" }} +{{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" }} + +{{- /* bundle all required css */}} +{{- /* Add extended css after theme style */ -}} +{{- $stylesheet := (slice $core $extended) | resources.Concat "assets/css/stylesheet.css" | minify }} + {{- if not site.Params.assets.disable_fingerprinting -}} -{{- $style := $sass | resources.ToCSS | minify | fingerprint -}} - -{{- else -}} -{{- $style := $sass | resources.ToCSS | minify -}} - -{{- end -}} + {{- $stylesheet := $stylesheet | fingerprint }} + {{ printf `` $stylesheet.RelPermalink $stylesheet.Data.Integrity | safeHTML }} +{{- else }} + +{{- end }} -- cgit v1.2.3