From 1bf157049a52328199105a972fe3f2c07ebf9486 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 24 Jul 2016 20:15:35 +0200 Subject: [PATCH 01/21] README.md: Link to about page instead of landing page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d833d5..ed487b2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Pico [![Freenode IRC Webchat](https://picocms.github.io/Pico/badges/pico-chat.svg)](https://webchat.freenode.net/?channels=%23picocms) [![Tweet Button](https://cloud.githubusercontent.com/assets/640217/11483728/b0842918-976f-11e5-9185-d53261b3125b.png)](https://twitter.com/intent/tweet?text=Pico+is+a+stupidly+simple%2C+blazing+fast%2C+flat+file+CMS.+Visit+http%3A%2F%2Fpicocms.org+and+downlaod+%23picocms+today%21+via+%40gitpicocms&related=gitpicocms) -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 http://picocms.org/about/ for more info. Screenshot ------- From 827be2cb9cd814569df933ae329d9c11a01c9dc3 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 24 Jul 2016 23:35:10 +0200 Subject: [PATCH 02/21] Build System: Refactor source code and release archive creation Resolves #313 --- .gitattributes | 7 ++++++ .travis.yml | 5 +--- _build/create-release-archive.sh | 42 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 .gitattributes create mode 100755 _build/create-release-archive.sh diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00903db --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +/_build export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/.phpcs.xml export-ignore +/.phpdoc.xml export-ignore +/.travis.yml export-ignore +/index.php.dist export-ignore diff --git a/.travis.yml b/.travis.yml index ff01cd1..0471a73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,7 @@ after_success: before_deploy: - deploy-phpdoc-release.sh - - composer install --no-dev --optimize-autoloader - - find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf - - mv index.php.dist index.php - - tar -czf "pico-release-$TRAVIS_TAG.tar.gz" README.md LICENSE.md CONTRIBUTING.md CHANGELOG.md composer.json composer.lock config content-sample lib plugins themes vendor .htaccess index.php + - create-release-archive.sh "$TRAVIS_TAG" deploy: provider: releases diff --git a/_build/create-release-archive.sh b/_build/create-release-archive.sh new file mode 100755 index 0000000..e34dcb8 --- /dev/null +++ b/_build/create-release-archive.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +RELEASE="$1" +ARCHIVE="pico-release.tar.gz" + +# install dependencies +echo "Running \`composer install\`..." +composer install --no-dev --optimize-autoloader +[ $? -eq 0 ] || exit 1 +echo + +# remove .git dirs +echo "Removing '.git' directories of dependencies..." +find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf +echo + +# create release archive +[ -n "$RELEASE" ] && ARCHIVE="pico-release-$RELEASE.tar.gz" +echo "Creating release archive '$ARCHIVE'..." + +if [ -e "$ARCHIVE" ]; then + echo "Unable to create archive: File exists" >&2 + exit 1 +fi + +INDEX_BACKUP="$(mktemp -u)" +mv index.php "$INDEX_BACKUP" +mv index.php.dist index.php + +tar -czf "$ARCHIVE" \ + README.md LICENSE.md CONTRIBUTING.md CHANGELOG.md \ + composer.json composer.lock \ + config content-sample lib plugins themes vendor \ + .htaccess index.php +EXIT=$? + +mv index.php index.php.dist +mv "$INDEX_BACKUP" index.php + +echo + +[ $EXIT -eq 0 ] || exit 1 From 2dada502b5005df1361f4daf809ec765bd78b1ac Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Wed, 27 Jul 2016 15:10:10 +0200 Subject: [PATCH 03/21] Update README.md As suggested by @smcdougall (https://github.com/picocms/Pico/pull/352#issuecomment-235573290) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ed487b2..94c613b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ Pico [![Freenode IRC Webchat](https://picocms.github.io/Pico/badges/pico-chat.svg)](https://webchat.freenode.net/?channels=%23picocms) [![Tweet Button](https://cloud.githubusercontent.com/assets/640217/11483728/b0842918-976f-11e5-9185-d53261b3125b.png)](https://twitter.com/intent/tweet?text=Pico+is+a+stupidly+simple%2C+blazing+fast%2C+flat+file+CMS.+Visit+http%3A%2F%2Fpicocms.org+and+downlaod+%23picocms+today%21+via+%40gitpicocms&related=gitpicocms) -Pico is a stupidly simple, blazing fast, flat file CMS. See http://picocms.org/about/ for more info. +Pico is a stupidly simple, blazing fast, flat file CMS. + +Visit us at http://picocms.org/ and see http://picocms.org/about/ for more info. Screenshot ------- From 39d4a7c2aecd09fc8d4dcbe437ebd58b868e9da2 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Mon, 1 Aug 2016 16:51:22 +0200 Subject: [PATCH 04/21] Hotfix for responsiveness of default theme I'll completely refactor the default theme for Pico 1.1... The CSS is just broken. --- CHANGELOG.md | 1 + themes/default/index.twig | 1 - themes/default/style.css | 94 +++++++++------------------------------ 3 files changed, 21 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 223b536..50916f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Released: - ``` * [New] Add Pico's social icons to default theme * [Fixed] Fix handling of non-YAML 1-line front matters +* [Fixed] Fix responsiveness in default theme ``` ### Version 1.0.3 diff --git a/themes/default/index.twig b/themes/default/index.twig index 8d6bc03..deba22e 100644 --- a/themes/default/index.twig +++ b/themes/default/index.twig @@ -22,7 +22,6 @@