🔖 Release v2.7.2

jpanther · Oct 26, 2023 · f469704 · f469704
2 parents 7f141e7 + 75f7179
commit f469704
Show file tree

Hide file tree

Showing 16 changed files with 368 additions and 349 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -10,6 +10,7 @@ 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)
 
@@ -24,16 +25,16 @@ body:
     id: theme-version
     attributes:
       label: Theme version
-      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.6.0
+      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.
+      placeholder: eg. v2.7.1
     validations:
       required: true
   - type: input
     id: hugo-version
     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.114.0+extended darwin/arm64
+      placeholder: eg. hugo v0.119.0+extended darwin/arm64
     validations:
       required: true
   - type: dropdown

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [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
@@ -755,7 +768,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.1...HEAD
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.2...HEAD
+[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

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

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -1,4 +1,4 @@
-/*! Congo v2.7.1 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.2 | MIT License | https://github.com/jpanther/congo */
 
 @tailwind base;
 @tailwind components;

diff --git a/assets/lib/fuse/fuse.min.js b/assets/lib/fuse/fuse.min.js
diff --git a/assets/lib/mermaid/mermaid.min.js b/assets/lib/mermaid/mermaid.min.js
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
@@ -1 +1 @@
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="relative group">{{ .Text | safeHTML }} {{ if .Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<span class="absolute top-0 w-6 transition-opacity opacity-0 -start-6 not-prose group-hover:opacity-100"><a class="group-hover:text-primary-300 dark:group-hover:text-neutral-700" style="text-decoration-line: none !important;" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a></span>{{ end }}</h{{ .Level }}>
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="relative group">{{ .Text | safeHTML }} {{ if .Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<span class="absolute top-0 w-6 transition-opacity opacity-0 -start-6 not-prose group-hover:opacity-100"><a class="group-hover:text-primary-300 dark:group-hover:text-neutral-700" style="text-decoration-line: none !important;" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a></span>{{ end }}</h{{ .Level }}>
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
@@ -61,4 +61,4 @@
       {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
     </figure>
   {{ end }}
-{{ end }}
+{{ end }}
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
@@ -1,10 +1,11 @@
 {{ $link := .Destination }}
 {{ $isRemote := strings.HasPrefix $link "http" }}
-{{- if not $isRemote -}}
-{{ $url := urls.Parse .Destination }}
-{{- if $url.Path -}}
-{{ $fragment := "" }}
-{{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
-{{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end }}{{ end -}}
-{{- end -}}
-<a href="{{ $link | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{ .Text | safeHTML }}</a>
+{{- if not $isRemote }}
+  {{ $url := urls.Parse .Destination }}
+  {{ if $url.Path }}
+    {{ $fragment := "" }}
+    {{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
+    {{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end -}}
+  {{ end }}
+{{ end -}}
+<a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -2,9 +2,12 @@
   {{/* Footer menu */}}
   {{ if .Site.Menus.footer }}
     <nav class="pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400">
-      <ul class="flex list-none flex-col sm:flex-row">
+      <ul class="flex flex-col list-none sm:flex-row">
         {{ range .Site.Menus.footer }}
-          <li class="group mb-1 text-end sm:mb-0 sm:me-7 sm:last:me-0">
+          {{ if and (eq .Params.action "locale") (and (not page.IsTranslated) (not site.IsMultiLingual)) }}
+            {{ 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 }}
@@ -14,7 +17,7 @@
                 >
                   {{ with .Params.icon }}
                     <span
-                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
+                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
                     >
                       {{- partial "icon.html" . -}}
                     </span>
@@ -34,13 +37,13 @@
                 aria-label="appearance switcher"
               >
                 <span
-                  class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
+                  class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
                   title="{{ i18n "footer.dark_appearance" }}"
                 >
                   {{ partial "icon.html" "moon" }}
                 </span>
                 <span
-                  class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
+                  class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
                   title="{{ i18n "footer.light_appearance" }}"
                 >
                   {{ partial "icon.html" "sun" }}
@@ -56,7 +59,7 @@
                 {{ with .Params.target }}target="{{ . }}"{{ end }}
                 >{{ with .Params.icon }}
                   <span
-                    class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
+                    class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
                   >
                     {{- partial "icon.html" . -}}
                   </span>
@@ -114,13 +117,13 @@
         >
           <button id="appearance-switcher-0" type="button" aria-label="appearance switcher">
             <div
-              class="flex h-12 w-12 items-center justify-center dark:hidden"
+              class="flex items-center justify-center w-12 h-12 dark:hidden"
               title="{{ i18n "footer.dark_appearance" }}"
             >
               {{ partial "icon.html" "moon" }}
             </div>
             <div
-              class="hidden h-12 w-12 items-center justify-center dark:flex"
+              class="items-center justify-center hidden w-12 h-12 dark:flex"
               title="{{ i18n "footer.light_appearance" }}"
             >
               {{ partial "icon.html" "sun" }}

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