3 files changed, 75 insertions, 12 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4fada03..658c98e 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,10 +1,62 @@
-{{ partial "head.html" . }}
-  <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"{{with .Site.LanguageCode}} xml:lang="{{.}}" lang="{{.}}"{{end}}>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+  {{ hugo.Generator }}
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  {{ if .IsHome -}}
+  <title>{{ .Site.Title }}</title>
+  {{- else -}}
+  <title>{{ .Title }} &middot; {{ .Site.Title }}</title>
+  {{- end }}
+
+  <meta name="description" content="{{if .IsHome}}{{ $.Site.Params.description }}{{else}}{{.Description}}{{end}}" />
+
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/print.css" media="print">
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css">
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css">
+
+  {{ partial "theme-color.html" . }}
+
+  {{ range $.Site.Params.customCss -}}
+  <link type="text/css" rel="stylesheet" href="{{ $.Site.BaseURL }}{{ . }}">
+  {{- end}}
+
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700&display=swap" rel="stylesheet">
+
+  <link rel="stylesheet"
+        href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
+        integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk="
+        crossorigin="anonymous" />
+
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png">
+  <link rel="shortcut icon" href="/favicon.png">
+
+  <!-- RSS -->
+  {{ range .AlternativeOutputFormats -}}
+    {{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }}
+  {{ end -}}
+</head>
+<body>
   {{ partial "sidebar.html" . }}
-    <main class="content container">
-    {{ block "main" . -}}{{- end }}
-    </main>
 
-    {{ template "_internal/google_analytics_async.html" . }}
-  </body>
+  <main class="content container">
+  {{ block "main" . -}}{{- end }}
+  </main>
+
+  {{ partial "footer.html" . }}
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/js/all.min.js"
+          integrity="sha256-MAgcygDRahs+F/Nk5Vz387whB4kSK9NXlDN3w58LLq0="
+          crossorigin="anonymous"></script>
+
+  {{ range $.Site.Params.customJs -}}
+  <script src="{{ $.Site.BaseURL }}{{ . }}"></script>
+  {{- end}}
+
+  {{ template "_internal/google_analytics_async.html" . }}
+</body>
 </html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 47a6453..b5b6ed3 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,9 +1,13 @@
 {{ define "main" -}}
 <ul class="posts">
-{{ range .Data.Pages -}}
+  <h1>{{ .Title }}</h1>
+  {{ 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>
+    <span>
+        <a href="{{ .Permalink }}">{{ .Title }}</a>
+        <time class="pull-right post-list" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time>
+    </span>
   </li>
-{{- end }}
+  {{- end }}
 </ul>
 {{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 735bbf7..b3554ca 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,19 @@
 {{ 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>
+
+  {{ if ne .Type "page" -}}
+  <div class="post-date">
+    <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> · {{ .ReadingTime }} min read
+  </div>
+  {{- end }}
+
   {{ .Content }}
 </div>
 
-{{ if .Site.DisqusShortname -}}
+{{ if (and .Site.DisqusShortname (eq .Params.DisableComments false)) -}}
 <h2>Comments</h2>
 {{ template "_internal/disqus.html" . }}
 {{- end }}
+
 {{- end }}