From 939cb8d7d5749916762af55b226cd75f3d3cf378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Guti=C3=A9rrez=20Moreno?= Date: Thu, 10 Nov 2022 12:23:28 +0100 Subject: [PATCH 01/21] Update users.md --- exampleSite/content/users.md | 1 + 1 file changed, 1 insertion(+) diff --git a/exampleSite/content/users.md b/exampleSite/content/users.md index 891a590f..78f007e2 100644 --- a/exampleSite/content/users.md +++ b/exampleSite/content/users.md @@ -46,6 +46,7 @@ Real websites that are built with Congo. | [boyersnet.com](https://boyersnet.com) | Personal site and Blog | | [major.io](https://major.io) | Personal site and Blog | | [bayas.dev](https://bayas.dev) | Personal site and Blog | +| [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/) | Personal site and Tech blog | | [顾宇的博客](https://www.guyu.me/) | Personal Blog (in Chinese) | **Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users.md). From 5855cbfccc3bb9beacc51d7d174a4f5932fb34fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Guti=C3=A9rrez=20Moreno?= Date: Thu, 10 Nov 2022 12:25:28 +0100 Subject: [PATCH 02/21] Update users.md --- exampleSite/content/users.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exampleSite/content/users.md b/exampleSite/content/users.md index 78f007e2..5c6c6a86 100644 --- a/exampleSite/content/users.md +++ b/exampleSite/content/users.md @@ -46,7 +46,7 @@ Real websites that are built with Congo. | [boyersnet.com](https://boyersnet.com) | Personal site and Blog | | [major.io](https://major.io) | Personal site and Blog | | [bayas.dev](https://bayas.dev) | Personal site and Blog | -| [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/) | Personal site and Tech blog | +| [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/) | Personal site and Tech blog | | [顾宇的博客](https://www.guyu.me/) | Personal Blog (in Chinese) | **Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users.md). From b8d19898d70c64ee5413d210d110e88ade8e042a Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:04:36 +1100 Subject: [PATCH 03/21] =?UTF-8?q?=F0=9F=93=9D=20Correct=20the=20order=20of?= =?UTF-8?q?=20sites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exampleSite/content/users.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exampleSite/content/users.md b/exampleSite/content/users.md index 5c6c6a86..1a016af9 100644 --- a/exampleSite/content/users.md +++ b/exampleSite/content/users.md @@ -46,7 +46,7 @@ Real websites that are built with Congo. | [boyersnet.com](https://boyersnet.com) | Personal site and Blog | | [major.io](https://major.io) | Personal site and Blog | | [bayas.dev](https://bayas.dev) | Personal site and Blog | -| [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/) | Personal site and Tech blog | | [顾宇的博客](https://www.guyu.me/) | Personal Blog (in Chinese) | +| [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/) | Personal site and Tech blog | **Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users.md). From 955ffd8c81af75534a3c661ecabaea23157d93c9 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:42:36 +1100 Subject: [PATCH 04/21] =?UTF-8?q?=F0=9F=91=B7=20Update=20closed=20labeller?= =?UTF-8?q?=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/label-closed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-closed.yml b/.github/workflows/label-closed.yml index 2606680c..e997e895 100644 --- a/.github/workflows/label-closed.yml +++ b/.github/workflows/label-closed.yml @@ -22,4 +22,4 @@ jobs: uses: RebeccaStevens/issue-closed-labeler-action@latest with: token: "${{ secrets.GITHUB_TOKEN }}" - rules: '[{"condition": "wip", "remove": "wip"}]' + rules: '[{ condition: "wip", remove: "wip" }]' From 632bcb0df8457304de013f218080c5dbd6634749 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:43:45 +1100 Subject: [PATCH 05/21] =?UTF-8?q?=F0=9F=90=9B=20Remove=20duplicate=20pagin?= =?UTF-8?q?ation=20on=20term=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #366 --- CHANGELOG.md | 4 ++++ layouts/_default/term.html | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 175123ee..e5f92a7b 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 + +- Pagination is duplicated on term pages ([#366](https://github.com/jpanther/congo/issues/366)) + ## [2.4.0] - 2022-11-10 ### Added diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 98fb07b1..e5225164 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -40,5 +40,4 @@ {{ end }} - {{ partial "pagination.html" . }} {{ end }} From f0b86e6c27c9701caa965c6882234dc0021daed2 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:47:03 +1100 Subject: [PATCH 06/21] =?UTF-8?q?=F0=9F=91=B7=20Update=20closed=20labeller?= =?UTF-8?q?=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/label-closed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-closed.yml b/.github/workflows/label-closed.yml index e997e895..37ef63f6 100644 --- a/.github/workflows/label-closed.yml +++ b/.github/workflows/label-closed.yml @@ -22,4 +22,4 @@ jobs: uses: RebeccaStevens/issue-closed-labeler-action@latest with: token: "${{ secrets.GITHUB_TOKEN }}" - rules: '[{ condition: "wip", remove: "wip" }]' + rules: '[{"condition":"wip","remove":"wip"}]' From 6a904413a8ce1efa1dbad7c02c966514e36ad2e0 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:22:15 +1100 Subject: [PATCH 07/21] =?UTF-8?q?=F0=9F=90=9B=20Fix=20list=20page=20doesn'?= =?UTF-8?q?t=20render=20nested=20list=20pages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #365 --- CHANGELOG.md | 1 + layouts/_default/list.html | 2 +- layouts/_default/term.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5f92a7b..2b7a26e2 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/), ### Fixed +- List page doesn't render nested list pages ([#365](https://github.com/jpanther/congo/issues/365)) - Pagination is duplicated on term pages ([#366](https://github.com/jpanther/congo/issues/366)) ## [2.4.0] - 2022-11-10 diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1148dca3..71b29930 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -37,7 +37,7 @@ {{ end }} {{ end }} {{ else }} - {{ range .Paginator.Pages }} + {{ range (.Paginate .Pages).Pages }} {{ partial "article-link.html" . }} {{ end }} {{ end }} diff --git a/layouts/_default/term.html b/layouts/_default/term.html index e5225164..666c84ce 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -26,7 +26,7 @@ {{ end }} {{ end }} {{ else }} - {{ range .Paginator.Pages }} + {{ range (.Paginate .Pages).Pages }} {{ partial "article-link.html" . }} {{ end }} {{ end }} From 7970511402b14a1d6f4256874bdf355c25c0d521 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:23:44 +1100 Subject: [PATCH 08/21] =?UTF-8?q?=F0=9F=90=9B=20Fix=20last=20pagination=20?= =?UTF-8?q?link=20displayed=20twice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + layouts/partials/pagination.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b7a26e2..222c7355 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/), - List page doesn't render nested list pages ([#365](https://github.com/jpanther/congo/issues/365)) - Pagination is duplicated on term pages ([#366](https://github.com/jpanther/congo/issues/366)) +- Link to last pagination page sometimes displays twice ## [2.4.0] - 2022-11-10 diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 4228b332..3d8e88ec 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -59,7 +59,7 @@ {{- end }} {{- with .Last }} - {{- if lt $currentPageNumber (sub .TotalPages $width) }} + {{- if and (lt $currentPageNumber (sub .TotalPages $width)) (lt $end .TotalPages) }} {{- if lt $currentPageNumber (sub .TotalPages (add $width 1)) }}
  • {{- end }} From eb573dc1b98219ea2f17ae8181347751a4496802 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:24:57 +1100 Subject: [PATCH 09/21] =?UTF-8?q?=F0=9F=90=9B=20Recent=20articles=20should?= =?UTF-8?q?=20always=20display=205=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + layouts/partials/recent-articles.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 222c7355..74a526d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - List page doesn't render nested list pages ([#365](https://github.com/jpanther/congo/issues/365)) - Pagination is duplicated on term pages ([#366](https://github.com/jpanther/congo/issues/366)) - Link to last pagination page sometimes displays twice +- Recent articles would sometimes display less than five articles ## [2.4.0] - 2022-11-10 diff --git a/layouts/partials/recent-articles.html b/layouts/partials/recent-articles.html index 4d79fc33..be1cff89 100644 --- a/layouts/partials/recent-articles.html +++ b/layouts/partials/recent-articles.html @@ -1,6 +1,6 @@ {{ if .Site.Params.homepage.showRecent | default false }}

    {{ i18n "shortcode.recent_articles" | emojify }}

    - {{ range first 5 (.Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections)).Pages }} + {{ range first 5 (.Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 5).Pages }} {{ partial "article-link.html" . }} {{ end }} {{ end }} From 6b5ee216bf6be2043ca789f4e4d59bcd87edfa05 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:28:28 +1100 Subject: [PATCH 10/21] =?UTF-8?q?=F0=9F=91=B7=20Remove=20labeller=20on=20c?= =?UTF-8?q?lose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/label-closed.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/label-closed.yml diff --git a/.github/workflows/label-closed.yml b/.github/workflows/label-closed.yml deleted file mode 100644 index 37ef63f6..00000000 --- a/.github/workflows/label-closed.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Labeller on close - -on: - issues: - types: - - closed - pull_request: - types: - - closed - -jobs: - run: - name: "Label" - runs-on: ubuntu-latest - permissions: - contents: read - pull-requests: write - issues: write - - steps: - - name: Update Labels - uses: RebeccaStevens/issue-closed-labeler-action@latest - with: - token: "${{ secrets.GITHUB_TOKEN }}" - rules: '[{"condition":"wip","remove":"wip"}]' From a5e748f2d81e62d543de20e886bb877ebfdc2f86 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:38:29 +1100 Subject: [PATCH 11/21] =?UTF-8?q?=F0=9F=91=B7=20Add=20unlabel=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/unlabel.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/unlabel.yml diff --git a/.github/workflows/unlabel.yml b/.github/workflows/unlabel.yml new file mode 100644 index 00000000..94a64e57 --- /dev/null +++ b/.github/workflows/unlabel.yml @@ -0,0 +1,16 @@ +name: Unlabeller + +on: + issues: + types: [closed] + pull_request: + types: [closed] + +jobs: + unlabel: + runs-on: ubuntu-latest + steps: + - name: Remove labels + uses: andymckay/labeler@master + with: + remove-labels: "wip" From fd5adc843dd1afe1404d686be0f88edf20af284b Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:05:50 +1100 Subject: [PATCH 12/21] =?UTF-8?q?=F0=9F=91=B7=20Add=20workflow=20to=20buil?= =?UTF-8?q?d=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-theme.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/build-theme.yml diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml new file mode 100644 index 00000000..02392d16 --- /dev/null +++ b/.github/workflows/build-theme.yml @@ -0,0 +1,30 @@ +name: Build Theme + +on: + pull_request_target: + types: [opened, edited] + branches: + - "dependabot/*" + +jobs: + build: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' || github.event.sender.login == 'dependabot[bot]' + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install dependencies and Build Theme + uses: actions/setup-node@v3 + - run: npm install + - run: npm run build + - name: Commit and push CSS changes + uses: devops-infra/action-commit-push@master + with: + github_token: "${{ secrets.GITHUB_TOKEN }}" + commit_message: "💄 Rebuild CSS" + - run: npm run assets + - name: Commit and push vendor changes + uses: devops-infra/action-commit-push@master + with: + github_token: "${{ secrets.GITHUB_TOKEN }}" + commit_message: "📦 Update packaged assets" From 0496b2641efd1b0262a1dec65c900f33a1a6c4d4 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:10:37 +1100 Subject: [PATCH 13/21] =?UTF-8?q?=F0=9F=91=B7=20Update=20build=20theme=20w?= =?UTF-8?q?orkflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-theme.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index 02392d16..40c643be 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -2,7 +2,6 @@ name: Build Theme on: pull_request_target: - types: [opened, edited] branches: - "dependabot/*" From 4ab8a47b105e5f7f8284c33ef6479381620b3d58 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:14:04 +1100 Subject: [PATCH 14/21] =?UTF-8?q?=F0=9F=91=B7=20Update=20build=20theme=20w?= =?UTF-8?q?orkflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-theme.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index 40c643be..a940956c 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -1,9 +1,6 @@ name: Build Theme -on: - pull_request_target: - branches: - - "dependabot/*" +on: [pull_request_target] jobs: build: From 43026f02676b3e5e4f99849462fb0d16601c22f5 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:40:19 +1100 Subject: [PATCH 15/21] =?UTF-8?q?=F0=9F=91=B7=20Update=20build=20theme=20w?= =?UTF-8?q?orkflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-theme.yml | 46 ++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index a940956c..2b2f564f 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -12,15 +12,41 @@ jobs: - name: Install dependencies and Build Theme uses: actions/setup-node@v3 - run: npm install - - run: npm run build - - name: Commit and push CSS changes - uses: devops-infra/action-commit-push@master - with: - github_token: "${{ secrets.GITHUB_TOKEN }}" - commit_message: "💄 Rebuild CSS" - run: npm run assets - - name: Commit and push vendor changes - uses: devops-infra/action-commit-push@master + - name: Commit and push Chart.js changes + uses: stefanzweifel/git-auto-commit-action@v4 with: - github_token: "${{ secrets.GITHUB_TOKEN }}" - commit_message: "📦 Update packaged assets" + branch: "${{ github.head_ref }}" + push_options: "--dry-run" + file_pattern: "assets/lib/chart/*" + commit_message: "📦 Update packaged ChartJS" + - name: Commit Fuse changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: "${{ github.head_ref }}" + push_options: "--dry-run" + file_pattern: "assets/lib/fuse/*" + commit_message: "📦 Update packaged FuseJS" + - name: Commit KaTeX changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: "${{ github.head_ref }}" + push_options: "--dry-run" + file_pattern: "assets/lib/katex/*" + commit_message: "📦 Update packaged KaTeX" + - name: Commit Mermaid changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: "${{ github.head_ref }}" + push_options: "--dry-run" + file_pattern: "assets/lib/mermaid/*" + commit_message: "📦 Update packaged Mermaid" + - run: npm run build + - name: Commit CSS changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: "${{ github.head_ref }}" + push_options: "--dry-run" + file_pattern: "assets/css/compiled/main.css" + commit_message: "💄 Rebuild CSS" + - run: git push From 70210864ec15ac90ab85df188200765116ef2dd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 03:42:10 +0000 Subject: [PATCH 16/21] =?UTF-8?q?=F0=9F=93=8C=20Bump=20tailwindcss=20from?= =?UTF-8?q?=203.2.2=20to=203.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.2.2 to 3.2.4. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.2.2...v3.2.4) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index d97384f8..f966f86f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hugo-congo-theme", - "version": "2.3.1", + "version": "2.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hugo-congo-theme", - "version": "2.3.1", + "version": "2.4.0", "hasInstallScript": true, "license": "MIT", "devDependencies": { @@ -19,7 +19,7 @@ "prettier-plugin-go-template": "^0.0.13", "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.2", - "tailwindcss": "^3.2.2", + "tailwindcss": "^3.2.4", "vendor-copy": "^3.0.1" }, "funding": { @@ -1843,9 +1843,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz", - "integrity": "sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", + "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==", "dev": true, "dependencies": { "arg": "^5.0.2", @@ -3364,9 +3364,9 @@ "dev": true }, "tailwindcss": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz", - "integrity": "sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", + "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==", "dev": true, "requires": { "arg": "^5.0.2", diff --git a/package.json b/package.json index 309645d8..9a35c0eb 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "prettier-plugin-go-template": "^0.0.13", "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.2", - "tailwindcss": "^3.2.2", + "tailwindcss": "^3.2.4", "vendor-copy": "^3.0.1" }, "vendorCopy": [], From 7a3da897156283075bb6772c5130e21e1bce9d9d Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:53:00 +1100 Subject: [PATCH 17/21] =?UTF-8?q?=F0=9F=91=B7=20Update=20dependabot=20acto?= =?UTF-8?q?r=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-theme.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index 2b2f564f..d09b907c 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -5,7 +5,7 @@ on: [pull_request_target] jobs: build: runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' || github.event.sender.login == 'dependabot[bot]' + if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Checkout uses: actions/checkout@v3 From 22ceb8ee4e35f20473017363bf43424b952e00b8 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:56:29 +1100 Subject: [PATCH 18/21] =?UTF-8?q?=F0=9F=92=84=20Rebuild=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/compiled/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index c44eac55..1ead6b6a 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,6 +1,6 @@ /*! Congo v2.4.0 | MIT License | https://github.com/jpanther/congo */ -/*! tailwindcss v3.2.2 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */ /* 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) From 53067b4f1a2d9dc7b27160d5f925a5f3580630cb Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:57:56 +1100 Subject: [PATCH 19/21] =?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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a526d6..812ed660 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.2.4 ([#368](https://github.com/jpanther/congo/pull/368)) + ### Fixed - List page doesn't render nested list pages ([#365](https://github.com/jpanther/congo/issues/365)) From 963a71a6c396dda8b2a3f88d185de4389702ff26 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:58:36 +1100 Subject: [PATCH 20/21] =?UTF-8?q?=F0=9F=91=B7=20Add=20head=5Fref=20to=20ch?= =?UTF-8?q?eckout=20step?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-theme.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index d09b907c..905709a5 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -9,6 +9,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + ref: "${{ github.head_ref }}" - name: Install dependencies and Build Theme uses: actions/setup-node@v3 - run: npm install From 968d54a18e0a2d6c5753a6df4d94c6083dc75d67 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 14 Nov 2022 15:00:46 +1100 Subject: [PATCH 21/21] =?UTF-8?q?=F0=9F=94=A8=20Preparing=20release=20v2.4?= =?UTF-8?q?.1?= 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 812ed660..95d4b727 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.4.1] - 2022-11-14 + ### Changed - Upgrade to Tailwind v3.2.4 ([#368](https://github.com/jpanther/congo/pull/368)) @@ -551,7 +553,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.4.0...HEAD +[unreleased]: https://github.com/jpanther/congo/compare/v2.4.1...HEAD +[2.4.1]: https://github.com/jpanther/congo/compare/v2.4.0...v2.4.1 [2.4.0]: https://github.com/jpanther/congo/compare/v2.3.1...v2.4.0 [2.3.1]: https://github.com/jpanther/congo/compare/v2.3.0...v2.3.1 [2.3.0]: https://github.com/jpanther/congo/compare/v2.2.3...v2.3.0 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 1ead6b6a..d9b31e8c 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.4.0 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.4.1 | MIT License | https://github.com/jpanther/congo */ /*! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */ diff --git a/assets/css/main.css b/assets/css/main.css index 82f8f128..ffb5a8da 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.4.0 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.4.1 | MIT License | https://github.com/jpanther/congo */ @tailwind base; @tailwind components; diff --git a/package.json b/package.json index 9a35c0eb..40c5d9f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-congo-theme", - "version": "2.4.0", + "version": "2.4.1", "description": "Congo theme for Hugo", "scripts": { "preinstall": "rimraf assets/vendor",