2 files changed, 10 insertions, 38 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 52a6767..7a5579d 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -34,38 +34,6 @@
 
 </body>
 
-<script>
-
-  function isAuto() {
-    return document.body.classList.contains("auto");
-  }
-
-  function setTheme() {
-    if (!isAuto()) {
-      return
-    }
-
-    document.body.classList.remove("auto");
-    let cls = "light";
-    if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-      cls = "dark";
-    }
-
-    document.body.classList.add(cls);
-  }
-
-  function invertBody() {
-    document.body.classList.toggle("dark");
-    document.body.classList.toggle("light");
-  }
-
-  if (isAuto()) {
-    window.matchMedia('(prefers-color-scheme: dark)').addListener(invertBody);
-  }
-
-  setTheme();
-
-</script>
-
+<script src="{{ "js/theme-switch.js" | relURL }}"></script>
 <script defer src="{{ "js/copy-code.js" | relURL }}"></script>
-</html>
-\ No newline at end of file
+</html>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 159c328..6869a46 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -73,13 +73,17 @@
   </div>
 
   {{ if .Store.Get "hasMermaid" }}
-  <script type="module">
-    import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.esm.min.mjs';
-    mermaid.initialize({ startOnLoad: true });
+  {{ $mermaidDarkTheme := default "dark" (or .Params.mermaidDarkTheme .Site.Params.mermaidDarkTheme) }}
+  {{ $mermaidTheme := default "default" (or .Params.mermaidTheme .Site.Params.mermaidTheme) }}
+  <script defer
+    type="module"
+    id="mermaid_script"
+    data-light-theme="{{ $mermaidTheme }}"
+    data-dark-theme="{{ $mermaidDarkTheme }}"
+    src='{{ "js/mermaid.js" | relURL }}'>
   </script>
   {{ end }}
 
-
   {{/* Next prev controls */}}
 
   {{ if not (.Param "hidePagination") }}