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 0ffc258..9106753 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Source for my personal blog running on Jekyll and Foundation. - [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/VERSION b/VERSION index 7dea76e..9084fa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.1.0 diff --git a/_config.yml b/_config.yml index 9d210fd..309884b 100644 --- a/_config.yml +++ b/_config.yml @@ -4,6 +4,9 @@ domain: http://evansosenko.com markdown: redcarpet pygments: true +# Uncomment below to enable pagination. +# paginate: 5 + exclude: - CHANGELOG.md - LICENSE.txt @@ -42,7 +45,9 @@ meta: title: prefix: "" suffix: " - Evan Sosenko" +# description: "My Site's default description." # twitter: +# default_card: summary # site: "@example.com" # creator: "@username" diff --git a/_includes/meta.html b/_includes/meta.html index e738ccc..abf8f14 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -3,6 +3,18 @@ {% endif %} +{% if page.meta.description %} + {% assign description = page.meta.description %} +{% elsif page.preview %} + {% 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 %} + {% if description %} @@ -22,16 +34,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 %} @@ -58,6 +60,8 @@ {% if page.meta.twitter.card %} +{% elsif site.meta.twitter.default_card %} + {% endif %} {% if site.meta.twitter.site %} 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" } 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 %}