Merge branch 'master' into simple

Conflicts:
	index.html

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## HEAD
+
+- Optional pagination using Foundation.
+
 ## 1.0.0
 
 - Now using Bower for javascript libs.

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).

VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

_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"
 

_includes/meta.html

@@ -3,6 +3,18 @@
   <meta property="og:title" content="{{ page.title }}" />
 {% 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 %}
   <meta name="description" content="{{ description | strip_html }}" />
   <meta property="og:description" content="{{ description | strip_html }}" />
@@ -22,16 +34,6 @@
   <meta property="og:determiner" content="{{ page.meta.determiner }}" />
 {% 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 %}
   <meta property="keywords" content="{% if page.keywords %}{{ page.keywords | join:',' }},{% endif %}{% if page.tags and page.tags != empty %}{{ page.tags | join:',' }},{% endif %}{% if page.categories and page.categories != empty %}{{ page.categories | join:',' }},{% endif %}{% if site.keywords %}{{ site.keywords | join:',' }}{% endif %}" />
 {% endif %}
@@ -58,6 +60,8 @@
 
 {% if page.meta.twitter.card %}
   <meta name="twitter:card" content="{{ page.meta.twitter.card }}" />
+{% elsif site.meta.twitter.default_card %}
+  <meta name="twitter:card" content="{{ site.meta.twitter.default_card }}" />
 {% endif %}
 
 {% if site.meta.twitter.site %}

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"
   }

index.html

@@ -1,4 +1,4 @@
 ---
 layout: default
 title: {}
----
+---