Refined the output of _includes/_pagination.html

Phlow · Phlow · commit 60f249a2a4ac · 2016-02-09T20:30:25.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'jekyll'
+gem 'jekyll', '3.0.2'
 gem 'jekyll-gist'
 gem 'jekyll-paginate'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
-    jekyll (3.1.0)
+    jekyll (3.0.2)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -18,21 +18,21 @@ GEM
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-watch (1.3.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.3.1)
       listen (~> 3.0)
     kramdown (1.9.0)
     liquid (3.0.6)
-    listen (3.0.3)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
     multipart-post (2.0.0)
     octokit (4.2.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
@@ -45,7 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll
+  jekyll (= 3.0.2)
   jekyll-gist
   jekyll-paginate
 
diff --git a/_includes/_pagination.html b/_includes/_pagination.html
@@ -10,7 +10,7 @@
 {% for post in paginator.posts %}
   <div class="row">
     <div class="small-12 columns b60">
-      <p class="subheadline"><span class="subheader">{% if post.categories %}{{ post.categories | join: ' &middot; ' }}{% endif %}</span>{% if post.subheadline %} – {{ post.subheadline }}{% endif %}</p>
+      <p class="subheadline">{{ post.categories | join: ' &middot; ' | prepend: '<span class="subheader">' | append: '</span>' }}{% if post.categories != empty and post.subheadline != NULL %} – {% endif %}{{ post.subheadline }}</p>
       <h2><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></h2>
       <p>
         {% if post.image.thumb %}<a href="{{ site.url }}{{ post.url }}" title="{{ post.title escape_once }}"><img src="{{ site.urlimg }}{{ post.image.thumb }}" class="alignleft" width="150" height="150" alt="{{ page.title escape_once }}"></a>{% endif %}
diff --git a/_posts/design/2015-08-16-typography.md b/_posts/design/2015-08-16-typography.md
@@ -16,6 +16,7 @@ image:
     caption_url: "http://www.aisleone.net/"
 categories:
     - design
+    - typography
 ---
 <!--more-->
 
