8 files changed, 77 insertions, 39 deletions
diff --git a/layouts/404.html b/layouts/404.html
index c2e4e40..2f77920 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,5 +1,5 @@
-{{ partial "header.html" . }}
+{{ define "main" }}
 
-404 NOT FOUND
+404 Not Found
 
-{{ partial "footer.html" . }}
+{{- end }}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 0000000..6757396
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="{{ .Site.LanguageCode }}">
+  <head profile="//gmpg.org/xfn/11">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ .Title }} | {{ .Site.Title }}</title>
+    <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" />
+    {{ range .AlternativeOutputFormats -}}
+      {{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }}
+    {{ end -}}
+  </head>
+
+  <body>
+    <nav>
+      <ul>
+        {{ range .Site.Menus.main }}
+        <li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
+        {{ end }}
+      </ul>
+    </nav>
+
+    {{ block "main" . }}
+    {{ end }}
+
+    <footer>
+      {{ with .Site.Params.footer }}
+      {{ . | markdownify }}
+      {{ end }}
+    </footer>
+  </body>
+</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 06b290a..bf0af50 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,4 @@
-{{ partial "header.html" . }}
+{{ define "main" }}
 
 {{if not .IsHome }}
 <h1>{{ .Title | markdownify }}</h1>
@@ -11,10 +11,10 @@
   {{ if .IsHome }}{{ $pages = .Site.RegularPages }}{{ end }}
   {{ range (where $pages "Section" "!=" "") }}
   <li>
-    <span class="date">{{ .Date.Format "2006/01/02" }}</span>
+    <span class="date">{{ .Date.Format "2006-01-02" }}</span>
     <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a>
   </li>
   {{ end }}
 </ul>
 
-{{ partial "footer.html" . }}
+{{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index de3f121..54acdc6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,20 @@
-{{ partial "header.html" . }}
-<div class="article-meta">
-<h1><span class="title">{{ .Title | markdownify }}</span></h1>
-{{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }}
-{{ if (gt .Params.date 0) }}<h2 class="date">{{ .Date.Format "2006/01/02" }}</h2>{{ end }}
-</div>
+{{ define "main" }}
+<article class="h-entry">
+  <header>
+    <h1><span class="title p-name">{{ .Title | markdownify }}</span></h1>
+    {{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }}
+    {{ if (gt .Params.date 0) }}<time class="dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "2006-01-02" }}</time>{{ end }}
+    <p class="terms">
+      {{ range $i := (slice "categories" "tags") }}
+      {{ with ($.Param $i) }}
+      {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }}
+      {{ end }}
+      {{ end }}
+    </p>
+  </header>
 
-<main>
-{{ .Content }}
-</main>
-
-{{ partial "footer.html" . }}
+  <main class="e-content">
+  {{ .Content }}
+  </main>
+</article>
+{{- end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 71f47e7..15de7a9 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,4 +1,4 @@
-{{ partial "header.html" . }}
+{{ define "main" }}
 
 <h1>{{ .Title }}</h1>
 
@@ -10,4 +10,4 @@
   {{ end }}
 </ul>
 
-{{ partial "footer.html" . }}
+{{- end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 4f431eb..b3dbf64 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,7 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ .Title }} | {{ .Site.Title }}</title>
     <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" />
-    <link rel="stylesheet" href="{{ "/css/fonts.css" | relURL }}" />
     {{ partial "head_custom.html" . }}
   </head>
 
diff --git a/static/css/fonts.css b/static/css/fonts.css
deleted file mode 100644
index 8ffcecd..0000000
--- a/static/css/fonts.css
+++ /dev/null
@@ -1,7 +0,0 @@
-body {
-  font-family: Optima, Candara, Calibri, Arial, sans-serif;
-}
-code {
-  font-family: "Lucida Console", Monaco, monospace;
-  font-size: 85%;
-}
diff --git a/static/css/style.css b/static/css/style.css
index 4dc3ae4..76658fe 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,33 +1,40 @@
 body {
-  max-width: 800px;
+  font-family: sans-serif;
+  line-height: 1.5em;
   margin: auto;
+  max-width: 800px;
   padding: 1em;
-  line-height: 1.5em;
 }
 
 /* header and footer areas */
-.menu { padding: 0; }
-.menu li { display: inline-block; }
-.article-meta, .menu a {
-  text-decoration: none;
+nav > ul { padding: 0; }
+nav > ul > li { display: inline-block; }
+article > header, nav > ul a {
   background: #eee;
-  padding: 5px;
   border-radius: 5px;
+  padding: 5px;
+  text-decoration: none;
 }
-.menu, .article-meta, footer { text-align: center; }
+.terms { font-size: .9em; }
+nav > ul, article > header, footer { text-align: center; }
 .title { font-size: 1.1em; }
 footer a { text-decoration: none; }
 hr {
   border-style: dashed;
   color: #ddd;
 }
+body > nav {
+  border-bottom: 1px solid #ddd;
+}
+body > footer {
+  border-top: 1px solid #ddd;
+}
 
 /* code */
 pre {
   border: 1px solid #ddd;
-  box-shadow: 5px 5px 5px #eee;
-  padding: 1em;
   overflow-x: auto;
+  padding: 1em;
 }
 code { background: #f9f9f9; }
 pre code { background: none; }
@@ -42,9 +49,9 @@ blockquote {
 }
 
 table {
-  margin: auto;
-  border-top: 1px solid #666;
   border-bottom: 1px solid #666;
+  border-top: 1px solid #666;
+  margin: auto;
 }
 table thead th { border-bottom: 1px solid #ddd; }
 th, td { padding: 5px; }