5 files changed, 21 insertions, 8 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 00000000..ebbb6ec7
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="{{ .Site.LanguageCode }}" prefix="og: http://ogp.me/ns#">
+{{ partial "head.html" . }}
+<body>
+  <main>
+      {{ block "main" . }}{{ end }}
+  </main>
+  {{ partial "scripts.html" . }}
+  {{ if .Site.Params.extraBody }}
+  {{ .Site.Params.extraBody | safeHTML }}
+  {{ end }}
+</body>
+</html>
diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index de06b2aa..8a458078 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -1,4 +1,4 @@
-{{ partial "snippets/document-start.html" . }}
+{{ define "main" }}
     <article class="posts">
       {{ partial "components/breadcrumbs.html" . }}
       <div id="posts-archive" class="posts-list">
@@ -58,4 +58,4 @@
         {{ end }}
       </div>
     </article>
-{{ partial "snippets/document-end.html" . }}
+{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3be45f40..13c56ada 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,4 @@
-{{ partial "snippets/document-start.html" . }}
+{{ define "main" }}
     <article
         class="post {{ .Site.Language.LanguageName }}"
         id="article"
@@ -71,4 +71,4 @@
       </script>
 
     </article>
-{{ partial "snippets/document-end.html" . }}
+{{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index a9f53c92..b192c63c 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,4 +1,4 @@
-{{ partial "snippets/document-start.html" . }}
+{{ define "main" }}
 <article class="taxonomy">
   {{ partial "header.html" . }}
 
@@ -34,4 +34,4 @@
     {{ end }}
   </section>
 </article>
-{{ partial "snippets/document-end.html" . }}
+{{ end }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 2c23cb5b..8e935334 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -1,4 +1,4 @@
-{{ partial "snippets/document-start.html" . }}
+{{ define "main" }}
     <article class="posts termlist-page">
       {{ partial "components/breadcrumbs.html" . }}
 
@@ -33,4 +33,4 @@
           </ul>
       </div>
     </article>
-{{ partial "snippets/document-end.html" . }}
+{{ end }}