Merge 8ae115e95c into 05c3fef94a

Fixes #706

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [2.7.6] - 2023-11-26
+
+### Fixed
+
+- Some Mermaid diagram elements not styled correctly in dark mode ([#706](https://github.com/jpanther/congo/issues/706))
+
 ## [2.7.5] - 2023-11-25
 
 ### Added
@@ -797,7 +803,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Advanced customisation using simple Tailwind colour definitions and styles
 - Fully documented
 
-[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.5...HEAD
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.6...HEAD
+[2.7.6]: https://github.com/jpanther/congo/compare/v2.7.5...v2.7.6
 [2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5
 [2.7.4]: https://github.com/jpanther/congo/compare/v2.7.3...v2.7.4
 [2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3

assets/css/compiled/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */
 
 /*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */
 

assets/css/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */
 
 @tailwind base;
 @tailwind components;

assets/js/menu.js

@@ -0,0 +1,6 @@
+/*
+    Closes the hamburger menu when a link is clicked.
+*/
+function close_menu() {
+    document.getElementById('menu-controller').checked=false
+}

assets/js/mermaid.js

@@ -2,19 +2,29 @@ function css(name) {
   return "rgb(" + getComputedStyle(document.documentElement).getPropertyValue(name) + ")";
 }
 
+let isDark = document.documentElement.classList.contains("dark");
+
 mermaid.initialize({
   theme: "base",
   themeVariables: {
     background: css("--color-neutral"),
-    primaryColor: css("--color-primary-200"),
-    secondaryColor: css("--color-secondary-200"),
-    tertiaryColor: css("--color-neutral-100"),
-    primaryBorderColor: css("--color-primary-400"),
+    primaryTextColor: isDark ? css("--color-neutral-200") : css("--color-neutral-700"),
+    primaryColor: isDark ? css("--color-primary-700") : css("--color-primary-200"),
+    secondaryColor: isDark ? css("--color-secondary-700") : css("--color-secondary-200"),
+    tertiaryColor: isDark ? css("--color-neutral-700") : css("--color-neutral-100"),
+    primaryBorderColor: isDark ? css("--color-primary-500") : css("--color-primary-400"),
     secondaryBorderColor: css("--color-secondary-400"),
-    tertiaryBorderColor: css("--color-neutral-400"),
-    lineColor: css("--color-neutral-600"),
+    tertiaryBorderColor: isDark ? css("--color-neutral-300") : css("--color-neutral-400"),
+    lineColor: isDark ? css("--color-neutral-300") : css("--color-neutral-600"),
     fontFamily:
       "ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif",
     fontSize: "16px",
+    pieTitleTextSize: "19px",
+    pieSectionTextSize: "16px",
+    pieLegendTextSize: "16px",
+    pieStrokeWidth: "1px",
+    pieOuterStrokeWidth: "0.5px",
+    pieStrokeColor: isDark ? css("--color-neutral-300") : css("--color-neutral-400"),
+    pieOpacity: "1",
   },
 });

exampleSite/config/_default/params.toml

@@ -17,7 +17,7 @@ enableImageLazyLoading = true
 fingerprintAlgorithm = "sha256"
 
 [header]
-  layout = "basic" # valid options: basic, hamburger, hybrid, custom
+  layout = "hamburger" # valid options: basic, hamburger, hybrid, custom
   # logo = "img/logo.jpg"
   # logoDark = "img/dark-logo.jpg"
   showTitle = true

layouts/partials/head.html

@@ -47,6 +47,10 @@
     {{ $jsCode := resources.Get "js/code.js" }}
     {{ $assets.Add "js" (slice $jsCode) }}
   {{ end }}
+  {{ if eq .Site.Params.header.layout "hamburger" }}
+    {{ $jsMenu := resources.Get "js/menu.js" }}
+    {{ $assets.Add "js" (slice $jsMenu) }}
+  {{ end }}
   {{ if eq (site.Language.LanguageDirection | default "ltr") "rtl" }}
     {{ $jsRTL := resources.Get "js/rtl.js" }}
     {{ $assets.Add "js" (slice $jsRTL) }}

layouts/partials/header/hamburger.html

@@ -93,6 +93,7 @@
                     <a
                       href="{{ .URL }}"
                       title="{{ .Title }}"
+                      onclick="close_menu()"
                       {{ with .Params.target }}target="{{ . }}"{{ end }}
                       >{{ with .Params.icon }}
                         <span

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "description": "Congo theme for Hugo",
   "scripts": {
     "preinstall": "rimraf assets/lib",