diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b4266f9..1f5934d 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,53 +1,43 @@
{{ define "main" }}
- {{ if eq .Type $.Site.Params.contentTypeName }}
-
- {{ if .Params.Date }}
-
- {{ .Date.Format "2006-01-02" }}
-
- {{ end }}
+{{ if eq .Type $.Site.Params.contentTypeName }}
+
+ {{ if .Params.Date }}
{{ .Date.Format "2006-01-02" }} {{ end }}
+ {{ with .Params.Author }}
- {{ . }} {{ end }}
+
- {{ .ReadingTime }} min read ({{ .WordCount }} words)
+
- {{ with .Params.Author }}
-
-
-
{{ . }}
- {{ end }}
- {{ if and (.Param "readingTime") (eq (.Param "readingTime") true) }}
-
- {{ .ReadingTime }} min read ({{ .WordCount }} words)
- {{ end }}
-
+ {{ if .Params.tags }}
+
+ {{ range .Params.tags }}
+ #{{ . }}
+ {{ end }}
+
+ {{ end }}
+
+{{ end }}
- {{ if .Params.tags }}
-
- {{ range .Params.tags }}
- #{{ . }}
- {{ end }}
-
- {{ end }}
-
- {{ end }}
+{{ if (.Params.Toc | default .Site.Params.Toc) }}
+
+ {{- with .Content -}}
+ {{ . | replaceRE "(
)" `${1} # ${3}` | safeHTML }}
+ {{- end -}}
+
+{{ else }}
+{{ .Content }}
+{{ end }}
- {{ if eq .Type $.Site.Params.contentTypeName }}
-
- {{- with .Content -}}
- {{ . | replaceRE "(
)" `${1} # ${3}` | safeHTML }}
- {{- end -}}
-
- {{ else }}
- {{ .Content }}
- {{ end }}
-
- {{ if eq .Type $.Site.Params.contentTypeName }}
- {{ partial "posts_pagination.html" . }}
- {{ end }}
+{{ if eq .Type $.Site.Params.contentTypeName }}
+{{ partial "posts_pagination.html" . }}
+{{ end }}
{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 09f5276..e2d760b 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,6 +1,6 @@