From d5884aedb7dcd4e7711e53b7b462d1ac0bbc242e Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 05 Apr 2022 21:14:19 +0000
Subject: [PATCH] fix: wikilink patch not applying to transformed text like apostrophes
---
layouts/partials/head.html | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 1afa3c6..195cade 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -4,56 +4,43 @@
<meta name="description" content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}">
<title>{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{ end }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="shortcut icon" type="image/png" href="/icon.png" />
+ <link rel="shortcut icon" type="image/png" href="{{$.Site.BaseURL}}/icon.png" />
<!-- CSS Stylesheets and Fonts -->
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&family=Source+Sans+Pro:wght@400;600;700&family=Fira+Code:wght@400;700&display=swap" rel="stylesheet">
- {{$css := slice "base.scss" "darkmode.scss" "syntax.scss" "custom.scss"}}
- {{range $css}}
- {{$sass := resources.Get . | resources.ToCSS }}
- {{with $sass | minify}}
- <style>
- {{.Content | safeCSS}}
- </style>
+ {{$sass := resources.Match "styles/[!_]*.scss" }}
+ {{$css := slice }}
+ {{range $sass}}
+ {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
+ {{$css = $css | append $scss}}
{{end}}
- {{end}}
+ {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
+ <link href="{{$finalCss.Permalink}}" rel="stylesheet">
- {{- with resources.Get "darkmode.js" | minify -}}
- <script>
- {{.Content | safeJS }}
- </script>
- {{- end -}}
+ {{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" | resources.Minify }}
+ <script src="{{$darkMode.Permalink}}"></script>
+ {{partial "katex.html" .}}
<!-- Preload page vars -->
+ {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint "md5" | resources.Minify | }}
+ {{$contentIndex := resources.Get "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify }}
<script>
- let saved = false
- const fetchData = async () => {
- if (saved) {
- return saved
- } else {
- const promises = [
- fetch("{{ .Site.BaseURL }}/linkIndex.json")
+ const BASE_URL = {{.Site.BaseURL}}
+ const fetchData = Promise.all([
+ fetch("{{ $linkIndex.Permalink }}")
.then(data => data.json())
.then(data => ({
index: data.index,
links: data.links,
})),
- fetch("{{ .Site.BaseURL }}/contentIndex.json")
+ fetch("{{ $contentIndex.Permalink }}")
.then(data => data.json()),
- ]
- const [{index, links}, content] = await Promise.all(promises)
- const res = ({
+ ])
+ .then(([{index, links}, content]) => ({
index,
links,
content,
- })
- saved = res
- return res
- }
-
- }
- fetchData()
+ }))
</script>
</head>
{{ template "_internal/google_analytics.html" . }}
-{{ partial "popover.html" .}}
--
Gitblit v1.10.0