diff options
Diffstat (limited to 'themes/PaperMod/layouts/partials/head.html')
| -rw-r--r-- | themes/PaperMod/layouts/partials/head.html | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/themes/PaperMod/layouts/partials/head.html b/themes/PaperMod/layouts/partials/head.html index 35257fc..3e55c67 100644 --- a/themes/PaperMod/layouts/partials/head.html +++ b/themes/PaperMod/layouts/partials/head.html @@ -55,12 +55,12 @@ {{- $license_css := (resources.Get "css/core/license.css") }} {{- $common := (resources.Match "css/common/*.css") | resources.Concat "assets/css/common.css" }} -{{- /* include `an-old-hope` if hljs is on */}} -{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default false) }} -{{- $hljs := (cond ($isHLJSdisabled) (".chroma { background-color: unset !important;}" | resources.FromString "assets/css/hljs-blank.css") (resources.Get "css/hljs/an-old-hope.min.css")) }} +{{- /* markup.highlight.noClasses should be set to `false` */}} +{{- $chroma_styles := (resources.Get "css/includes/chroma-styles.css") }} +{{- $chroma_mod := (resources.Get "css/includes/chroma-mod.css") }} {{- /* order is important */}} -{{- $core := (slice $theme_vars $reset $common $hljs $includes_all $media) | resources.Concat "assets/css/core.css" | resources.Minify }} +{{- $core := (slice $theme_vars $reset $common $chroma_styles $chroma_mod $includes_all $media) | resources.Concat "assets/css/core.css" | resources.Minify }} {{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" | resources.Minify }} {{- /* bundle all required css */}} @@ -89,19 +89,6 @@ {{- end }} {{- end -}} -{{- /* Highlight.js */}} -{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} -{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} -{{- if not site.Params.assets.disableFingerprinting }} -{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | fingerprint }} -<script defer crossorigin="anonymous" src="{{ $highlight.RelPermalink }}" integrity="{{ $highlight.Data.Integrity }}" - onload="hljs.initHighlightingOnLoad();"></script> -{{- else }} -{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" }} -<script defer crossorigin="anonymous" src="{{ $highlight.RelPermalink }}" onload="hljs.initHighlightingOnLoad();"></script> -{{- end }} -{{- end }} - {{- /* Favicons */}} <link rel="icon" href="{{ site.Params.assets.favicon | default "favicon.ico" | absURL }}"> <link rel="icon" type="image/png" sizes="16x16" href="{{ site.Params.assets.favicon16x16 | default "favicon-16x16.png" | absURL }}"> @@ -137,7 +124,7 @@ --secondary: rgb(155, 156, 157); --tertiary: rgb(65, 66, 68); --content: rgb(196, 196, 197); - --hljs-bg: rgb(46, 46, 51); + --code-block-bg: rgb(46, 46, 51); --code-bg: rgb(55, 56, 62); --border: rgb(51, 51, 51); } |