Merge c1d4f0c003 into e3015b9006

Fixes #695

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [2.7.4] - 2023-11-05
+
+### Fixed
+
+- Links with non-whitespace characters preceeding them are prefixed with a space ([#695](https://github.com/jpanther/congo/issues/695))
+
 ## [2.7.3] - 2023-10-31
 
 ### Fixed
@@ -774,7 +780,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.3...HEAD
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.4...HEAD
+[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
 [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

assets/css/compiled/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.7.3 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.4 | 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.3 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.4 | MIT License | https://github.com/jpanther/congo */
 
 @tailwind base;
 @tailwind components;

layouts/_default/_markup/render-link.html

@@ -1,5 +1,5 @@
-{{ $link := .Destination }}
-{{ $isRemote := strings.HasPrefix $link "http" }}
+{{- $link := .Destination -}}
+{{- $isRemote := strings.HasPrefix $link "http" -}}
 {{- if not $isRemote }}
   {{ $url := urls.Parse .Destination }}
   {{ if $url.Path }}

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 }}"
-        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 }}"
+        {{- 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 }}"
-        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"
+        {{- 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{{ if $logo }} !dark:hidden{{ end }}"
+        {{- end }}
         alt="{{ .Site.Title }}"
       />
       {{- end}}

package.json

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