From cb38667c1df7d752a1a9ef45505a7e106ff03ef8 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Fri, 27 Aug 2021 18:08:18 +0000
Subject: [PATCH] Merge branch 'hugo' of https://github.com/jackyzha0/quartz into hugo
---
layouts/_default/single.html | 9 +--------
assets/darkmode.js | 19 +++++++++++--------
content/moc/showcase.md | 3 ++-
layouts/404.html | 8 +-------
layouts/index.html | 8 +-------
layouts/partials/head.html | 8 +++++++-
6 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/assets/darkmode.js b/assets/darkmode.js
index 93bf6da..d95a281 100644
--- a/assets/darkmode.js
+++ b/assets/darkmode.js
@@ -1,14 +1,8 @@
-// Darkmode toggle
-const toggleSwitch = document.querySelector('#darkmode-toggle')
-
const userPref = window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark'
const currentTheme = localStorage.getItem('theme') ?? userPref
if (currentTheme) {
document.documentElement.setAttribute('saved-theme', currentTheme);
- if (currentTheme === 'dark') {
- toggleSwitch.checked = true
- }
}
const switchTheme = (e) => {
@@ -22,5 +16,14 @@
}
}
-// listen for toggle
-toggleSwitch.addEventListener('change', switchTheme, false)
\ No newline at end of file
+window.addEventListener('DOMContentLoaded', () => {
+ // Darkmode toggle
+ const toggleSwitch = document.querySelector('#darkmode-toggle')
+
+ // listen for toggle
+ toggleSwitch.addEventListener('change', switchTheme, false)
+
+ if (currentTheme === 'dark') {
+ toggleSwitch.checked = true
+ }
+})
diff --git a/content/moc/showcase.md b/content/moc/showcase.md
index 00fb18c..e1cb9a1 100644
--- a/content/moc/showcase.md
+++ b/content/moc/showcase.md
@@ -10,5 +10,6 @@
- [Anson Yu's Garden](http://garden.ansonyu.me/)
- [Shihyu's PKM](https://shihyuho.github.io/pkm/)
- [Chloe's Garden](https://garden.chloeabrasada.online/)
+- [SlRvb's Site](https://slrvb.github.io/Site/)
-If you want to see your own on here, submit a [Pull Request adding yourself to this file](https://github.com/jackyzha0/quartz/blob/hugo/content/moc/showcase.md)!
\ No newline at end of file
+If you want to see your own on here, submit a [Pull Request adding yourself to this file](https://github.com/jackyzha0/quartz/blob/hugo/content/moc/showcase.md)!
diff --git a/layouts/404.html b/layouts/404.html
index 8494910..deec3eb 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -11,12 +11,6 @@
<a href="/">↳ Let's get you home.</a>
</div>
</div>
-
-{{- with resources.Get "darkmode.js" | minify -}}
-<script>
- {{.Content | safeJS }}
-</script>
-{{- end -}}
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1922083..c30cd4f 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -23,13 +23,6 @@
</article>
{{partial "footer.html" .}}
</div>
-
-{{- with resources.Get "darkmode.js" | minify -}}
-<script>
- {{.Content | safeJS }}
-</script>
-{{- end -}}
-
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/index.html b/layouts/index.html
index 83f6fb8..fdc03b1 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -13,10 +13,4 @@
{{partial "footer.html" .}}
</div>
</div>
-
-{{- with resources.Get "darkmode.js" | minify -}}
-<script>
- {{.Content | safeJS }}
-</script>
-{{- end -}}
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index e53ebe1..3810078 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -17,5 +17,11 @@
</style>
{{end}}
{{end}}
+
+ {{- with resources.Get "darkmode.js" | minify -}}
+ <script>
+ {{.Content | safeJS }}
+ </script>
+ {{- end -}}
</head>
-{{ template "_internal/google_analytics.html" . }}
\ No newline at end of file
+{{ template "_internal/google_analytics.html" . }}
--
Gitblit v1.10.0