Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pico 3.0 #3

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -13,15 +13,15 @@
},
{
"name": "The Pico Community",
"homepage": "http://picocms.org/"
"homepage": "https://picocms.org/"
},
{
"name": "Contributors",
"homepage": "https://github.com/picocms/pico-theme/graphs/contributors"
}
],
"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"
},
Expand Down
7 changes: 3 additions & 4 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

* {
Expand Down Expand Up @@ -185,7 +185,6 @@ body {
}

p, td, th, li, dd {
text-align: justify;
overflow-wrap: break-word;
word-wrap: break-word;
}
Expand Down
6 changes: 3 additions & 3 deletions icon/COPYRIGHT.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Icon fonts generator

Author: Vitaly Puzrin
License: The MIT License <https://github.com/fontello/fontello/blob/master/LICENSE>
Homepage: http://fontello.com/
Homepage: https://fontello.com/



Expand All @@ -17,7 +17,7 @@ Font license info
Copyright (C) 2016 by Dave Gandy

Author: Dave Gandy
License: SIL OFL 1.1 <http://scripts.sil.org/OFL>
Homepage: http://fortawesome.github.com/Font-Awesome/
License: SIL OFL 1.1 <https://scripts.sil.org/OFL>
Homepage: https://fontawesome.com/

Icons: chat, github-circled ("octocat"), menu, dollar
17 changes: 10 additions & 7 deletions index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />

<title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
<title>{{ meta.title ? meta.title ~ " | " }}{{ site_title }}</title>
{% if meta.description %}
<meta name="description" content="{{ meta.description|striptags }}" />
{% endif %}
Expand Down Expand Up @@ -43,10 +43,12 @@
</div>
<div id="nav" role="navigation" tabindex="-1">
<ul>
{% for page in pages(depthOffset=-1) if not page.hidden %}
<li{% if page.id == current_page.id %} class="active"{% endif %}>
<a href="{{ page.url }}">{{ page.title ?: page.id }}</a>
</li>
{% for page in pages(depthOffset=-1) %}
{% if not page.hidden %}
<li{% if page.id == current_page.id %} class="active"{% endif %}>
<a href="{{ page.url }}">{{ page.title ?: page.id }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
Expand All @@ -70,8 +72,9 @@
{% endfor %}
</div>
<p>
<a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
<a href="https://picocms.org/">Pico</a> was made by <a href="https://gilbitron.me/">Gilbert Pellegrom</a>
and is brought to you by <a href="https://www.daniel-rudolf.de">Daniel Rudolf</a> and
<a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
Released under the <a href="https://github.com/picocms/Pico/blob/master/LICENSE.md">MIT license</a>.
</p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions js/pico.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down