Merge remote-tracking branch 'origin/master'

tmack8001 · Jan 7, 2014 · edffdec · edffdec
2 parents e333342 + c28f6e7
commit edffdec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/default.hbs b/default.hbs
@@ -16,6 +16,7 @@
     {{! Styles'n'Scripts }}
     <link rel="stylesheet" type="text/css" href="/assets/css/screen.css" />
     <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Noto+Serif:400,700,400italic|Open+Sans:700,400" />
+    <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
 
     {{! Ghost outputs important style and meta data with this tag }}
     {{ghost_head}}

diff --git a/index.hbs b/index.hbs
@@ -28,7 +28,7 @@
             </a>
         </div>
         <header class="post-header">
-            <span class="post-meta"><time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> {{tags prefix="on "}}</span>
+            <span class="post-meta"><i class="fa fa-calendar"></i> <time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> <i class="fa fa-tags"></i>{{tags prefix=" "}}</span>
             <h2 class="post-title"><a href="{{url}}">{{{title}}}</a></h2>
 
         </header>

diff --git a/post.hbs b/post.hbs
@@ -22,7 +22,7 @@
         {{#post}}
 
         {{! Everything below outputs content of the the post which has been published }}
-        <span class="post-meta"><time datetime="{{date format="YYYY-MM-DD"}}">{{date format='DD MMM YYYY'}}</time> {{tags prefix="on " separator=" | "}}</span>
+        <span class="post-meta"><i class="fa fa-calendar"></i> <time datetime="{{date format="YYYY-MM-DD"}}">{{date format='DD MMM YYYY'}}</time> <i class="fa fa-tags"></i>{{tags prefix=" " separator=" | "}}</span>
 
         <h1 class="post-title">{{{title}}}</h1>