refactor(theme): reuse starting and ending part of the document

5 files changed, 20 insertions, 44 deletions

diff --git a/themes/yinyang/layouts/_default/list.html b/themes/yinyang/layouts/_default/list.html
index 18c01247..ca7e50c4 100644
--- a/themes/yinyang/layouts/_default/list.html
+++ b/themes/yinyang/layouts/_default/list.html
@@ -1,14 +1,8 @@
-<!DOCTYPE html>
-<html lang="en">
-{{ partial "head.html" . }}
-
-<body>
-  <main id="swup" class="transition-fade">
+{{ partial "snippets/document-start.html" . }}
     <article class="posts">
       <div class="row">
         <div class="col-xs-12">
           {{ partial "header.html" . }}
-  
           <h1 class="taxonomy-term">{{.Data.Term}}</h1>
           <div id="posts-list">
               {{ range .Pages }}
@@ -29,14 +23,7 @@
               </div>
               {{ end }}
           </div>
-  
-          {{ partial "footer.html" . }}
         </div>
       </div>
     </article>
-  </main>
-
-  {{ partial "scripts.html" . }}
-</body>
-
-</html>
\ No newline at end of file
+{{ partial "snippets/document-end.html" . }}
\ No newline at end of file
diff --git a/themes/yinyang/layouts/_default/single.html b/themes/yinyang/layouts/_default/single.html
index f0587f15..0810a11d 100644
--- a/themes/yinyang/layouts/_default/single.html
+++ b/themes/yinyang/layouts/_default/single.html
@@ -1,8 +1,4 @@
-<!DOCTYPE html>
-<html lang="zh">
-{{ partial "head.html" . }}
-<body>
-  <main id="swup" class="transition-fade">
+{{ partial "snippets/document-start.html" . }}
     <article class="post {{ .Site.Language.LanguageName }}" id="article">
       <div class="row">
         <div class="col-xs-12">
@@ -66,20 +62,10 @@
               </script>
             </div>
           {{ end }}
-
-          <!-- Footer -->
-          {{ partial "footer.html" . }}
         </div>
       </div>
     </article>
     <!-- use fancybox -->
     <!-- the reason it is replace here it that the fancybox.js is loaded after the swup.js -->
     <script>Fancybox.bind("[data-fancybox]");</script>
-  </main>
-
-  {{ partial "scripts.html" . }}
-  {{ if .Site.Params.extraBody }}
-  {{ .Site.Params.extraBody | safeHTML }}
-  {{ end }}
-</body>
-</html>
\ No newline at end of file
+{{ partial "snippets/document-end.html" . }}
\ No newline at end of file
diff --git a/themes/yinyang/layouts/index.html b/themes/yinyang/layouts/index.html
index 4070364b..ba5aaa55 100644
--- a/themes/yinyang/layouts/index.html
+++ b/themes/yinyang/layouts/index.html
@@ -1,9 +1,4 @@
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}" prefix="og: http://ogp.me/ns#">
-{{ partial "head.html" . }}
-
-<body>
-  <main id="swup" class="transition-fade">
+{{ partial "snippets/document-start.html" . }}
     <article class="posts">
       <div class="row">
         <div class="col-xs-12">
@@ -61,13 +56,7 @@
               <hr>
             {{ end }}
           </div>
-  
-          {{ partial "footer.html" . }}
         </div>
       </div>
     </article>
-  </main>
-  {{ partial "scripts.html" . }}
-</body>
-
-</html>
+{{ partial "snippets/document-end.html" . }}
diff --git a/themes/yinyang/layouts/partials/snippets/document-end.html b/themes/yinyang/layouts/partials/snippets/document-end.html
new file mode 100644
index 00000000..2fc27a07
--- /dev/null
+++ b/themes/yinyang/layouts/partials/snippets/document-end.html
@@ -0,0 +1,9 @@
+            <!-- Footer -->
+            {{ partial "footer.html" . }}
+        </main>
+        {{ partial "scripts.html" . }}
+        {{ if .Site.Params.extraBody }}
+        {{ .Site.Params.extraBody | safeHTML }}
+        {{ end }}
+    </body>
+</html>
\ No newline at end of file
diff --git a/themes/yinyang/layouts/partials/snippets/document-start.html b/themes/yinyang/layouts/partials/snippets/document-start.html
new file mode 100644
index 00000000..56b12280
--- /dev/null
+++ b/themes/yinyang/layouts/partials/snippets/document-start.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html lang="{{ .Site.LanguageCode }}" prefix="og: http://ogp.me/ns#">
+{{ partial "head.html" . }}
+<body>
+  <main id="swup" class="transition-fade">
\ No newline at end of file