3 files changed, 47 insertions, 22 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4fada03..ddf0d35 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,9 +1,9 @@
 {{ partial "head.html" . }}
   <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
-  {{ partial "sidebar.html" . }}
-    <main class="content container">
-    {{ block "main" . -}}{{- end }}
-    </main>
+{{ partial "sidebar.html" . }}
+  <div class="content container">
+{{ block "main" . -}}{{- end }}
+  </div>
 
     {{ template "_internal/google_analytics_async.html" . }}
   </body>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 47a6453..5b51eba 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,9 +1,11 @@
-{{ define "main" -}}
-<ul class="posts">
-{{ range .Data.Pages -}}
-  <li>
-    <span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>
-  </li>
-{{- end }}
-</ul>
+{{ define "main" }}
+    <h1 class="page-title">{{ .Title }}</h1>
+    <ul class="posts">
+      {{ range .Data.Pages -}}
+      <li>
+          <a class="post-title u-url" href="{{ .RelPermalink }}">{{ .Title }}</a>
+          <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
+      </li>
+      {{ end -}}
+    </ul>
 {{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 735bbf7..d5d1774 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,35 @@
 {{ define "main" -}}
-<div class="post">
-  <h1>{{ .Title }}</h1>
-  <time datetime={{ .Date.Format "2006-01-02T15:04:05Z0700" }} class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</time>
-  {{ .Content }}
-</div>
-
-{{ if .Site.DisqusShortname -}}
-<h2>Comments</h2>
-{{ template "_internal/disqus.html" . }}
-{{- end }}
+  <article class="post h-entry">
+    <header>
+      <a class="u-url" href="{{ .Permalink | replaceRE "/$" "" }}">
+        <h1 class="post-title p-name">{{ .Title }}</h1>
+      </a>
+      <time class="post-date dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
+    </header>
+    <main class="post-content e-content">
+      {{ .Content }}
+    </main>
+    <footer class="footer">
+      {{- if .Params.categories }}
+      <span>
+        Category:
+        {{- range .Params.categories }}
+        <a class="p-category" href="/categories/{{ . | lower | urlize }}/">{{ . }}</a>
+        {{- end }}
+      </span>
+      {{- end }}
+      {{- if .Params.tags }}
+      <p>
+        Tags:
+        {{- range .Params.tags }}
+        <a class="p-category" href="/tags/{{ . | urlize }}/">{{ . }}</a>
+        {{- end }}
+      </p>
+      {{- end }}
+    </footer>
+  </article>
+  {{- if .Site.DisqusShortname }}
+  <h2>Comments</h2>
+  {{ template "_internal/disqus.html" . }}
+  {{- end }}
 {{- end }}