From 6b328f96b0fcc23abb3dff1fe028d98d5cb1ce92 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Mar 2020 15:15:25 +0200 Subject: [PATCH 01/16] Kick-start development of Pico 3.0 --- composer.json | 3 ++- css/style.css | 2 +- js/pico.js | 2 +- js/utils.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e46621a..f537ba1 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "extra": { "installer-name": "default", "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.1.x-dev", + "dev-pico-3.0": "3.0.x-dev" } } } diff --git a/css/style.css b/css/style.css index 3fe40d3..60ccb72 100644 --- a/css/style.css +++ b/css/style.css @@ -11,7 +11,7 @@ * @author Daniel Rudolf * @link http://picocms.org * @license http://opensource.org/licenses/MIT The MIT License - * @version 2.1 + * @version 3.0 */ * { diff --git a/js/pico.js b/js/pico.js index 4ddb6ad..ef2f9bc 100644 --- a/js/pico.js +++ b/js/pico.js @@ -6,7 +6,7 @@ * @author Daniel Rudolf * @link http://picocms.org * @license http://opensource.org/licenses/MIT The MIT License - * @version 2.1 + * @version 3.0 */ function main() diff --git a/js/utils.js b/js/utils.js index 62b65cc..a50821a 100644 --- a/js/utils.js +++ b/js/utils.js @@ -6,7 +6,7 @@ * @author Daniel Rudolf * @link http://picocms.org * @license http://opensource.org/licenses/MIT The MIT License - * @version 2.1 + * @version 3.0 */ utils = {}; From 9f2a61a31539da932015a1e1f23b8fac143590a6 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Mar 2020 15:18:39 +0200 Subject: [PATCH 02/16] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4564e49..367e6f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ Pico Default Theme Changelog refer to both the UPGRADE and NEWS sections of the docs for more details. +### Version 3.0.0-alpha.1 +Released: 2020-03-29 + +``` +* [New] Kick-start development of Pico 3.0 +``` + ### Version 2.1.1 Released: 2019-12-31 From 85fe74b8db419a259843c74c5c9d7d6c495e5a1e Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Mar 2020 15:18:52 +0200 Subject: [PATCH 03/16] Version 3.0.0-alpha.1 ``` * [New] Kick-start development of Pico 3.0 ``` From 9018a67f89abb3942886b1100d15dbe2295085ef Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 11 Apr 2020 21:14:28 +0200 Subject: [PATCH 04/16] Update to Twig 3.0 --- index.twig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/index.twig b/index.twig index 41d0055..28a9187 100644 --- a/index.twig +++ b/index.twig @@ -43,10 +43,12 @@ From 3e9a2a2b276873fdc9c1c2741945edc3bb4295e1 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 24 Dec 2020 17:56:02 +0100 Subject: [PATCH 05/16] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08ab505..a1e2382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ Pico Default Theme Changelog refer to both the UPGRADE and NEWS sections of the docs for more details. +### Version 3.0.0-alpha.2 +Released: 2020-12-24 + +``` +* [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4 +``` + ### Version 2.1.4 Released: 2020-08-29 From 2abf36b6621e667798420d6dc91d73bef7792365 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 24 Dec 2020 17:56:05 +0100 Subject: [PATCH 06/16] Version 3.0.0-alpha.2 ``` * [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4 ``` From ec00ed0422928351269ca787b223279272f26ca1 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Mon, 7 Feb 2022 00:01:32 +0100 Subject: [PATCH 07/16] Bump to API version 4 --- pico-theme.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-theme.yml b/pico-theme.yml index fc65b28..b243574 100644 --- a/pico-theme.yml +++ b/pico-theme.yml @@ -1,4 +1,4 @@ -api_version: 3 # Use Pico's latest API version for themes +api_version: 4 # Use Pico's latest API version for themes meta: # Register meta headers used by this theme Logo: logo # The URL to your website's logo (value is passed to Pico's "url" Twig filter) From b5c3371f3301fd26e7b45cbcf5dc8b3eaf616b46 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Mon, 7 Feb 2022 00:02:08 +0100 Subject: [PATCH 08/16] Update footer --- index.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.twig b/index.twig index 28a9187..86dda63 100644 --- a/index.twig +++ b/index.twig @@ -73,7 +73,8 @@

Pico was made by Gilbert Pellegrom - and is maintained by The Pico Community. + and is brought to you by Daniel Rudolf and + The Pico Community. Released under the MIT license.

