From fc4b9ded76c31ef940e281d9c1bfda850df23d5d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 05 Apr 2022 06:20:43 +0000
Subject: [PATCH] Merge pull request #94 from meleu/patch-4
---
layouts/partials/head.html | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2f295e9..195cade 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,24 +1,46 @@
<head>
- <link rel="preconnect" href="https://www.googletagmanager.com">
- <link crossorigin rel="preconnect" href="https://www.google-analytics.com">
- {{ template "_internal/google_analytics_async.html" . }}
-
<!-- Meta tags -->
<meta charset="UTF-8">
- <meta name="description" content="{{$.Site.Data.config.description}}">
- <title>{{$.Site.Data.config.page_title}}</title>
+ <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;700&family=Source+Sans+Pro:wght@400;700&family=Fira+Code:wght@400;700&display=swap" rel="stylesheet">
- {{ $css := slice "custom.scss" "base.scss" "darkmode.scss" "syntax.scss"}}
- {{range $css}}
- {{$sass := resources.Get . | resources.ToCSS }}
- {{with $sass | minify}}
- <style>
- {{.Content | safeCSS}}
- </style>
+ <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">
+ {{$sass := resources.Match "styles/[!_]*.scss" }}
+ {{$css := slice }}
+ {{range $sass}}
+ {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
+ {{$css = $css | append $scss}}
{{end}}
- {{end}}
-</head>
\ No newline at end of file
+ {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
+ <link href="{{$finalCss.Permalink}}" rel="stylesheet">
+
+ {{ $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>
+ 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("{{ $contentIndex.Permalink }}")
+ .then(data => data.json()),
+ ])
+ .then(([{index, links}, content]) => ({
+ index,
+ links,
+ content,
+ }))
+ </script>
+</head>
+{{ template "_internal/google_analytics.html" . }}
--
Gitblit v1.10.0