4 files changed, 31 insertions, 34 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0504861..eb8ea10 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,29 +1,14 @@
 <!doctype html>
 <html lang="{{ .Site.Language.LanguageCode }}">
   <head>
-    {{ partial "head.html" . }}
-    <!-- this is here to make sure that if we can't load CSS the icons don't totally fuck up layout -->
-    <style>
-      .icon svg {
-        width: 1.25em;
-        height: 1.25em;
-      }
-    </style>
-    {{ range .AlternativeOutputFormats -}} {{ printf `
+    {{ partial "head.html" . }} {{ range .AlternativeOutputFormats -}} {{ printf
+    `
     <link rel="%s" type="%s" href="%s" title="%s" />
     ` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{ end -}}
   </head>
   <body>
     <a href="#main" class="skip">Skip to content</a>
-    <nav id="main-nav">
-      <div id="site-title">{{.Site.Title}}</div>
-      <ul>
-        {{ with .Site.Menus.main }} {{ range . }}
-        <li><a href="{{ .URL }}">{{ .Name }}</a></li>
-        {{ end }} {{ end }}
-      </ul>
-    </nav>
-
+    {{ partial "header.html" .Site }}
     <main id="main">{{ block "main" . }}{{ end }}</main>
     {{ partial "footer.html" . }}
   </body>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 60d1b41..9d119b8 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,16 +1,18 @@
 {{ define "main" }}
-<header>
+<article>
+  <header>
     <h1>{{ .Title }}</h1>
-    <time datetime="{{ .Lastmod }}">{{ .Lastmod.Format "January 2, 2006" }}</time>
-</header>
-    {{ if .Params.toc }}
-    <aside id="toc">
-        <a class="skip" href="#post">Skip table of contents</a>
-        <h2 id="toc-title">Contents</h2>
-        {{ .TableOfContents }}
-    </aside>
-    <a id="post"></a>
-    {{ end }}
-    {{ .Content }}
-    {{ partial "tags.html" . }}
+    <time datetime="{{ .Lastmod }}"
+      >{{ .Lastmod.Format "January 2, 2006" }}</time
+    >
+  </header>
+  {{ if .Params.toc }}
+  <aside id="toc">
+    <a class="skip" href="#post">Skip table of contents</a>
+    <h2 id="toc-title">Contents</h2>
+    {{ .TableOfContents }}
+  </aside>
+  <a id="post"></a>
+  {{ end }} {{ .Content }} {{ partial "tags.html" . }}
+</article>
 {{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e385cf0..52c7a99 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,10 +1,10 @@
 <footer>
-  Made with <a href="https://gohugo.io">Hugo</a>. All content is openly licensed
-  via
+  Made with <a href="https://gohugo.io">Hugo</a>. All content is licensed under
   <a
     href="http://creativecommons.org/licenses/by-sa/4.0/"
     target="_blank"
     rel="license noopener noreferrer"
-    >CC BY-SA 4.0</a
   >
+    CC BY-SA 4.0
+  </a>
 </footer>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e69de29..bf7f2f2 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -0,0 +1,10 @@
+<header>
+  <p id="site-title">{{.Title}}</p>
+  <nav id="main-nav">
+    <ul>
+      {{ with .Menus.main }}{{ range . }}
+      <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+      {{ end }}{{ end }}
+    </ul>
+  </nav>
+</header>