From 65e6f70dbddeb3eaf976282ae0f11ab133f6978c Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Mon, 7 Feb 2022 00:02:19 +0100 Subject: [PATCH 09/16] Improve Twig syntax --- index.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.twig b/index.twig index 86dda63..4eba3a5 100644 --- a/index.twig +++ b/index.twig @@ -4,7 +4,7 @@ - {% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }} + {{ meta.title ? meta.title ~ " | " }}{{ site_title }} {% if meta.description %} {% endif %} From ca9360aa2239bf27728678c1dc23bf832b8ec24f Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 27 Feb 2022 16:38:18 +0100 Subject: [PATCH 10/16] Update various links --- README.md | 2 +- composer.json | 6 +++--- css/style.css | 4 ++-- icon/COPYRIGHT.txt | 6 +++--- index.twig | 2 +- js/pico.js | 4 ++-- js/utils.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 56bf903..cdb100c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Pico Default Theme This is the repository of Pico's official default theme. -Pico is a stupidly simple, blazing fast, flat file CMS. See http://picocms.org/ for more info. +Pico is a stupidly simple, blazing fast, flat file CMS. See https://picocms.org/ for more info. Please refer to [`picocms/Pico`](https://github.com/picocms/Pico) to get info about how to contribute or getting help. diff --git a/composer.json b/composer.json index f537ba1..c9610be 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "pico-theme", "description": "This is Pico's official default theme. Pico is a stupidly simple, blazing fast, flat file CMS.", "keywords": [ "pico", "picocms", "picocms-theme", "pico-theme", "default-theme" ], - "homepage": "http://picocms.org/", + "homepage": "https://picocms.org/", "license": "MIT", "authors": [ { @@ -13,7 +13,7 @@ }, { "name": "The Pico Community", - "homepage": "http://picocms.org/" + "homepage": "https://picocms.org/" }, { "name": "Contributors", @@ -21,7 +21,7 @@ } ], "support": { - "docs": "http://picocms.org/themes/default/", + "docs": "https://picocms.org/themes/default/", "issues": "https://github.com/picocms/pico-theme/issues", "source": "https://github.com/picocms/pico-theme" }, diff --git a/css/style.css b/css/style.css index 60ccb72..82fa1ae 100644 --- a/css/style.css +++ b/css/style.css @@ -9,8 +9,8 @@ * * @author Gilbert Pellegrom * @author Daniel Rudolf - * @link http://picocms.org - * @license http://opensource.org/licenses/MIT The MIT License + * @link https://picocms.org + * @license https://opensource.org/licenses/MIT The MIT License * @version 3.0 */ diff --git a/icon/COPYRIGHT.txt b/icon/COPYRIGHT.txt index 4ca26c4..5a07f53 100644 --- a/icon/COPYRIGHT.txt +++ b/icon/COPYRIGHT.txt @@ -6,7 +6,7 @@ Icon fonts generator Author: Vitaly Puzrin License: The MIT License - Homepage: http://fontello.com/ + Homepage: https://fontello.com/ @@ -17,7 +17,7 @@ Font license info Copyright (C) 2016 by Dave Gandy Author: Dave Gandy - License: SIL OFL 1.1 - Homepage: http://fortawesome.github.com/Font-Awesome/ + License: SIL OFL 1.1 + Homepage: https://fontawesome.com/ Icons: chat, github-circled ("octocat"), menu, dollar diff --git a/index.twig b/index.twig index 4eba3a5..2a1875e 100644 --- a/index.twig +++ b/index.twig @@ -72,7 +72,7 @@ {% endfor %}

