From 03e673e6a52b7764c2ae6a32a0e9c32880cda938 Mon Sep 17 00:00:00 2001 From: Nathan Dimmock Date: Sun, 29 Oct 2023 17:28:29 +0900 Subject: [PATCH 1/3] Add icon for the threads social network Import FontAwesome icon v6.4.2 for 'threads' and add it to list of all available icons on the exampleSite. --- assets/icons/threads.svg | 1 + exampleSite/content/samples/icons/index.de.md | 1 + exampleSite/content/samples/icons/index.es.md | 1 + exampleSite/content/samples/icons/index.ja.md | 1 + exampleSite/content/samples/icons/index.md | 1 + 5 files changed, 5 insertions(+) create mode 100644 assets/icons/threads.svg diff --git a/assets/icons/threads.svg b/assets/icons/threads.svg new file mode 100644 index 00000000..aa27c5f2 --- /dev/null +++ b/assets/icons/threads.svg @@ -0,0 +1 @@ + diff --git a/exampleSite/content/samples/icons/index.de.md b/exampleSite/content/samples/icons/index.de.md index 4f38237f..7f694a62 100644 --- a/exampleSite/content/samples/icons/index.de.md +++ b/exampleSite/content/samples/icons/index.de.md @@ -71,6 +71,7 @@ Die vollständige Liste der integrierten Icons und ihre entsprechenden Namen fin | sun | {{< icon sun >}} | | tag | {{< icon tag >}} | | telegram | {{< icon telegram >}} | +| threads | {{< icon threads >}} | | tiktok | {{< icon tiktok >}} | | translate | {{< icon translate >}} | | triangle-exclamation | {{< icon triangle-exclamation >}} | diff --git a/exampleSite/content/samples/icons/index.es.md b/exampleSite/content/samples/icons/index.es.md index a70bf525..91cd4f06 100644 --- a/exampleSite/content/samples/icons/index.es.md +++ b/exampleSite/content/samples/icons/index.es.md @@ -71,6 +71,7 @@ La lista completa de íconos incorporados y sus nombres correspondientes se pued | sun | {{< icon sun >}} | | tag | {{< icon tag >}} | | telegram | {{< icon telegram >}} | +| threads | {{< icon threads >}} | | tiktok | {{< icon tiktok >}} | | translate | {{< icon translate >}} | | triangle-exclamation | {{< icon triangle-exclamation >}} | diff --git a/exampleSite/content/samples/icons/index.ja.md b/exampleSite/content/samples/icons/index.ja.md index 2e5b9241..7ee8661d 100644 --- a/exampleSite/content/samples/icons/index.ja.md +++ b/exampleSite/content/samples/icons/index.ja.md @@ -71,6 +71,7 @@ Congo は[FontAwesome 6](https://fontawesome.com/icons)のアイコンをサポ | sun | {{< icon sun >}} | | tag | {{< icon tag >}} | | telegram | {{< icon telegram >}} | +| threads | {{< icon threads >}} | | tiktok | {{< icon tiktok >}} | | translate | {{< icon translate >}} | | triangle-exclamation | {{< icon triangle-exclamation >}} | diff --git a/exampleSite/content/samples/icons/index.md b/exampleSite/content/samples/icons/index.md index 8f13a24d..80cc5190 100644 --- a/exampleSite/content/samples/icons/index.md +++ b/exampleSite/content/samples/icons/index.md @@ -71,6 +71,7 @@ The full list of built-in icons and their corresponding names can referenced bel | sun | {{< icon sun >}} | | tag | {{< icon tag >}} | | telegram | {{< icon telegram >}} | +| threads | {{< icon threads >}} | | tiktok | {{< icon tiktok >}} | | translate | {{< icon translate >}} | | triangle-exclamation | {{< icon triangle-exclamation >}} | From 79a66d4fda6842b1a468927c6ac6579208cb252f Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sun, 5 Nov 2023 10:11:04 +1100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20Prevent=20whitespace=20at=20?= =?UTF-8?q?start=20of=20`render-link`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #695 --- CHANGELOG.md | 4 ++++ layouts/_default/_markup/render-link.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc04d41c..05e6d801 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### 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 diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index d0d013ae..e8799b1a 100644 --- a/layouts/_default/_markup/render-link.html +++ b/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 }} From e3015b9006ffb99bd4d55fef6172ab156d43241b Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sun, 5 Nov 2023 10:14:23 +1100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A8=20Preparing=20release=20v2.7.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++- assets/css/compiled/main.css | 2 +- assets/css/main.css | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05e6d801..f061015e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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)) @@ -778,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 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 0451c90e..ae315687 100644 --- a/assets/css/compiled/main.css +++ b/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 */ diff --git a/assets/css/main.css b/assets/css/main.css index dd8f26b2..e0036ff5 100644 --- a/assets/css/main.css +++ b/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; diff --git a/package.json b/package.json index 4c913c4a..188f7d2d 100644 --- a/package.json +++ b/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",