From c3634e6ccdaa3930666b448d2b4ca9f2ec13a51f Mon Sep 17 00:00:00 2001 From: Cody Brownstein <25962175+cbrownstein@users.noreply.github.com> Date: Thu, 15 Apr 2021 21:23:18 -0700 Subject: [PATCH 1/3] Join lines in head for hljs assets (#360) Fixes errors in lower hugo versions Error: add site dependencies: load resources: loading templates: "site/themes/hugo-PaperMod/layouts/partials/head.html:79:1": parse failed: template: partials/head.html:79: unexpected unclosed action in command --- layouts/partials/head.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 042f9dd..b4fccfb 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -76,8 +76,7 @@ {{- $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" | minify | -fingerprint }} +{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }} {{- else }} From 98c17559e9c15f6ee64515f75ec22a2895b8a01f Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 16 Apr 2021 10:00:08 +0530 Subject: [PATCH 2/3] Add checks for adding the copy button in code-blocks - adds checks to put copy button for code inside table and highlight code block - Fixes #363 --- assets/css/common/main.css | 5 +++-- layouts/partials/footer.html | 12 +++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index eb2c4c8..82b6124 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -44,7 +44,7 @@ code { direction: ltr; } -div.highlight { +div.highlight, pre { position: relative; } @@ -60,6 +60,7 @@ div.highlight { font-size: 14px; } -div.highlight:hover .copy-code { +div.highlight:hover .copy-code, +pre:hover .copy-code { display: block; } diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 1badd4a..2c6511b 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -120,7 +120,17 @@ selection.removeRange(range); }); - container.appendChild(copybutton); + if (container.classList.contains("highlight")) { + container.appendChild(copybutton); + } else if (container.parentNode.firstChild == container) { + // td containing LineNos + } else if (codeblock.parentNode.parentNode.parentNode.parentNode.parentNode.nodeName == "TABLE") { + // table containing LineNos and code + codeblock.parentNode.parentNode.parentNode.parentNode.parentNode.appendChild(copybutton); + } else { + // code blocks not having highlight as parent class + codeblock.parentNode.appendChild(copybutton); + } }); {{- end }} From d1360632299a432d14e6eb5232400e371c72e340 Mon Sep 17 00:00:00 2001 From: Geeqla Date: Sat, 17 Apr 2021 06:55:04 +0200 Subject: [PATCH 3/3] Add custom alt title in Multilingual Mode + Add fallback based on LanguageName with emojify (#364) --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 52d470f..e23db22 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -123,7 +123,7 @@ {{- range . -}} {{- if ne $lang .Lang }}
  • - {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} {{- .Language.LanguageName | emojify -}}