From d8c2534762da9d0ca989fa52d5c81dafa7582a63 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 7 Feb 2022 09:37:59 +1100 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=92=84=20Fix=20`main`=20not=20filling?= =?UTF-8?q?=20screen=20vertically?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ layouts/_default/baseof.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dad487e8..540858bb 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 + +- Main content area not growing to fill screen vertically + ## [2.0.3] - 2022-02-07 ### Changed diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index f73c4da0..dd5fd6f7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -26,7 +26,7 @@ > {{- partial "header.html" . -}} -
+
{{- block "main" . }}{{- end }} {{ if and (.Site.Params.showScrollToTop | default true) (gt .WordCount 200) }}
Date: Tue, 8 Feb 2022 08:50:06 +1100 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=9A=B8=20Clear=20search=20results=20w?= =?UTF-8?q?hen=20wrapper=20dismissed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #109 --- CHANGELOG.md | 1 + assets/js/search.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 540858bb..1f5af5d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Fixed - Main content area not growing to fill screen vertically +- Search results not cleared when search is dismissed ([#109](https://github.com/jpanther/congo/pull/109)) ## [2.0.3] - 2022-02-07 diff --git a/assets/js/search.js b/assets/js/search.js index 89a0b442..c15de8fe 100644 --- a/assets/js/search.js +++ b/assets/js/search.js @@ -84,6 +84,8 @@ function hideSearch() { if (searchVisible) { document.body.style.overflow = "visible"; wrapper.style.visibility = "hidden"; + input.value = ""; + output.innerHTML = ""; document.activeElement.blur(); searchVisible = false; } From 7d6be8a999ab279c05a9b4090175e3735ecab702 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Tue, 8 Feb 2022 09:00:35 +1100 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=90=9B=20Emojify=20JSON=20output=20fo?= =?UTF-8?q?r=20search=20results?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + layouts/_default/index.json | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f5af5d5..9a48b25b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Main content area not growing to fill screen vertically - Search results not cleared when search is dismissed ([#109](https://github.com/jpanther/congo/pull/109)) +- Emoji strings not displaying in search results ## [2.0.3] - 2022-02-07 diff --git a/layouts/_default/index.json b/layouts/_default/index.json index 789b95c5..b7bd589a 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,6 +1,13 @@ {{- $index := slice -}} {{- range .Site.RegularPages -}} - {{ $section := .Site.GetPage "section" .Section }} - {{- $index = $index | append (dict "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) "title" .Title "section" $section.Title "summary" .Summary "content" (.Plain | safeJS) "permalink" .RelPermalink) -}} + {{- $section := .Site.GetPage "section" .Section -}} + {{- $index = $index | append (dict + "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) + "title" (.Title | emojify | safeJS) + "section" ($section.Title | emojify | safeJS) + "summary" (.Summary | emojify | safeJS) + "content" (.Plain | emojify | safeJS) + "permalink" .RelPermalink + ) -}} {{- end -}} {{- $index | jsonify -}} From eba52b04c84b355cd427dd5d6cd2cf8a59373228 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Tue, 8 Feb 2022 14:32:28 +1100 Subject: [PATCH 4/7] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20to=20Tailwin?= =?UTF-8?q?d=20v3.0.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 +++ assets/css/compiled/main.css | 2 +- package-lock.json | 68 ++++++++++++++++++------------------ 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a48b25b..7aa0305e 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] +### Changed + +- Upgrade to Tailwind v3.0.19 + ### Fixed - Main content area not growing to fill screen vertically diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 89b6a391..389a27bf 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,6 +1,6 @@ /*! Congo v2.0.3 | MIT License | https://github.com/jpanther/congo */ -/*! tailwindcss v3.0.18 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v3.0.19 | MIT License | https://tailwindcss.com */ /* 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) diff --git a/package-lock.json b/package-lock.json index 69bcc180..b69ffc99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hugo-congo-theme", - "version": "2.0.0", + "version": "2.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hugo-congo-theme", - "version": "2.0.0", + "version": "2.0.3", "hasInstallScript": true, "license": "MIT", "devDependencies": { @@ -354,9 +354,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001305", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001305.tgz", - "integrity": "sha512-p7d9YQMji8haf0f+5rbcv9WlQ+N5jMPfRAnUmZRlNxsNeBO3Yr7RYG6M2uTY1h9tCVdlkJg6YNNc4kiAiBLdWA==", + "version": "1.0.30001309", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz", + "integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==", "dev": true, "peer": true, "funding": { @@ -1294,9 +1294,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.63", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.63.tgz", - "integrity": "sha512-e0PX/LRJPFRU4kzJKLvTobxyFdnANCvcoDCe8XcyTqP58nTWIwdsHvXLIl1RkB39X5yaosLaroMASWB0oIsgCA==", + "version": "1.4.66", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz", + "integrity": "sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg==", "dev": true, "peer": true }, @@ -1378,9 +1378,9 @@ } }, "node_modules/fraction.js": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", - "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz", + "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==", "dev": true, "peer": true, "engines": { @@ -1714,9 +1714,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", "dev": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -2181,9 +2181,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.18.tgz", - "integrity": "sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw==", + "version": "3.0.19", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.19.tgz", + "integrity": "sha512-rjsdfz/qZya5xQ0OVynEMETgWq1CacmftgMYeXXh6bRM5vxsNwRSbMJsCCIjq/w67om9VP/AFMolOwiE+5VKig==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -2205,7 +2205,7 @@ "postcss-selector-parser": "^6.0.9", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.21.0" + "resolve": "^1.22.0" }, "bin": { "tailwind": "lib/cli.js", @@ -2535,9 +2535,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001305", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001305.tgz", - "integrity": "sha512-p7d9YQMji8haf0f+5rbcv9WlQ+N5jMPfRAnUmZRlNxsNeBO3Yr7RYG6M2uTY1h9tCVdlkJg6YNNc4kiAiBLdWA==", + "version": "1.0.30001309", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz", + "integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==", "dev": true, "peer": true }, @@ -3312,9 +3312,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.63", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.63.tgz", - "integrity": "sha512-e0PX/LRJPFRU4kzJKLvTobxyFdnANCvcoDCe8XcyTqP58nTWIwdsHvXLIl1RkB39X5yaosLaroMASWB0oIsgCA==", + "version": "1.4.66", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz", + "integrity": "sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg==", "dev": true, "peer": true }, @@ -3383,9 +3383,9 @@ } }, "fraction.js": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", - "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz", + "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==", "dev": true, "peer": true }, @@ -3644,9 +3644,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -3944,9 +3944,9 @@ "dev": true }, "tailwindcss": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.18.tgz", - "integrity": "sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw==", + "version": "3.0.19", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.19.tgz", + "integrity": "sha512-rjsdfz/qZya5xQ0OVynEMETgWq1CacmftgMYeXXh6bRM5vxsNwRSbMJsCCIjq/w67om9VP/AFMolOwiE+5VKig==", "dev": true, "requires": { "arg": "^5.0.1", @@ -3968,7 +3968,7 @@ "postcss-selector-parser": "^6.0.9", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.21.0" + "resolve": "^1.22.0" } }, "to-regex-range": { From 2544d65b91198af99336188b38e1fd03a734f7a9 Mon Sep 17 00:00:00 2001 From: Max Alletsee Date: Tue, 8 Feb 2022 21:53:13 +0100 Subject: [PATCH 5/7] Update de.yaml ... to add the new strings introduced since the initial translation --- i18n/de.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/i18n/de.yaml b/i18n/de.yaml index e9a2dd53..3136b93b 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -1,24 +1,24 @@ article: anchor_label: "Anker" date: "{{ .Date }}" - # date_updated: "Updated: {{ .Date }}" + date_updated: "Aktualisiert: {{ .Date }}" draft: "Entwurf" edit_title: "Inhalt bearbeiten" reading_time: one: "{{ .Count }} min" other: "{{ .Count }} min" reading_time_title: "Lesezeit" - # table_of_contents: "Table of Contents" - # word_count: - # one: "{{ .Count }} word" - # other: "{{ .Count }} words" + table_of_contents: "Inhaltsverzeichnis" + word_count: + one: "{{ .Count }} Wort" + other: "{{ .Count }} Wörter" author: byline_title: "Autor" -# code: -# copy: "Copy" -# copied: "Copied" +code: + copy: "Kopieren" + copied: "Kopiert" error: 404_title: "Seite nicht gefunden :confused:" @@ -34,14 +34,14 @@ list: externalurl_title: "Link zu einer externen Seite" no_articles: "Es gibt hier noch keine Beiträge." -# nav: -# scroll_to_top_title: "Scroll to top" -# skip_to_main: "Skip to main content" +nav: + scroll_to_top_title: "Zum Anfang scrollen" + skip_to_main: "Zum Hauptinhalt springen" -# search: -# open_button_title: "Search (/)" -# close_button_title: "Close (Esc)" -# input_placeholder: "Search" +search: + open_button_title: "Suche (/)" + close_button_title: "Schließen (Esc)" + input_placeholder: "Suchen" sharing: email: "Per E-Mail teilen" @@ -52,4 +52,4 @@ sharing: twitter: "Auf Twitter teilen" shortcode: - recent_articles: "Kürzlich" + recent_articles: "Neue Beiträge" From d9f159bddf7a7984633d8eb0e6244b47002c8aa3 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Wed, 9 Feb 2022 09:19:57 +1100 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=93=9D=20Update=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa0305e..59003873 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed +- Updated German translation ([#110](https://github.com/jpanther/congo/pull/110)) - Upgrade to Tailwind v3.0.19 ### Fixed From e9f59082ded9c0827e204b43066d6a717cc4844f Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Wed, 9 Feb 2022 10:22:07 +1100 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=94=A8=20Preparing=20release=20v2.0.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 59003873..c72415e6 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.0.4] - 2022-02-09 + ### Changed - Updated German translation ([#110](https://github.com/jpanther/congo/pull/110)) @@ -323,7 +325,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.0.3...HEAD +[unreleased]: https://github.com/jpanther/congo/compare/v2.0.4...HEAD +[2.0.4]: https://github.com/jpanther/congo/compare/v2.0.3...v2.0.4 [2.0.3]: https://github.com/jpanther/congo/compare/v2.0.2...v2.0.3 [2.0.2]: https://github.com/jpanther/congo/compare/v2.0.1...v2.0.2 [2.0.1]: https://github.com/jpanther/congo/compare/v2.0.0...v2.0.1 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 389a27bf..513badb6 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.0.3 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.0.4 | MIT License | https://github.com/jpanther/congo */ /*! tailwindcss v3.0.19 | MIT License | https://tailwindcss.com */ diff --git a/assets/css/main.css b/assets/css/main.css index c4b39302..816618f5 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.0.3 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.0.4 | MIT License | https://github.com/jpanther/congo */ @tailwind base; @tailwind components; diff --git a/package.json b/package.json index 96d928de..085b6bbc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-congo-theme", - "version": "2.0.3", + "version": "2.0.4", "description": "Congo theme for Hugo", "main": "index.js", "scripts": {