- Pico was made by Gilbert Pellegrom + Pico was made by Gilbert Pellegrom and is brought to you by Daniel Rudolf and The Pico Community. Released under the MIT license. diff --git a/js/pico.js b/js/pico.js index ef2f9bc..bff9505 100644 --- a/js/pico.js +++ b/js/pico.js @@ -4,8 +4,8 @@ * Pico is a stupidly simple, blazing fast, flat file CMS. * * @author Daniel Rudolf - * @link http://picocms.org - * @license http://opensource.org/licenses/MIT The MIT License + * @link https://picocms.org + * @license https://opensource.org/licenses/MIT The MIT License * @version 3.0 */ diff --git a/js/utils.js b/js/utils.js index a50821a..b78894f 100644 --- a/js/utils.js +++ b/js/utils.js @@ -4,8 +4,8 @@ * Pico is a stupidly simple, blazing fast, flat file CMS. * * @author Daniel Rudolf - * @link http://picocms.org - * @license http://opensource.org/licenses/MIT The MIT License + * @link https://picocms.org + * @license https://opensource.org/licenses/MIT The MIT License * @version 3.0 */ From 64b82faaf48de5cbf79b439d04ae5a45694715f5 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 13 Mar 2022 12:02:41 +0100 Subject: [PATCH 11/16] CI: Update Stale Bot config --- .github/workflows/stale.yml | 53 ++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 878d942..5ca512e 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,28 +1,33 @@ -name: "Mark or close stale issues and PRs" +name: Mark or close stale issues and PRs + on: - schedule: - - cron: "0 12 * * *" + schedule: + - cron: "0 */6 * * *" jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - days-before-stale: 7 - days-before-close: 2 - stale-issue-message: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed in two days if no further activity - occurs. Thank you for your contributions! :+1: - stale-pr-message: > - This pull request has been automatically marked as stale because it has not had - recent activity. It will be closed in two days if no further activity - occurs. Thank you for your contributions! :+1: - stale-pr-label: "info: Stale" - stale-issue-label: "info: Stale" - exempt-issue-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned" - exempt-pr-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned" - remove-stale-when-updated: true + stale: + name: Mark or close stale issues and PRs + + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + steps: + - uses: actions/stale@v3 + with: + days-before-stale: 7 + days-before-close: 2 + stale-issue-message: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed in two days if no further activity + occurs. Thank you for your contributions! :+1: + stale-pr-message: > + This pull request has been automatically marked as stale because it has not had + recent activity. It will be closed in two days if no further activity + occurs. Thank you for your contributions! :+1: + stale-pr-label: "info: Stale" + stale-issue-label: "info: Stale" + exempt-issue-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned" + exempt-pr-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned" + remove-stale-when-updated: true From da7abf9f0de15a665c5efb200459cc9ceec685a6 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 13 Mar 2022 12:17:33 +0100 Subject: [PATCH 12/16] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1e2382..3046ddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,17 @@ Pico Default Theme Changelog refer to both the UPGRADE and NEWS sections of the docs for more details. +### Version 3.0.0-beta.1 +Released: - + +``` +* [New] Update to API version 4 (no changes necessary) +* [Changed] Include non-hidden pages without a title in the navigation menu; + use the page ID as fallback for the missing page title +* [Changed] Update syntax to Twig 3.3 +* [Changed] Update credits in theme footer +``` + ### Version 3.0.0-alpha.2 Released: 2020-12-24 From f322a0bbdd115ee1ad14fc50b96a07e79b2a9bd4 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 3 Apr 2022 16:55:53 +0200 Subject: [PATCH 13/16] Don't justify contents by default Justifying contents is discouraged in general, but furthermore produces some really ugly lines with Pico's sample contents --- CHANGELOG.md | 1 + css/style.css | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3046ddf..5c00ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Released: - * [New] Update to API version 4 (no changes necessary) * [Changed] Include non-hidden pages without a title in the navigation menu; use the page ID as fallback for the missing page title +* [Changed] Don't justify text contents by default * [Changed] Update syntax to Twig 3.3 * [Changed] Update credits in theme footer ``` diff --git a/css/style.css b/css/style.css index 82fa1ae..2a1041b 100644 --- a/css/style.css +++ b/css/style.css @@ -185,7 +185,6 @@ body { } p, td, th, li, dd { - text-align: justify; overflow-wrap: break-word; word-wrap: break-word; } From b648e937f0d9a20aa96f37f6731c4f315cf566e4 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 5 Jan 2023 22:58:52 +0100 Subject: [PATCH 14/16] Update to API version 4 --- pico-theme.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-theme.yml b/pico-theme.yml index b243574..fc65b28 100644 --- a/pico-theme.yml +++ b/pico-theme.yml @@ -1,4 +1,4 @@ -api_version: 4 # Use Pico's latest API version for themes +api_version: 3 # Use Pico's latest API version for themes meta: # Register meta headers used by this theme Logo: logo # The URL to your website's logo (value is passed to Pico's "url" Twig filter) From 86bebb1a0068dc2358d0647d9dc26884c6722a7a Mon Sep 17 00:00:00 2001 From: Gabriele Pohl Date: Tue, 5 Dec 2023 20:56:19 +0100 Subject: [PATCH 15/16] Add some explanation for self declared meta headers --- pico-theme.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pico-theme.yml b/pico-theme.yml index fc65b28..6198c3f 100644 --- a/pico-theme.yml +++ b/pico-theme.yml @@ -1,6 +1,10 @@ api_version: 3 # Use Pico's latest API version for themes meta: # Register meta headers used by this theme + # You may add further meta headers for your theme. + # The string on the left side shall be used in the content headers to set a value for the page. + # Access the value in your themes twig files via the string on the right side i.e. {{ page.meta.tagline }} + Logo: logo # The URL to your website's logo (value is passed to Pico's "url" Twig filter) Tagline: tagline # Your website's tag line, shown right below your site title (supports Markdown) Social: social # A list of social icons that will be shown in your website's footer; From 18042f49c9b191d94fd1fd82266f4fa2ac74a539 Mon Sep 17 00:00:00 2001 From: Gabriele Pohl Date: Wed, 6 Dec 2023 21:51:00 +0100 Subject: [PATCH 16/16] Add explanation for self declared meta headers --- pico-theme.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pico-theme.yml b/pico-theme.yml index 6198c3f..057eb2f 100644 --- a/pico-theme.yml +++ b/pico-theme.yml @@ -1,9 +1,13 @@ api_version: 3 # Use Pico's latest API version for themes meta: # Register meta headers used by this theme + # You may add further meta headers for your theme. - # The string on the left side shall be used in the content headers to set a value for the page. - # Access the value in your themes twig files via the string on the right side i.e. {{ page.meta.tagline }} + # Declare meta headers array key (YAML key to search for + # in the page header section) on the left side + # followed by a colon and meta headers array value + # (used to access the pages value in your Twig files + # e.g. {{ page.meta.tagline }}) on the right side. Logo: logo # The URL to your website's logo (value is passed to Pico's "url" Twig filter) Tagline: tagline # Your website's tag line, shown right below your site title (supports Markdown)