From a275123be2b1d528dbde23beb9880933c4e22c3e Mon Sep 17 00:00:00 2001
From: DhammaCharts <100090806+DhammaCharts@users.noreply.github.com>
Date: Thu, 02 Jun 2022 07:35:28 +0000
Subject: [PATCH] better font behaviour
---
layouts/partials/head.html | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2da259d..ba02260 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -5,31 +5,44 @@
name="description"
content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
/>
- <title>{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{ end }}</title>
+ <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="{{$.Site.BaseURL}}/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"
/>
- {{$sass := resources.Match "styles/[!_]*.scss" }} {{$css := slice }} {{range $sass}} {{$scss := .
- | resources.ToCSS (dict "outputStyle" "compressed") }} {{$css = $css | append $scss}} {{end}}
- {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" |
- resources.Minify }}
+ {{$sass := resources.Match "styles/[!_]*.scss" }}
+ {{$css := slice }}
+ {{range $sass}}
+ {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
+ {{$css = $css | append $scss}}
+ {{end}}
+ {{$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" .}} {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint
- "md5" | resources.Minify }}
+ {{partial "katex.html" .}}
+
+ {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
+ resources.Minify }}
<script src="{{$popover.Permalink}}"></script>
<!-- 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 }}
+ {{$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([
@@ -49,23 +62,37 @@
}))
const draw = () => {
- // NOTE: everything within this callback will be executed for every page navigation. This is a good place to put JavaScript that loads or modifies data on the page.
+ const siteBaseURL = new URL({{$.Site.BaseURL}});
+ const pathBase = siteBaseURL.pathname;
+ const pathWindow = window.location.pathname;
+ const isHome = pathBase == pathWindow;
+
+ // NOTE: everything within this callback will be executed for every page navigation. This is a good place to put JavaScript that loads or modifies data on the page.
+ {{if $.Site.Data.config.enableFooter}}
const container = document.getElementById("graph-container")
// retry if the graph is not ready
if (!container) return requestAnimationFrame(draw)
// clear the graph in case there is anything within it
container.textContent = ""
- drawGraph(
- {{strings.TrimRight "/" .Site.BaseURL}},
- {{$.Site.Data.graphConfig.paths}},
- {{$.Site.Data.graphConfig.depth}},
- {{$.Site.Data.graphConfig.enableDrag}},
- {{$.Site.Data.graphConfig.enableLegend}},
- {{$.Site.Data.graphConfig.enableZoom}}
- );
+ if (isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}}) {
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ true,
+ {{$.Site.Data.graphConfig.paths}},
+ {{$.Site.Data.graphConfig.globalGraph}}
+ );
+ } else {
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ false,
+ {{$.Site.Data.graphConfig.paths}},
+ {{$.Site.Data.graphConfig.localGraph}}
+ );
+ }
+ {{end}}
{{if $.Site.Data.config.enableLinkPreview}}
initPopover(
{{strings.TrimRight "/" .Site.BaseURL }},
@@ -84,8 +111,9 @@
{{end}}
};
</script>
- {{if $.Site.Data.config.enableSPA}} {{ $router := resources.Get "js/router.js" |
- resources.Fingerprint "md5" | resources.Minify }}
+ {{if $.Site.Data.config.enableSPA}}
+ {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
+ resources.Minify }}
<script type="module">
import { attachSPARouting } from "{{$router.Permalink}}"
attachSPARouting(draw)
--
Gitblit v1.10.0