From 2039409722733ad60695b799a85dbc5779ae15a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sat, 31 Dec 2022 18:22:23 +0100 Subject: [PATCH 01/12] Support for UTF-8 encoded series names --- layouts/partials/series.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layouts/partials/series.html b/layouts/partials/series.html index f823e214..f42b93ed 100644 --- a/layouts/partials/series.html +++ b/layouts/partials/series.html @@ -5,7 +5,9 @@ class="py-1 text-lg font-semibold cursor-pointer bg-primary-200 text-neutral-800 ltr:-ml-5 ltr:pl-5 rtl:-mr-5 rtl:pr-5 dark:bg-primary-800 dark:text-neutral-100"> {{ index .Params.series 0 }} - {{ i18n "article.part_of_series" }} - {{ range $post := sort (index .Site.Taxonomies.series (index .Params.series 0 | urlize)) "Params.series_order" }} + {{ $seriesName := strings.ToLower (index .Params.series 0) }} + {{ $seriesNameURL := strings.Replace $seriesName " " "-" }} + {{ range $post := sort (index .Site.Taxonomies.series $seriesNameURL) "Params.series_order" }} {{ if eq $post.Permalink $.Page.Permalink }}
@@ -22,4 +24,4 @@ {{end}} -{{end}} \ No newline at end of file +{{end}} From 1211608786d647241facfbaf61872417b5406dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sat, 31 Dec 2022 18:22:58 +0100 Subject: [PATCH 02/12] Support for UTF-8 encoded series names --- layouts/partials/series-closed.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layouts/partials/series-closed.html b/layouts/partials/series-closed.html index 53fbb3d0..d96f55b2 100644 --- a/layouts/partials/series-closed.html +++ b/layouts/partials/series-closed.html @@ -4,7 +4,9 @@ class="py-1 text-lg font-semibold cursor-pointer bg-primary-200 text-neutral-800 ltr:-ml-5 ltr:pl-5 rtl:-mr-5 rtl:pr-5 dark:bg-primary-800 dark:text-neutral-100"> {{ index .Params.series 0 }} - {{ i18n "article.part_of_series" }} - {{ range $post := sort (index .Site.Taxonomies.series (index .Params.series 0 | urlize)) "Params.series_order" }} + {{ $seriesName := strings.ToLower (index .Params.series 0) }} + {{ $seriesNameURL := strings.Replace $seriesName " " "-" }} + {{ range $post := sort (index .Site.Taxonomies.series $seriesNameURL) "Params.series_order" }} {{ if eq $post.Permalink $.Page.Permalink }}
@@ -21,4 +23,4 @@ {{end}} -{{end}} \ No newline at end of file +{{end}} From 567988d93d14b6ef62282a9bf535507bb319eb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sat, 31 Dec 2022 18:24:31 +0100 Subject: [PATCH 03/12] Added personal site --- exampleSite/content/users/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/exampleSite/content/users/index.md b/exampleSite/content/users/index.md index d2580b7f..966ff6fd 100644 --- a/exampleSite/content/users/index.md +++ b/exampleSite/content/users/index.md @@ -53,6 +53,7 @@ Real websites that are built with Blowfish. | [sdehm.dev](https://sdehm.dev) | Personal site | | [dizzytech.de](https://dizzytech.de) | Personal site | | [blog.rotrixx.eu](https://blog.rotrixx.eu) | Personal site | +| [hexwiki.cz](https://hexwiki.cz/) | Personal site | From f592328d6c602486abeaba395d15ca63794949f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sat, 31 Dec 2022 18:25:23 +0100 Subject: [PATCH 04/12] Better wording --- i18n/cs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/cs.yaml b/i18n/cs.yaml index f5a3908c..86c89f58 100644 --- a/i18n/cs.yaml +++ b/i18n/cs.yaml @@ -18,7 +18,7 @@ article: likes: one: "{{ .Count }} líbí se mi" other: "{{ .Count }} líbí se mi" - part_of_series: "Tento článek patří do série." + part_of_series: "Tento článek patří do seriálu." part: "Část" this_article: "Tento článek" From ac59cb62b11deed9f7513303deebff2f9aec20cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sat, 31 Dec 2022 18:28:02 +0100 Subject: [PATCH 05/12] Added option to depluralize list names --- config/_default/config.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/_default/config.toml b/config/_default/config.toml index 6c232d4f..585c0f2d 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -6,6 +6,8 @@ # baseURL = "https://your_domain.com/" defaultContentLanguage = "en" +# pluralizeListTitles = "true" + enableRobotsTXT = true paginate = 20 summaryLength = 30 From cc51ec03c14c2e55ab2b653456b797cb6653b519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sat, 31 Dec 2022 20:14:50 +0100 Subject: [PATCH 06/12] Delete 200 word requirement for scroll to top --- layouts/_default/baseof.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index fff19a32..69ce37ec 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -25,7 +25,7 @@
{{ block "main" . }}{{ end }} - {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 200) }} + {{ if and (.Site.Params.footer.showScrollToTop | default true) }}
Date: Sat, 31 Dec 2022 20:31:47 +0100 Subject: [PATCH 07/12] Change so it doesn't affect list pages. --- layouts/_default/baseof.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 69ce37ec..ce87099c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -25,7 +25,7 @@
{{ block "main" . }}{{ end }} - {{ if and (.Site.Params.footer.showScrollToTop | default true) }} + {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 1) }}
Date: Sun, 1 Jan 2023 05:01:47 +0000 Subject: [PATCH 08/12] =?UTF-8?q?=F0=9F=91=B7=20Bump=20peaceiris/actions-h?= =?UTF-8?q?ugo=20from=202.4.12=20to=202.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [peaceiris/actions-hugo](https://github.com/peaceiris/actions-hugo) from 2.4.12 to 2.6.0. - [Release notes](https://github.com/peaceiris/actions-hugo/releases) - [Changelog](https://github.com/peaceiris/actions-hugo/blob/main/CHANGELOG.md) - [Commits](https://github.com/peaceiris/actions-hugo/compare/v2.4.12...v2.6.0) --- updated-dependencies: - dependency-name: peaceiris/actions-hugo dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/firebase-preview.yml | 2 +- .github/workflows/firebase-production.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/firebase-preview.yml b/.github/workflows/firebase-preview.yml index 8f40a12a..bfdcee2e 100644 --- a/.github/workflows/firebase-preview.yml +++ b/.github/workflows/firebase-preview.yml @@ -7,7 +7,7 @@ jobs: steps: - name: Hugo setup - uses: peaceiris/actions-hugo@v2.4.12 + uses: peaceiris/actions-hugo@v2.6.0 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' diff --git a/.github/workflows/firebase-production.yml b/.github/workflows/firebase-production.yml index a12b1896..17e6d680 100644 --- a/.github/workflows/firebase-production.yml +++ b/.github/workflows/firebase-production.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Hugo setup - uses: peaceiris/actions-hugo@v2.4.12 + uses: peaceiris/actions-hugo@v2.6.0 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a343bfe..25e3dd9e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@v2.6.0 with: hugo-version: "latest" From b70c03178805348547458bdf31b208fec548df30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Pfrogner?= <48058525+pfrogond@users.noreply.github.com> Date: Sun, 1 Jan 2023 09:03:26 +0100 Subject: [PATCH 09/12] Update cs.yaml --- i18n/cs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/cs.yaml b/i18n/cs.yaml index 86c89f58..f5a3908c 100644 --- a/i18n/cs.yaml +++ b/i18n/cs.yaml @@ -18,7 +18,7 @@ article: likes: one: "{{ .Count }} líbí se mi" other: "{{ .Count }} líbí se mi" - part_of_series: "Tento článek patří do seriálu." + part_of_series: "Tento článek patří do série." part: "Část" this_article: "Tento článek" From eb4554ffc6be628843c2a53b2cd534c808c9c475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Opali=C5=84ski?= Date: Sun, 1 Jan 2023 17:44:20 +0100 Subject: [PATCH 10/12] fix: Fix header with disabled logo on mobile --- layouts/partials/header/fixed.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/header/fixed.html b/layouts/partials/header/fixed.html index 4e0b56a4..609e3d80 100644 --- a/layouts/partials/header/fixed.html +++ b/layouts/partials/header/fixed.html @@ -1,7 +1,7 @@
-
+
-
+
{{ partial "partials/header/basic.html" . }}
From caa8476e3584f40e0271188a053af9c4da8164ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= Date: Sun, 1 Jan 2023 21:32:56 +0000 Subject: [PATCH 11/12] :bug: fix for sharing links parameter in params.toml config file --- config/_default/params.toml | 2 +- data/sharing.json | 62 ++++++++++++------------- exampleSite/config/_default/params.toml | 2 +- layouts/partials/sharing-links.html | 23 ++++----- 4 files changed, 44 insertions(+), 45 deletions(-) diff --git a/config/_default/params.toml b/config/_default/params.toml index c5d2631c..e36329e2 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -65,7 +65,7 @@ enableCodeCopy = true showAuthorsBadges = false showWordCount = true showSummary = true - sharingLinks = [ "linkedin", "twitter", "whatsapp", "pinterest", "reddit", "facebook", "email"] + sharingLinks = [ "linkedin", "twitter", "reddit", "pinterest", "facebook", "email"] [list] #showHero = true diff --git a/data/sharing.json b/data/sharing.json index 7a43b491..5c89852b 100644 --- a/data/sharing.json +++ b/data/sharing.json @@ -1,34 +1,32 @@ { - "links": { - "email": { - "icon": "email", - "title": "sharing.email", - "url": "mailto:?body=%s&subject=%s" - }, - "facebook": { - "icon": "facebook", - "title": "sharing.facebook", - "url": "https://www.facebook.com/sharer/sharer.php?u=%s"e=%s" - }, - "linkedin": { - "icon": "linkedin", - "title": "sharing.linkedin", - "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s" - }, - "pinterest": { - "icon": "pinterest", - "title": "sharing.pinterest", - "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s" - }, - "reddit": { - "icon": "reddit", - "title": "sharing.reddit", - "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s" - }, - "twitter": { - "icon": "twitter", - "title": "sharing.twitter", - "url": "https://twitter.com/intent/tweet/?url=%s&text=%s" - } + "email": { + "icon": "email", + "title": "sharing.email", + "url": "mailto:?body=%s&subject=%s" + }, + "facebook": { + "icon": "facebook", + "title": "sharing.facebook", + "url": "https://www.facebook.com/sharer/sharer.php?u=%s"e=%s" + }, + "linkedin": { + "icon": "linkedin", + "title": "sharing.linkedin", + "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s" + }, + "pinterest": { + "icon": "pinterest", + "title": "sharing.pinterest", + "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s" + }, + "reddit": { + "icon": "reddit", + "title": "sharing.reddit", + "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s" + }, + "twitter": { + "icon": "twitter", + "title": "sharing.twitter", + "url": "https://twitter.com/intent/tweet/?url=%s&text=%s" } -} +} \ No newline at end of file diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 13d0d64c..efe3a93d 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -64,7 +64,7 @@ defaultBackgroundImage = "/img/iceland.jpg" showAuthorsBadges = true showWordCount = false showSummary = true - sharingLinks = [ "linkedin", "twitter", "whatsapp", "pinterest", "reddit", "facebook", "email"] + sharingLinks = [ "linkedin", "twitter", "reddit", "pinterest", "facebook", "email"] [list] showHero = true diff --git a/layouts/partials/sharing-links.html b/layouts/partials/sharing-links.html index 91365591..67b29235 100644 --- a/layouts/partials/sharing-links.html +++ b/layouts/partials/sharing-links.html @@ -1,16 +1,17 @@ {{ with .Params.sharingLinks | default (.Site.Params.article.sharingLinks | default false) }} + {{ $links := site.Data.sharing }}
- {{ range $.Site.Data.sharing.links }} - {{ with . }} - - {{ partial "icon.html" .icon }} - + {{ range . }} + {{ with index $links . }} + + {{ partial "icon.html" .icon }} + {{ end }} {{ end }}
From 32af7dde2b5984633efe28a7cd812f4e3c43f2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= Date: Sun, 1 Jan 2023 21:38:43 +0000 Subject: [PATCH 12/12] final polish --- config/_default/config.toml | 2 +- exampleSite/config/_default/config.toml | 2 ++ package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/_default/config.toml b/config/_default/config.toml index 585c0f2d..3a0a8bea 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -6,7 +6,7 @@ # baseURL = "https://your_domain.com/" defaultContentLanguage = "en" -# pluralizeListTitles = "true" +# pluralizeListTitles = "true" # hugo function useful for non-english languages, find out more in https://gohugo.io/getting-started/configuration/#pluralizelisttitles enableRobotsTXT = true paginate = 20 diff --git a/exampleSite/config/_default/config.toml b/exampleSite/config/_default/config.toml index 9af54860..668d0d88 100644 --- a/exampleSite/config/_default/config.toml +++ b/exampleSite/config/_default/config.toml @@ -6,6 +6,8 @@ theme = "blowfish" baseURL = "https://nunocoracao.github.io/blowfish" defaultContentLanguage = "en" +# pluralizeListTitles = "true" # hugo function useful for non-english languages, find out more in https://gohugo.io/getting-started/configuration/#pluralizelisttitles + enableRobotsTXT = true paginate = 20 summaryLength = 30 diff --git a/package.json b/package.json index fa46078f..df078707 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-blowfish-theme", - "version": "2.22.0", + "version": "2.22.1", "description": "Blowfish theme for Hugo", "scripts": { "fullinstall": "npm run preinstall && npm install && npm run postinstall",