5 files changed, 45 insertions, 31 deletions
diff --git a/themes/polaris/layouts/_default/baseof.html b/themes/polaris/layouts/_default/baseof.html
index 37a6059..3c052ea 100644
--- a/themes/polaris/layouts/_default/baseof.html
+++ b/themes/polaris/layouts/_default/baseof.html
@@ -11,30 +11,21 @@
     <meta charset="utf-8">
     <title>{{ $pageTitle }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" href="{{ .Site.Params.iconURL }}">
-    {{ with resources.Get "css/noto-serif.css" | minify | fingerprint }}
-    <link rel="stylesheet" href="{{ .Permalink }}">
-    {{ end }}
     {{ with resources.Get "css/style.css" | minify | fingerprint }}
-    <link rel="stylesheet" href="{{ .Permalink }}">
+      <link rel="stylesheet" href="{{ .Permalink }}">
     {{ end }}
     <meta property="og:title" content="{{ $pageTitle }}">
     <meta property="og:url" content="{{ .Page.RelPermalink }}">
-    <meta property="og:image" content="{{ .Site.Params.iconURL }}">
     <meta property="og:site_name" content="{{ .Site.Title }}">
     <meta property="og:description" content="{{ .Site.Params.subtext }}">
   </head>
   <body>
-    <nav>
-      {{ partial "nav.html" . }}
-    </nav>
-    <main>
+    {{ partial "header.html" . }}
+    <div class="content">
       {{ block "main" . }}
-        {{ .Content }}
+        {{ . }}
       {{ end }}
-    </main>
-    <footer>
       {{ partial "footer.html" . }}
-    </footer>
+    </div>
   </body>
 </html>
diff --git a/themes/polaris/layouts/_default/single.html b/themes/polaris/layouts/_default/single.html
index 56b9d9d..f059c55 100644
--- a/themes/polaris/layouts/_default/single.html
+++ b/themes/polaris/layouts/_default/single.html
@@ -8,7 +8,7 @@
     {{ end }}
   {{ end }}
   {{ if or (eq .Section "posts") (.Params.toc) }}
-    {{ with .TableOfContents }}{{ . }}{{ end }}
+    {{ partial "toc.html" . }}
   {{ end }}
   {{ .Content }}
 {{ end }}
diff --git a/themes/polaris/layouts/partials/header.html b/themes/polaris/layouts/partials/header.html
new file mode 100644
index 0000000..5e34bda
--- /dev/null
+++ b/themes/polaris/layouts/partials/header.html
@@ -0,0 +1,20 @@
+<div class="header">
+  <div class="header-top">
+    <h2 class="header-title"><a href="/">{{ site.Title }}</a></h2>
+    <span class="header-subtext">{{ .Params.subtext | default .Site.Params.subtext }}</span>
+  </div>
+  <ul class="header-items">
+    {{ $currentPage := . }}
+    {{ range .Site.Menus.left_nav }}
+      <li class="header-item header-item-left {{ if $currentPage.IsMenuCurrent "left_nav" . }} header-item-active {{ end }}">
+        <a href="{{ .URL }}">{{ .Name }}</a>
+      </li>
+    {{ end }}
+    {{ range .Site.Menus.right_nav }}
+      <li class="header-item header-item-right {{ if $currentPage.IsMenuCurrent "right_nav" . }} header-item-active {{ end }}">
+        <a href="{{ .URL }}">{{ .Name }}</a>
+      </li>
+    {{ end }}
+  </ul>
+</div>
+<div class="header-bottom"></div>
diff --git a/themes/polaris/layouts/partials/nav.html b/themes/polaris/layouts/partials/nav.html
index dc1e463..35fb535 100644
--- a/themes/polaris/layouts/partials/nav.html
+++ b/themes/polaris/layouts/partials/nav.html
@@ -1,17 +1,14 @@
-<div class="nav-over">
-  <div class="nav-title">
-    <h2><a href="/">{{ site.Title }}</a></h2>
-    {{ $subtext := .Params.subtext | default .Site.Params.subtext }}
-    {{ with $subtext }}<span class="nav-subtext">{{ . }}</span>{{ end }}
-  </div>
-  <ul>
-    {{ $currentPage := . }}
-    {{ range site.Menus.left_nav }}
-      <li><a class="nav-link link-left {{ if $currentPage.IsMenuCurrent "left_nav" . }} link-active {{ end }}" href="{{ .URL }}">{{ .Name }}</a></li>
-    {{ end }}
-    {{ range site.Menus.right_nav }}
-      <li><a class="nav-link link-right {{ if $currentPage.IsMenuCurrent "right_nav" . }} link-active {{ end }}" href="{{ .URL }}">{{ .Name }}</a></li>
-    {{ end }}
-  </ul>
+<div class="nav-title">
+  <h2><a href="/">{{ site.Title }}</a></h2>
+  {{ $subtext := .Params.subtext | default .Site.Params.subtext }}
+  {{ with $subtext }}<span class="nav-subtext">{{ . }}</span>{{ end }}
 </div>
-<div class="nav-under"></div>
+<ul>
+  {{ $currentPage := . }}
+  {{ range site.Menus.left_nav }}
+    <li><a class="nav-link link-left {{ if $currentPage.IsMenuCurrent "left_nav" . }} link-active {{ end }}" href="{{ .URL }}">{{ .Name }}</a></li>
+  {{ end }}
+  {{ range site.Menus.right_nav }}
+    <li><a class="nav-link link-right {{ if $currentPage.IsMenuCurrent "right_nav" . }} link-active {{ end }}" href="{{ .URL }}">{{ .Name }}</a></li>
+  {{ end }}
+</ul>
diff --git a/themes/polaris/layouts/partials/toc.html b/themes/polaris/layouts/partials/toc.html
new file mode 100644
index 0000000..5f286b5
--- /dev/null
+++ b/themes/polaris/layouts/partials/toc.html
@@ -0,0 +1,6 @@
+{{ with .TableOfContents }}
+  <div class="toc">
+    <h2>Table of Contents</h2>
+    {{ . }}
+  </div>
+{{ end }}