1 files changed, 61 insertions, 65 deletions
diff --git a/themes/default/layouts/_default/single.html b/themes/default/layouts/_default/single.html
index 9aeb728..f3123b3 100644
--- a/themes/default/layouts/_default/single.html
+++ b/themes/default/layouts/_default/single.html
@@ -1,83 +1,79 @@
 {{- define "styles" -}}
 <style>
-  {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }}
+  {{ partial "navigator.css.html" (dict "Link" "/") | safeCSS }}
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
-
-{{- partial "navigator-middle.html"
-  (dict
-    "Title"      "Message"
-    "Subtitle"   "Thread"
-    "Icon"       "arrow-left"
-    "IconLabel"  "Back"
-    "Href"       "/"
-    "Id"         "back"
-    "Context"    .
-  )
--}}
+{{- define "header" -}}
+  {{- partial "navigator-middle.html"
+    (dict
+      "Title"      "Post"
+      "Subtitle"   "Thread"
+      "Icon"       "arrow-left"
+      "IconLabel"  "Back"
+      "Href"       "/"
+      "Id"         "back"
+      "Context"    .
+    )
+  -}}
+{{- end -}}
 
-<micro-thread>
-  {{ .Render "summary" }}
+{{- define "middle" -}}
+  <micro-thread>
+    {{- partial "render-embed.html" . -}}
 
-  {{- $nextHref  := "" -}}
-  {{- $prevHref  := "" -}}
-  {{- $nextTitle := "" -}}
-  {{- $prevTitle := "" -}}
-  {{- $nextInvisible := "data-invisible" -}}
-  {{- $prevInvisible := "data-invisible" -}}
+    {{- $prevHref  := "/" -}}
+    {{- $nextHref  := "/" -}}
+    {{- $prevTitle := "hidden" -}}
+    {{- $nextTitle := "hidden" -}}
 
-  {{- with .Next -}}
-    {{- $nextHref = $.Next.Permalink -}}
-    {{- $nextTitle = $.Next.Summary -}}
-    {{- $nextInvisible = "" -}}
-  {{- end -}}
+    {{- with .Next -}}
+      {{- $nextHref = $.Next.Permalink -}}
+      {{- $nextTitle = $.Next.Summary -}}
+    {{- end -}}
 
-  {{- with .Prev -}}
-    {{- $prevHref = $.Prev.Permalink -}}
-    {{- $prevTitle = $.Prev.Summary -}}
-    {{- $prevInvisible = "" -}}
-  {{- end -}}
+    {{- with .Prev -}}
+      {{- $prevHref = $.Prev.Permalink -}}
+      {{- $prevTitle = $.Prev.Summary -}}
+    {{- end -}}
 
-  {{- with or .Next .Prev -}}
-    <paginator-navigation>
-      <a {{ $nextInvisible | safeHTMLAttr }} href="{{ $nextHref }}" title="{{ $nextTitle }}">
-        {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-left.svg")) }}
-        Newer
-      </a>
+    {{- with or .Next .Prev -}}
+      <nav data-type="pagination">
+        <a rel="next" href="{{ $nextHref }}" title="{{ $nextTitle }}">
+          {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-left.svg")) }}
+          <header>Newer</header>
+        </a>
 
-      <a {{ $prevInvisible | safeHTMLAttr }} href="{{ $prevHref }}" title="{{ $prevTitle }}">
-        Older
-        {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-right.svg")) }}
-      </a>
-    </paginator-navigation>
-  {{- end -}}
+        <a rel="prev" href="{{ $prevHref }}" title="{{ $prevTitle }}">
+          <header>Older</header>
+          {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-right.svg")) }}
+        </a>
+      </nav>
+    {{- end -}}
 
-  {{- $filteredPages := partial "function-filters-content.html" (.Site.RegularPages.Related .) -}}
-  {{- $related := $filteredPages | first 3 -}}
+    {{- $filteredPages := partial "function-filters-content.html" (.Site.RegularPages.Related .) -}}
+    {{- $related := $filteredPages | first 3 -}}
 
-  {{- with $related -}}
-    <related-content>
-      <footer>
-        <samp>
-        Related Tags
-        {{- with $.Params.tags -}}
-          {{- range $tag := first 1 $.Params.tags -}}
-            {{- $link := print ("tags/" | relURL) ($tag | urlize) "/" }}
-            {{ print "---" " " "[#" $tag "](" $link ")" | markdownify -}}
+    {{- with $related -}}
+      <related-content>
+        <footer>
+          <samp>
+          Related Tags
+          {{- with $.Params.tags -}}
+            {{- range $tag := first 1 $.Params.tags -}}
+              {{- $link := print ("tags/" | relURL) ($tag | urlize) "/" }}
+              {{ print "---" " " "[#" $tag "](" $link ")" | markdownify -}}
+            {{- end -}}
           {{- end -}}
-        {{- end -}}
-        </samp>
-      </footer>
-    </related-content>
-
-   {{- range $related -}}
-      {{- .Render "summary" -}}
-   {{- end -}}
-  {{- end -}}
+          </samp>
+        </footer>
+      </related-content>
 
-</micro-thread>
+      {{- range $related -}}
+        {{- partial "render-embed.html" . -}}
+      {{- end -}}
+    {{- end -}}
+  </micro-thread>
 {{- end -}}
 
 {{- define "right" -}}