Merge 0a140f351a into d88f6c49be

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -10,7 +10,6 @@ body:
         Before proceeding, please ensure the issue you're reporting is:
           - not caused by local customisations in your project
           - reproducible using the latest stable release of the theme
-          - not due to the local Hugo cache being out of date (run `hugo mod clean` to clear the cache)
           - not already covered by an open issue ([check open issues](https://github.com/jpanther/congo/issues))
           - not a general question or feature request (use [GitHub Discussions](https://github.com/jpanther/congo/discussions) instead)
 
@@ -25,8 +24,8 @@ body:
     id: theme-version
     attributes:
       label: Theme version
-      description: What version of Congo are you using? An easy way to check the version of the code running in your environment is by verifying the theme version comment at the top of the `main.css` file in the built output of your site.
+      description: What version of the theme are you using? If you have not tested this issue with the latest theme release, please do so before submitting a bug report.
-      placeholder: eg. v2.7.1
+      placeholder: eg. v2.6.0
     validations:
       required: true
   - type: input
@@ -34,7 +33,7 @@ body:
     attributes:
       label: Hugo version
       description: What version of Hugo are you using? Please provide the output of the `hugo version` command.
-      placeholder: eg. hugo v0.119.0+extended darwin/arm64
+      placeholder: eg. hugo v0.114.0+extended darwin/arm64
     validations:
       required: true
   - type: dropdown

.github/workflows/build-theme.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           ref: "${{ github.head_ref }}"
       - name: Install dependencies and Build Theme
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
       - run: npm install
       - run: npm run assets
       - name: Commit and push Chart.js changes

.prettierrc

@@ -1,11 +1,9 @@
 {
-  "plugins": ["prettier-plugin-go-template"],
   "goTemplateBracketSpacing": true,
   "htmlWhitespaceSensitivity": "css",
   "printWidth": 100,
   "singleQuote": false,
   "tabWidth": 2,
-  "useTabs": false,
   "trailingComma": "es5",
   "overrides": [
     {

CHANGELOG.md

@@ -6,25 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-## [2.7.3] - 2023-10-31
-
-### Fixed
-
-- Article metadata HTML is output as text when using Hugo v0.120.0 ([#689](https://github.com/jpanther/congo/pull/689))
-
-## [2.7.2] - 2023-10-26
-
-### Changed
-
-- Upgrade to Tailwind v3.3.5 ([#681](https://github.com/jpanther/congo/pull/681), [#686](https://github.com/jpanther/congo/pull/686))
-- Upgrade to Mermaid v10.6.0 ([#684](https://github.com/jpanther/congo/pull/684))
-- Upgrade to FuseJS v7.0.0 ([#685](https://github.com/jpanther/congo/pull/685))
-
-### Fixed
-
-- Empty block is output when locale switcher is hidden ([#678](https://github.com/jpanther/congo/issues/678))
-- Extra whitespace added after links ([#679](https://github.com/jpanther/congo/issues/679))
-
 ## [2.7.1] - 2023-10-24
 
 ### Changed
@@ -774,9 +755,7 @@ 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.3...HEAD
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.1...HEAD
-[2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3
-[2.7.2]: https://github.com/jpanther/congo/compare/v2.7.1...v2.7.2
 [2.7.1]: https://github.com/jpanther/congo/compare/v2.7.0...v2.7.1
 [2.7.0]: https://github.com/jpanther/congo/compare/v2.6.1...v2.7.0
 [2.6.1]: https://github.com/jpanther/congo/compare/v2.6.0...v2.6.1

assets/css/compiled/main.css

@@ -1,6 +1,6 @@
-/*! Congo v2.7.3 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.1 | MIT License | https://github.com/jpanther/congo */
 
-/*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com */
 
 /*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
@@ -1140,6 +1140,7 @@ body:has(#menu-controller:checked) {
 }
 
 .toc ul ul {
+  -webkit-padding-start: 1rem;
           padding-inline-start: 1rem;
 }
 
@@ -1847,6 +1848,7 @@ body:has(#menu-controller:checked) {
 }
 
 .-ms-5 {
+  -webkit-margin-start: -1.25rem;
           margin-inline-start: -1.25rem;
 }
 
@@ -1883,14 +1885,17 @@ body:has(#menu-controller:checked) {
 }
 
 .me-14 {
+  -webkit-margin-end: 3.5rem;
           margin-inline-end: 3.5rem;
 }
 
 .me-2 {
+  -webkit-margin-end: 0.5rem;
           margin-inline-end: 0.5rem;
 }
 
 .me-4 {
+  -webkit-margin-end: 1rem;
           margin-inline-end: 1rem;
 }
 
@@ -1903,10 +1908,12 @@ body:has(#menu-controller:checked) {
 }
 
 .ms-1 {
+  -webkit-margin-start: 0.25rem;
           margin-inline-start: 0.25rem;
 }
 
 .ms-2 {
+  -webkit-margin-start: 0.5rem;
           margin-inline-start: 0.5rem;
 }
 
@@ -2356,30 +2363,37 @@ body:has(#menu-controller:checked) {
 }
 
 .pe-10 {
+  -webkit-padding-end: 2.5rem;
           padding-inline-end: 2.5rem;
 }
 
 .pe-2 {
+  -webkit-padding-end: 0.5rem;
           padding-inline-end: 0.5rem;
 }
 
 .pe-3 {
+  -webkit-padding-end: 0.75rem;
           padding-inline-end: 0.75rem;
 }
 
 .pe-4 {
+  -webkit-padding-end: 1rem;
           padding-inline-end: 1rem;
 }
 
 .pe-5 {
+  -webkit-padding-end: 1.25rem;
           padding-inline-end: 1.25rem;
 }
 
 .ps-2 {
+  -webkit-padding-start: 0.5rem;
           padding-inline-start: 0.5rem;
 }
 
 .ps-5 {
+  -webkit-padding-start: 1.25rem;
           padding-inline-start: 1.25rem;
 }
 
@@ -2965,6 +2979,7 @@ body:has(#menu-controller:checked) {
   }
 
   .sm\:me-7 {
+    -webkit-margin-end: 1.75rem;
             margin-inline-end: 1.75rem;
   }
 
@@ -3015,6 +3030,7 @@ body:has(#menu-controller:checked) {
   }
 
   .sm\:pe-6 {
+    -webkit-padding-end: 1.5rem;
             padding-inline-end: 1.5rem;
   }
 
@@ -3028,10 +3044,12 @@ body:has(#menu-controller:checked) {
   }
 
   .sm\:last\:me-0:last-child {
+    -webkit-margin-end: 0px;
             margin-inline-end: 0px;
   }
 
   .sm\:last\:me-0\.5:last-child {
+    -webkit-margin-end: 0.125rem;
             margin-inline-end: 0.125rem;
   }
 }
@@ -3090,6 +3108,7 @@ body:has(#menu-controller:checked) {
   }
 
   .lg\:ps-8 {
+    -webkit-padding-start: 2rem;
             padding-inline-start: 2rem;
   }
 }

assets/css/main.css

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

config/_default/languages.en.toml

@@ -56,7 +56,7 @@ title = "Congo"
   #   { tiktok = "https://tiktok.com/@username" },
   #   { tumblr = "https://username.tumblr.com" },
   #   { twitch = "https://twitch.tv/username" },
+  #   { twitter = "https://twitter.com/username" },
   #   { whatsapp = "https://wa.me/phone-number" },
-  #   { x-twitter = "https://twitter.com/username" },
   #   { youtube = "https://youtube.com/username" },
   # ]

exampleSite/config/_default/languages.de.toml

@@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors"
   headline = "Nicht dein Durschnitts-Theme!"
   bio = "Dies ist ein Beispiel für eine Autorenbiografie, und obwohl hier ein Stockfoto eines Hundes zu sehen ist, wurde dieser Artikel tatsächlich von einem Menschen verfasst. :dog:"
   links = [
-    { x-twitter = "https://twitter.com/" },
+    { twitter = "https://twitter.com/" },
     { facebook = "https://facebook.com/" },
     { linkedin = "https://linkedin.com/" },
     { youtube = "https://youtube.com/" },

exampleSite/config/_default/languages.en.toml

@@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors"
   headline = "Not your ordinary theme!"
   bio = "This is an example author bio, and although there's a stock photo of a dog here, this article was actually created by a human. :dog:"
   links = [
-    { x-twitter = "https://twitter.com/" },
+    { twitter = "https://twitter.com/" },
     { facebook = "https://facebook.com/" },
     { linkedin = "https://linkedin.com/" },
     { youtube = "https://youtube.com/" },

exampleSite/config/_default/languages.es.toml

@@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors"
   headline = "¡No es tu tema ordinario!"
   bio = "Esta es una biografía de autor de ejemplo, y aunque aquí hay una foto de un perro, este artículo en realidad fue creado por un ser humano. :dog:"
   links = [
-    { x-twitter = "https://twitter.com/" },
+    { twitter = "https://twitter.com/" },
     { facebook = "https://facebook.com/" },
     { linkedin = "https://linkedin.com/" },
     { youtube = "https://youtube.com/" },

exampleSite/config/_default/languages.ja.toml

@@ -18,7 +18,7 @@ copyright = "© 2023 Congo contributors"
   headline = "ただならぬテーマ!"
   bio = "これは著者の経歴の例で、ここには犬の画像があるが、実際には人間が作成したものである。 :dog:"
   links = [
-    { x-twitter = "https://twitter.com/" },
+    { twitter = "https://twitter.com/" },
     { facebook = "https://facebook.com/" },
     { linkedin = "https://linkedin.com/" },
     { youtube = "https://youtube.com/" },

layouts/_default/_markup/render-link.html

@@ -1,11 +1,10 @@
 {{ $link := .Destination }}
 {{ $isRemote := strings.HasPrefix $link "http" }}
-{{- if not $isRemote }}
+{{- if not $isRemote -}}
 {{ $url := urls.Parse .Destination }}
-  {{ if $url.Path }}
+{{- if $url.Path -}}
 {{ $fragment := "" }}
 {{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
-    {{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end -}}
+{{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end }}{{ end -}}
-  {{ end }}
+{{- end -}}
-{{ end -}}
+<a href="{{ $link | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{ .Text | safeHTML }}</a>
-<a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>

layouts/partials/article-meta.html

@@ -36,7 +36,7 @@
   <div class="flex flex-row flex-wrap items-center">
     {{/* Output partials */}}
     {{ with ($meta.Get "partials") }}
-      {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" | safeHTML }}
+      {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}
     {{ end }}
 
     {{/* Output draft label */}}

layouts/partials/footer.html

@@ -2,12 +2,9 @@
   {{/* Footer menu */}}
   {{ if .Site.Menus.footer }}
     <nav class="pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400">
-      <ul class="flex flex-col list-none sm:flex-row">
+      <ul class="flex list-none flex-col sm:flex-row">
         {{ range .Site.Menus.footer }}
-          {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
+          <li class="group mb-1 text-end sm:mb-0 sm:me-7 sm:last:me-0">
-            {{ continue }}
-          {{ end }}
-          <li class="mb-1 group text-end sm:mb-0 sm:me-7 sm:last:me-0">
             {{ if eq .Params.action "search" }}
               {{ $.Scratch.Add "searchCount" 1 }}
               {{ if $.Site.Params.enableSearch | default false }}
@@ -17,7 +14,7 @@
                 >
                   {{ with .Params.icon }}
                     <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
                       {{- partial "icon.html" . -}}
                     </span>
@@ -37,13 +34,13 @@
                 aria-label="appearance switcher"
               >
                 <span
-                  class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                  class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                   title="{{ i18n "footer.dark_appearance" }}"
                 >
                   {{ partial "icon.html" "moon" }}
                 </span>
                 <span
-                  class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                  class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                   title="{{ i18n "footer.light_appearance" }}"
                 >
                   {{ partial "icon.html" "sun" }}
@@ -59,7 +56,7 @@
                 {{ with .Params.target }}target="{{ . }}"{{ end }}
                 >{{ with .Params.icon }}
                   <span
-                    class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                    class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                   >
                     {{- partial "icon.html" . -}}
                   </span>
@@ -117,13 +114,13 @@
         >
           <button id="appearance-switcher-0" type="button" aria-label="appearance switcher">
             <div
-              class="flex items-center justify-center w-12 h-12 dark:hidden"
+              class="flex h-12 w-12 items-center justify-center dark:hidden"
               title="{{ i18n "footer.dark_appearance" }}"
             >
               {{ partial "icon.html" "moon" }}
             </div>
             <div
-              class="items-center justify-center hidden w-12 h-12 dark:flex"
+              class="hidden h-12 w-12 items-center justify-center dark:flex"
               title="{{ i18n "footer.light_appearance" }}"
             >
               {{ partial "icon.html" "sun" }}

layouts/partials/header/basic.html

@@ -6,12 +6,9 @@
     </div>
     {{/* Main menu */}}
     {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }}
-      <ul class="flex flex-col list-none text-end sm:flex-row">
+      <ul class="flex list-none flex-col text-end sm:flex-row">
         {{ if .Site.Menus.main }}
           {{ range .Site.Menus.main }}
-            {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
-              {{ continue }}
-            {{ end }}
             <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0.5">
               {{ if eq .Params.action "search" }}
                 {{ $.Scratch.Add "searchCount" 1 }}
@@ -22,7 +19,7 @@
                   >
                     {{ with .Params.icon | default "search" }}
                       <span
-                        class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                        class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                       >
                         {{- partial "icon.html" . -}}
                       </span>
@@ -42,7 +39,7 @@
                   aria-label="appearance switcher"
                 >
                   <span
-                    class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                    class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                     title="{{ i18n "footer.dark_appearance" }}"
                   >
                     {{ with .Params.icon | default "moon" }}
@@ -56,7 +53,7 @@
                     {{ end }}
                   </span>
                   <span
-                    class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                    class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                     title="{{ i18n "footer.light_appearance" }}"
                   >
                     {{ with .Params.icon | default "sun" }}
@@ -80,7 +77,7 @@
                   {{ with .Params.target }}target="{{ . }}"{{ end }}
                   >{{ with .Params.icon }}
                     <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
                       {{- partial "icon.html" . -}}
                     </span>
@@ -95,10 +92,10 @@
             </li>
           {{ end }}
           {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-            <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
+            <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0">
               <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
                 <span
-                  class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                  class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                 >
                   {{ partial "icon.html" "search" }}
                 </span>

layouts/partials/header/hamburger.html

@@ -13,10 +13,10 @@
         </div>
         <div
           id="menu-wrapper"
-          class="fixed inset-0 z-30 invisible w-full h-full m-auto overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50"
+          class="invisible fixed inset-0 z-30 m-auto h-full w-full cursor-default overflow-auto bg-neutral-100/50 opacity-0 backdrop-blur-sm transition-opacity dark:bg-neutral-900/50"
         >
           <ul
-            class="flex flex-col w-full px-6 py-6 mx-auto overflow-visible list-none max-w-7xl text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
+            class="mx-auto flex w-full max-w-7xl list-none flex-col overflow-visible px-6 py-6 text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
           >
             <li class="mb-1">
               <span class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400"
@@ -25,10 +25,7 @@
             </li>
             {{ if .Site.Menus.main }}
               {{ range .Site.Menus.main }}
-                {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
+                <li class="group mb-1">
-                  {{ continue }}
-                {{ end }}
-                <li class="mb-1 group">
                   {{ if eq .Params.action "search" }}
                     {{ $.Scratch.Add "searchCount" 1 }}
                     {{ if $.Site.Params.enableSearch | default false }}
@@ -38,7 +35,7 @@
                       >
                         {{ with .Params.icon | default "search" }}
                           <span
-                            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                            class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                           >
                             {{- partial "icon.html" . -}}
                           </span>
@@ -58,7 +55,7 @@
                       aria-label="appearance switcher"
                     >
                       <span
-                        class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                        class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                         title="{{ i18n "footer.dark_appearance" }}"
                       >
                         {{ with .Params.icon | default "moon" }}
@@ -72,7 +69,7 @@
                         {{ end }}
                       </span>
                       <span
-                        class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                        class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                         title="{{ i18n "footer.light_appearance" }}"
                       >
                         {{ with .Params.icon | default "sun" }}
@@ -96,7 +93,7 @@
                       {{ with .Params.target }}target="{{ . }}"{{ end }}
                       >{{ with .Params.icon }}
                         <span
-                          class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                          class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                         >
                           {{- partial "icon.html" . -}}
                         </span>
@@ -111,10 +108,10 @@
                 </li>
               {{ end }}
               {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-                <li class="mb-1 group">
+                <li class="group mb-1">
                   <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
                     <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
                       {{ partial "icon.html" "search" }}
                     </span>

layouts/partials/header/hybrid.html

@@ -13,10 +13,10 @@
         </div>
         <div
           id="menu-wrapper"
-          class="fixed inset-0 z-30 invisible w-full h-full m-auto overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50"
+          class="invisible fixed inset-0 z-30 m-auto h-full w-full cursor-default overflow-auto bg-neutral-100/50 opacity-0 backdrop-blur-sm transition-opacity dark:bg-neutral-900/50"
         >
           <ul
-            class="flex flex-col w-full px-6 py-6 mx-auto overflow-visible list-none max-w-7xl text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
+            class="mx-auto flex w-full max-w-7xl list-none flex-col overflow-visible px-6 py-6 text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
           >
             <li class="mb-1">
               <span class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400"
@@ -25,10 +25,7 @@
             </li>
             {{ if .Site.Menus.main }}
               {{ range .Site.Menus.main }}
-                {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
+                <li class="group mb-1">
-                  {{ continue }}
-                {{ end }}
-                <li class="mb-1 group">
                   {{ if eq .Params.action "search" }}
                     {{ $.Scratch.Add "searchCount" 1 }}
                     {{ if $.Site.Params.enableSearch | default false }}
@@ -38,7 +35,7 @@
                       >
                         {{ with .Params.icon | default "search" }}
                           <span
-                            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                            class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                           >
                             {{- partial "icon.html" . -}}
                           </span>
@@ -58,7 +55,7 @@
                       aria-label="appearance switcher"
                     >
                       <span
-                        class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                        class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                         title="{{ i18n "footer.dark_appearance" }}"
                       >
                         {{ with .Params.icon | default "moon" }}
@@ -72,7 +69,7 @@
                         {{ end }}
                       </span>
                       <span
-                        class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                        class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                         title="{{ i18n "footer.light_appearance" }}"
                       >
                         {{ with .Params.icon | default "sun" }}
@@ -96,7 +93,7 @@
                       {{ with .Params.target }}target="{{ . }}"{{ end }}
                       >{{ with .Params.icon }}
                         <span
-                          class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                          class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                         >
                           {{- partial "icon.html" . -}}
                         </span>
@@ -111,10 +108,10 @@
                 </li>
               {{ end }}
               {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-                <li class="mb-1 group">
+                <li class="group mb-1">
                   <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
                     <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
                       {{ partial "icon.html" "search" }}
                     </span>
@@ -126,13 +123,10 @@
         </div>
       </label>
       {{/* Basic menu */}}
-      <ul class="flex-row hidden list-none text-end sm:flex">
+      <ul class="hidden list-none flex-row text-end sm:flex">
         {{ if .Site.Menus.main }}
           {{ range .Site.Menus.main }}
-            {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
+            <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0">
-              {{ continue }}
-            {{ end }}
-            <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
               {{ if eq .Params.action "search" }}
                 {{ $.Scratch.Add "searchCount" 1 }}
                 {{ if $.Site.Params.enableSearch | default false }}
@@ -142,7 +136,7 @@
                   >
                     {{ with .Params.icon | default "search" }}
                       <span
-                        class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                        class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                       >
                         {{- partial "icon.html" . -}}
                       </span>
@@ -162,7 +156,7 @@
                   aria-label="appearance switcher"
                 >
                   <span
-                    class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                    class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                     title="{{ i18n "footer.dark_appearance" }}"
                   >
                     {{ with .Params.icon | default "moon" }}
@@ -176,7 +170,7 @@
                     {{ end }}
                   </span>
                   <span
-                    class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                    class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                     title="{{ i18n "footer.light_appearance" }}"
                   >
                     {{ with .Params.icon | default "sun" }}
@@ -200,7 +194,7 @@
                   {{ with .Params.target }}target="{{ . }}"{{ end }}
                   >{{ with .Params.icon }}
                     <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
                       {{- partial "icon.html" . -}}
                     </span>
@@ -215,10 +209,10 @@
             </li>
           {{ end }}
           {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-            <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
+            <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0">
               <button id="search-button-m1" title="{{ i18n "search.open_button_title" }}">
                 <span
-                  class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                  class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                 >
                   {{ partial "icon.html" "search" }}
                 </span>

package-lock.json

@@ -1,26 +1,26 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.7.3",
+  "version": "2.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-congo-theme",
-      "version": "2.7.3",
+      "version": "2.7.0",
       "hasInstallScript": true,
       "license": "MIT",
       "devDependencies": {
         "@tailwindcss/typography": "^0.5.10",
         "chart.js": "^4.4.0",
-        "fuse.js": "^7.0.0",
+        "fuse.js": "^6.6.2",
         "katex": "^0.16.9",
-        "mermaid": "^10.6.0",
+        "mermaid": "^10.5.1",
         "prettier": "^3.0.3",
         "prettier-plugin-go-template": "^0.0.15",
         "prettier-plugin-tailwindcss": "^0.5.6",
         "quicklink": "^2.3.0",
         "rimraf": "^5.0.5",
-        "tailwindcss": "^3.3.5",
+        "tailwindcss": "^3.3.3",
         "vendor-copy": "^3.0.1"
       },
       "funding": {
@@ -1068,9 +1068,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.3.1",
+      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -1096,9 +1096,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
+      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1159,9 +1159,9 @@
       "dev": true
     },
     "node_modules/fuse.js": {
-      "version": "7.0.0",
+      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
-      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
+      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -1344,9 +1344,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.20.0",
+      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -1510,9 +1510,9 @@
       }
     },
     "node_modules/mermaid": {
-      "version": "10.6.0",
+      "version": "10.5.1",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.5.1.tgz",
-      "integrity": "sha512-Hcti+Q2NiWnb2ZCijSX89Bn2i7TCUwosBdIn/d+u63Sz7y40XU6EKMctT4UX4qZuZGfKGZpfOeim2/KTrdR7aQ==",
+      "integrity": "sha512-+4mkGW5PptHDSae4YZ/Jw1pEOf0irrB/aCL6BwZcJPhr5+84UJBrQnHTvyPqCUz67tXkrDvSzWv4B+J2hLO78g==",
       "dev": true,
       "dependencies": {
         "@braintree/sanitize-url": "^6.0.1",
@@ -2899,9 +2899,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.3.5",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
-      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
+      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
       "dev": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
@@ -2909,10 +2909,10 @@
         "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.19.1",
+        "jiti": "^1.18.2",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
@@ -4025,9 +4025,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.3.1",
+      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -4049,9 +4049,9 @@
       }
     },
     "fastq": {
-      "version": "1.15.0",
+      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -4096,9 +4096,9 @@
       "dev": true
     },
     "fuse.js": {
-      "version": "7.0.0",
+      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
-      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
+      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
       "dev": true
     },
     "glob": {
@@ -4231,9 +4231,9 @@
       }
     },
     "jiti": {
-      "version": "1.20.0",
+      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
       "dev": true
     },
     "js-tokens": {
@@ -4364,9 +4364,9 @@
       "dev": true
     },
     "mermaid": {
-      "version": "10.6.0",
+      "version": "10.5.1",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.5.1.tgz",
-      "integrity": "sha512-Hcti+Q2NiWnb2ZCijSX89Bn2i7TCUwosBdIn/d+u63Sz7y40XU6EKMctT4UX4qZuZGfKGZpfOeim2/KTrdR7aQ==",
+      "integrity": "sha512-+4mkGW5PptHDSae4YZ/Jw1pEOf0irrB/aCL6BwZcJPhr5+84UJBrQnHTvyPqCUz67tXkrDvSzWv4B+J2hLO78g==",
       "dev": true,
       "requires": {
         "@braintree/sanitize-url": "^6.0.1",
@@ -5202,9 +5202,9 @@
       "dev": true
     },
     "tailwindcss": {
-      "version": "3.3.5",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
-      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
+      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
       "dev": true,
       "requires": {
         "@alloc/quick-lru": "^5.2.0",
@@ -5212,10 +5212,10 @@
         "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.19.1",
+        "jiti": "^1.18.2",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.7.3",
+  "version": "2.7.1",
   "description": "Congo theme for Hugo",
   "scripts": {
     "preinstall": "rimraf assets/lib",
@@ -31,15 +31,15 @@
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
     "chart.js": "^4.4.0",
-    "fuse.js": "^7.0.0",
+    "fuse.js": "^6.6.2",
     "katex": "^0.16.9",
-    "mermaid": "^10.6.0",
+    "mermaid": "^10.5.1",
     "prettier": "^3.0.3",
     "prettier-plugin-go-template": "^0.0.15",
     "prettier-plugin-tailwindcss": "^0.5.6",
     "quicklink": "^2.3.0",
     "rimraf": "^5.0.5",
-    "tailwindcss": "^3.3.5",
+    "tailwindcss": "^3.3.3",
     "vendor-copy": "^3.0.1"
   },
   "vendorCopy": [],