Merge c1d4f0c003 into e58f3544af

📌 Bump tailwindcss from 3.3.3 to 3.3.4

.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,8 +25,8 @@ 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.
+      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.6.0
+      placeholder: eg. v2.7.1
     validations:
       required: true
   - type: input
@@ -33,7 +34,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.114.0+extended darwin/arm64
+      placeholder: eg. hugo v0.119.0+extended darwin/arm64
     validations:
       required: true
   - type: dropdown

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade to Tailwind v3.3.4 ([#681](https://github.com/jpanther/congo/pull/681))
+
 ### Fixed
 
 - Extra whitespace added after links ([#679](https://github.com/jpanther/congo/issues/679))

assets/css/compiled/main.css

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

layouts/partials/functions/warnings.html

@@ -7,3 +7,6 @@
 {{ if ne .Params.logo nil }}
   {{ warnf "[CONGO] Theme parameter `logo` has been renamed to `header.logo`. Please update your site configuration." }}
 {{ end }}
+{{ if eq .Params.header.logo .Params.header.logo_dark }}
+  {{-  warnf "[CONGO] Interactions with a single resource via multiple distinct resource handles can be problematic. It is recommended to only declare `header.logo_dark` when it is distinct from `header.logo`." }}
+{{- end }}

layouts/partials/logo.html

@@ -5,17 +5,29 @@
     <a href="{{ "" | relLangURL }}" class="mr-2">
       <img
         src="{{ $logo.RelPermalink }}"
+        {{- if eq $logo.MediaType.SubType "svg" }}
+          width="25"
+          height="25"
+          class="m-0 p-0 object-scale-down object-left{{ if $logo_dark }} hidden dark:flex{{ end }}"
+        {{- else }}  
           width="{{ div $logo.Width 2 }}"
           height="{{ div $logo.Height 2 }}"
           class="max-h-[10rem] max-w-[10rem] object-scale-down object-left{{ if $logo_dark }} hidden dark:flex{{ end }}"
+        {{- end }}  
         alt="{{ .Site.Title }}"
       />
       {{- if $logo_dark }}
       <img
         src="{{ $logo_dark.RelPermalink }}"
+        {{- if eq $logo_dark.MediaType.SubType "svg" }}
+          width="25"
+          height="25"
+          class="m-0 p-0 object-scale-down object-left{{ if $logo }} !dark:hidden{{ end }}"
+        {{- else }}
           width="{{ div $logo_dark.Width 2 }}"
           height="{{ div $logo_dark.Height 2 }}"
-        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left dark:hidden"
+          class="max-h-[10rem] max-w-[10rem] object-scale-down object-left{{ if $logo }} !dark:hidden{{ end }}"
+        {{- end }}
         alt="{{ .Site.Title }}"
       />
       {{- end}}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-congo-theme",
-      "version": "2.6.1",
+      "version": "2.7.1",
       "hasInstallScript": true,
       "license": "MIT",
       "devDependencies": {
@@ -19,7 +19,7 @@
         "prettier-plugin-go-template": "^0.0.15",
         "prettier-plugin-tailwindcss": "^0.5.6",
         "rimraf": "^5.0.5",
-        "tailwindcss": "^3.3.3",
+        "tailwindcss": "^3.3.4",
         "vendor-copy": "^3.0.1"
       },
       "funding": {
@@ -1067,9 +1067,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
+      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -1095,9 +1095,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
+      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1343,9 +1343,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.18.2",
+      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -2782,9 +2782,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.3.3",
+      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.4.tgz",
-      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
+      "integrity": "sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ==",
       "dev": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
@@ -2792,10 +2792,10 @@
         "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.0",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.18.2",
+        "jiti": "^1.19.1",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
@@ -3899,9 +3899,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.12",
+      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -3923,9 +3923,9 @@
       }
     },
     "fastq": {
-      "version": "1.13.0",
+      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -4105,9 +4105,9 @@
       }
     },
     "jiti": {
-      "version": "1.18.2",
+      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
       "dev": true
     },
     "katex": {
@@ -4979,9 +4979,9 @@
       "dev": true
     },
     "tailwindcss": {
-      "version": "3.3.3",
+      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.4.tgz",
-      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
+      "integrity": "sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ==",
       "dev": true,
       "requires": {
         "@alloc/quick-lru": "^5.2.0",
@@ -4989,10 +4989,10 @@
         "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.0",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.18.2",
+        "jiti": "^1.19.1",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",

package.json

@@ -38,7 +38,7 @@
     "prettier-plugin-go-template": "^0.0.15",
     "prettier-plugin-tailwindcss": "^0.5.6",
     "rimraf": "^5.0.5",
-    "tailwindcss": "^3.3.3",
+    "tailwindcss": "^3.3.4",
     "vendor-copy": "^3.0.1"
   },
   "vendorCopy": [],