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 diff --git a/CHANGELOG.md b/CHANGELOG.md index a171f5d..5c00ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,25 @@ 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] Don't justify text contents by default +* [Changed] Update syntax to Twig 3.3 +* [Changed] Update credits in theme footer +``` + +### 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 @@ -25,6 +44,13 @@ Released: 2020-04-10 No changes +### 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 diff --git a/README.md b/README.md index 5fdaca3..f9d915b 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 3fe40d3..2a1041b 100644 --- a/css/style.css +++ b/css/style.css @@ -9,9 +9,9 @@ * * @author Gilbert Pellegrom * @author Daniel Rudolf - * @link http://picocms.org - * @license http://opensource.org/licenses/MIT The MIT License - * @version 2.1 + * @link https://picocms.org + * @license https://opensource.org/licenses/MIT The MIT License + * @version 3.0 */ * { @@ -185,7 +185,6 @@ body { } p, td, th, li, dd { - text-align: justify; overflow-wrap: break-word; word-wrap: break-word; } 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 6f8bbb5..8b0316f 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 %} @@ -43,10 +43,12 @@ @@ -70,8 +72,9 @@ {% endfor %}

- Pico was made by Gilbert Pellegrom - and is maintained by The Pico Community. + 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 7f5449b..b1461e8 100644 --- a/js/pico.js +++ b/js/pico.js @@ -4,9 +4,9 @@ * 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 - * @version 2.1 + * @link https://picocms.org + * @license https://opensource.org/licenses/MIT The MIT License + * @version 3.0 */ function main() diff --git a/js/utils.js b/js/utils.js index 62b65cc..b78894f 100644 --- a/js/utils.js +++ b/js/utils.js @@ -4,9 +4,9 @@ * 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 - * @version 2.1 + * @link https://picocms.org + * @license https://opensource.org/licenses/MIT The MIT License + * @version 3.0 */ utils = {}; diff --git a/pico-theme.yml b/pico-theme.yml index fc65b28..057eb2f 100644 --- a/pico-theme.yml +++ b/pico-theme.yml @@ -1,6 +1,14 @@ 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. + # 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) Social: social # A list of social icons that will be shown in your website's footer;