From 0487ca8fa96d396dfde54e82ce2b46ff3cbe6083 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Fri, 8 Nov 2013 13:57:26 -0800 Subject: [PATCH 1/6] Removed Modernizr from bower.json since it is supplied by Foundation. --- bower.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bower.json b/bower.json index ffaf841..09c7ea6 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,6 @@ "name": "Jekyll & ZURB", "version": "1.0.0", "dependencies": { - "modernizr": "2.6.2", "jquery": "2.0.3", "foundation": "4.3.2" } From ac7cc02a1e6cb157e3a5564be49c292b77137c61 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Fri, 8 Nov 2013 14:33:07 -0800 Subject: [PATCH 2/6] Optional pagination using Foundation. --- CHANGELOG.md | 4 ++++ README.md | 1 + _config.yml | 3 +++ index.html | 36 +++++++++++++++++++++++++++++++++++- 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13fd407..17c231f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## HEAD + +- Optional pagination using Foundation. + ## 1.0.0 - Now using Bower for javascript libs. diff --git a/README.md b/README.md index 0cf2ef6..d05eb09 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Just clone and blog: create the `_posts` and `_drafts` folder. - [Compass](http://compass-style.org/), [Sass](http://sass-lang.com/), [CoffeeScript](http://coffeescript.org/). - Basic [Rake](https://github.com/jimweirich/rake) tasks with support for dev and testing modes, run `rake -D` for info. - Meta data system for SEO. +- Optional pagination using Foundation. - [Disqus](https://disqus.com/) ready: set `disqus: your_shortname` in `_config.yml`. - [Google Analytics](http://www.google.com/analytics/) ready: see `google_analytics` variable in `_config.yml`. - [Piwik](https://piwik.org/) ready: set `piwik: yoursite.com/piwik/` in `_config.yml` (yoursite.com/piwik/ points to the piwik install root). diff --git a/_config.yml b/_config.yml index ac88c42..c17aa40 100644 --- a/_config.yml +++ b/_config.yml @@ -4,6 +4,9 @@ domain: http://example.com markdown: redcarpet pygments: true +# Uncomment below to enable pagination. +# paginate: 5 + exclude: - CHANGELOG.md - LICENSE.txt diff --git a/index.html b/index.html index fc1ef05..dc5ac3c 100644 --- a/index.html +++ b/index.html @@ -3,9 +3,43 @@ title: Page Title --- +{% if site.paginate %} + {% assign posts = paginator.posts %} +{% else %} + {% assign posts = site.posts %} +{% endif %} +

blog posts

+ +{% if paginator.total_pages > 1 %} + +{% endif %} From 8c8dbf0bdb81dfda5a8483f3b3f5fc8cafd060c5 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 11 Nov 2013 20:42:33 -0800 Subject: [PATCH 3/6] Moved meta description logic up so description will be assigned before it is used. --- _includes/meta.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_includes/meta.html b/_includes/meta.html index e738ccc..53e6a11 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -3,6 +3,16 @@ {% endif %} +{% if page.meta.description %} + {% assign description = page.meta.description %} +{% elsif page.preview %} + {% assign description = page.preview %} +{% elsif page.excerpt %} + {% assign description = page.excerpt %} +{% else %} + {% assign description = null %} +{% endif %} + {% if description %} @@ -22,16 +32,6 @@ {% endif %} -{% if page.meta.description %} - {% assign description = page.meta.description %} -{% elsif page.preview %} - {% assign description = page.preview %} -{% elsif page.excerpt %} - {% assign description = page.excerpt %} -{% else %} - {% assign description = null %} -{% endif %} - {% if site.keywords or page.keywords or page.categories or page.tags %} {% endif %} From f9d29c2a564a452fdde4db6b33916f9fe5e3e05a Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 11 Nov 2013 20:44:09 -0800 Subject: [PATCH 4/6] Twitter cards require the card type. --- _config.yml | 1 + _includes/meta.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/_config.yml b/_config.yml index c17aa40..58b511e 100644 --- a/_config.yml +++ b/_config.yml @@ -46,6 +46,7 @@ keywords: [ blog, personal ] # prefix: "" # suffix: " - Site Name" # twitter: +# default_card: summary # site: "@example.com" # creator: "@username" diff --git a/_includes/meta.html b/_includes/meta.html index 53e6a11..3f088b5 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -58,6 +58,8 @@ {% if page.meta.twitter.card %} +{% elsif site.meta.twitter.default_card %} + {% endif %} {% if site.meta.twitter.site %} From f50cffa85fcab30183a8813115652887235c847b Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 11 Nov 2013 20:49:26 -0800 Subject: [PATCH 5/6] Support default site description. --- _config.yml | 1 + _includes/meta.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/_config.yml b/_config.yml index 58b511e..2b247a6 100644 --- a/_config.yml +++ b/_config.yml @@ -45,6 +45,7 @@ keywords: [ blog, personal ] # title: # prefix: "" # suffix: " - Site Name" +# description: "My Site's default description." # twitter: # default_card: summary # site: "@example.com" diff --git a/_includes/meta.html b/_includes/meta.html index 3f088b5..abf8f14 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -9,6 +9,8 @@ {% assign description = page.preview %} {% elsif page.excerpt %} {% assign description = page.excerpt %} +{% elsif site.meta.description %} + {% assign description = site.meta.description %} {% else %} {% assign description = null %} {% endif %} From 245996de14c7a618c2ba403408064aa06e01731a Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 11 Nov 2013 20:51:11 -0800 Subject: [PATCH 6/6] v1.1.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7dea76e..9084fa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.1.0