v2 original port

author: amzrk2 2020-05-27 22:53:13 +0800
committer: amzrk2 2020-05-27 22:53:13 +0800
commit: dfb6e1f80754c1c8f2d4d332c5292319f008a67b (patch)
tree: fd8c0cf13e03613b6a39c662b6a0ced87fb69157 /layouts/_default
parent: aa5290aeef9df1c583fdf30290351968df9215dc (diff)
download: hugo-theme-fuji-dfb6e1f80754c1c8f2d4d332c5292319f008a67b.tar.gz
hugo-theme-fuji-dfb6e1f80754c1c8f2d4d332c5292319f008a67b.tar.bz2
hugo-theme-fuji-dfb6e1f80754c1c8f2d4d332c5292319f008a67b.zip
6 files changed, 65 insertions, 69 deletions
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index f9493b1..b9020c7 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1 +1 @@
-<img class="img-zoomable" src="{{ .Destination | safeURL }}" alt="{{ .Text }}"{{ with .Title }} title="{{ . }}"{{ end }} />
-\ No newline at end of file
+<img class="img-zoomable" src="{{ .Destination | safeURL }}" alt="{{ .Text }}" />
+\ No newline at end of file
diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index cb4b911..b3a7c13 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -6,11 +6,11 @@
 <!-- archives range in all posts -->
 {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }}
 {{ range $paginator.Pages }}
-<div class="post-archive">
-    <h2 class="post-title-archive">
+<div class="post">
+    <h3 class="post-item post-title-archive">
         <a href="{{ .Permalink }}">{{ .Title }}</a>
-    </h2>
-    <div class="post-meta-archive link-alter">
+    </h3>
+    <div class="post-item post-meta-archive">
         {{ partial "post-meta.html" . }}
     </div>
 </div>
@@ -22,16 +22,16 @@
 {{ $lowerLimit := (add $offsetLinks 1) }}
 {{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
 {{ if gt $paginator.TotalPages 1 }}
-<ul class="pagination">
+<div class="pagination">
     {{ if ne $paginator.PageNumber 1 }}
-    <li class="pag-first">
+    <div class="pag-first">
         <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ if $paginator.HasPrev }}
-    <li class="pag-previous">
+    <div class="pag-previous">
         <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ range $paginator.Pagers }}
     {{ $.Scratch.Set "pageNumFlag" false }}
@@ -53,22 +53,22 @@
     {{ $.Scratch.Set "pageNumFlag" true }}
     {{ end }}
     {{ if eq ($.Scratch.Get "pageNumFlag") true }}
-    <li class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+    <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
         <a href="{{ .URL }}">{{ .PageNumber }}</a>
-    </li>
+    </div>
     {{ end }}
     {{ end }}
     {{ if $paginator.HasNext }}
-    <li class="pag-next">
+    <div class="pag-next">
         <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-    <li class="pag-last">
+    <div class="pag-last">
         <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
-    </li>
+    </div>
     {{ end }}
-</ul>
+</div>
 {{ end }}
 
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 8d4a8db..a61499c 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
 <html lang="{{ .Site.Language.Lang }}">
-{{ partial "head.html" . }}
 
-<body class="d-flex flex-column h-100">
+<head>
+    {{ partial "head.html" . }}
+</head>
+
+<body data-theme="{{ .Site.Params.toggleMode }}">
+    {{ partial "scripts-front.html" . }}
     {{ partial "header.html" . }}
 
     <main>
         <div class="container-lg clearfix">
             <!-- list -->
-            <div class="col-md-9 col-12 float-left" id="content">
+            <div class="col-12 col-md-9 float-left content">
                 {{ block "main" . }}{{ end }}
             </div>
-            <!-- sidebar -->
-            <div class="col-md-3 col-12 float-left link-alter" id="sidebar">
-                {{ partial "sidebar.html" . }}
-            </div>
-            <!-- global APlayer -->
-            {{ if .Site.Params.playerURL }}
-            <div id="aplayer"></div>
-            {{ end }}
-            {{ if .Site.Params.scrollTop }}
-            <div id="scroll-top">
-                <i class="fas fa-chevron-up"></i>
-            </div>
-            {{ end }}
+            {{ partial "sidebar.html" . }}
         </div>
+        {{ partial "components.html" . }}
     </main>
 
     {{ partial "footer.html" . }}
-    {{ partial "scripts.html" . }}
+    {{ if or .Params.math .Site.Params.math }}
+    {{ partial "math.html" . }}
+    {{ end }}
+    {{ partial "scripts-end.html" . }}
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index bcefcc2..0e52ab4 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,13 +3,13 @@
 {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
 {{ range $paginator.Pages }}
 <div class="post">
-    <h2 class="post-title">
+    <h2 class="post-item post-title">
         <a href="{{ .Permalink }}">{{ .Title }}</a>
     </h2>
-    <div class="post-meta link-alter">
+    <div class="post-item post-meta">
         {{ partial "post-meta.html" . }}
     </div>
-    <div class="post-summary markdown-body">
+    <div class="post-item post-summary markdown-body">
         {{ .Summary }}
     </div>
 </div>
@@ -21,16 +21,16 @@
 {{ $lowerLimit := (add $offsetLinks 1) }}
 {{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
 {{ if gt $paginator.TotalPages 1 }}
-<ul class="pagination">
+<div class="pagination">
     {{ if ne $paginator.PageNumber 1 }}
-    <li class="pag-first">
+    <div class="pag-first">
         <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ if $paginator.HasPrev }}
-    <li class="pag-previous">
+    <div class="pag-previous">
         <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ range $paginator.Pagers }}
     {{ $.Scratch.Set "pageNumFlag" false }}
@@ -52,22 +52,22 @@
     {{ $.Scratch.Set "pageNumFlag" true }}
     {{ end }}
     {{ if eq ($.Scratch.Get "pageNumFlag") true }}
-    <li class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+    <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
         <a href="{{ .URL }}">{{ .PageNumber }}</a>
-    </li>
+    </div>
     {{ end }}
     {{ end }}
     {{ if $paginator.HasNext }}
-    <li class="pag-next">
+    <div class="pag-next">
         <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-    <li class="pag-last">
+    <div class="pag-last">
         <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
-    </li>
+    </div>
     {{ end }}
-</ul>
+</div>
 {{ end }}
 
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e2b0fc1..72ec0a8 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,10 +1,10 @@
 {{ define "main" }}
 <article>
     <!-- post meta -->
-    <h4 class="post-title">
+    <h2 class="post-item post-title">
         <a href="{{ .Permalink }}">{{ .Title }}</a>
-    </h4>
-    <div class="post-meta link-alter">
+    </h2>
+    <div class="post-item post-meta">
         {{ partial "post-meta.html" . }}
     </div>
     {{ with .Params.playerURL }}
@@ -19,12 +19,12 @@
 {{ if ne .Params.noLicense true }}
 <div class="license markdown-body">
     <blockquote>
-        <p>{{ i18n "postCopyrightFront" }}<a rel="license" href="{{ .Site.Params.licenseLink }}" target="_blank">{{ .Site.Params.license }}</a>{{ i18n "postCopyrightEnd" }}</p>
+        <p>{{ i18n "postCopyrightFront" }}<a rel="license" href="{{ .Site.Params.licenseLink }}"
+               target="_blank">{{ .Site.Params.license }}</a>{{ i18n "postCopyrightEnd" }}</p>
     </blockquote>
 </div>
 {{ end }}
 {{ if ne .Params.noComments true }}
 {{ partial "comment-utterances.html" . }}
-{{ partial "comment-disqus.html" . }}
 {{ end }}
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index 97d6ead..7bcabb8 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -7,13 +7,13 @@
 {{ $paginator := .Paginator }}
 {{ range $paginator.Pages }}
 <div class="post">
-    <h2 class="post-title">
+    <h2 class="post-item post-title">
         <a href="{{ .Permalink }}">{{ .Title }}</a>
     </h2>
-    <div class="post-meta link-alter">
+    <div class="post-item post-meta">
         {{ partial "post-meta.html" . }}
     </div>
-    <div class="post-summary markdown-body">
+    <div class="post-item post-summary markdown-body">
         {{ .Summary }}
     </div>
 </div>
@@ -25,16 +25,16 @@
 {{ $lowerLimit := (add $offsetLinks 1) }}
 {{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
 {{ if gt $paginator.TotalPages 1 }}
-<ul class="pagination">
+<div class="pagination">
     {{ if ne $paginator.PageNumber 1 }}
-    <li class="pag-first">
+    <div class="pag-first">
         <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ if $paginator.HasPrev }}
-    <li class="pag-previous">
+    <div class="pag-previous">
         <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ range $paginator.Pagers }}
     {{ $.Scratch.Set "pageNumFlag" false }}
@@ -56,22 +56,22 @@
     {{ $.Scratch.Set "pageNumFlag" true }}
     {{ end }}
     {{ if eq ($.Scratch.Get "pageNumFlag") true }}
-    <li class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+    <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
         <a href="{{ .URL }}">{{ .PageNumber }}</a>
-    </li>
+    </div>
     {{ end }}
     {{ end }}
     {{ if $paginator.HasNext }}
-    <li class="pag-next">
+    <div class="pag-next">
         <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
-    </li>
+    </div>
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-    <li class="pag-last">
+    <div class="pag-last">
         <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
-    </li>
+    </div>
     {{ end }}
-</ul>
+</div>
 {{ end }}
 
 {{ end }}
 \ No newline at end of file
author	amzrk2	2020-05-27 22:53:13 +0800
committer	amzrk2	2020-05-27 22:53:13 +0800
commit	dfb6e1f80754c1c8f2d4d332c5292319f008a67b (patch)
tree	fd8c0cf13e03613b6a39c662b6a0ced87fb69157 /layouts/_default
parent	aa5290aeef9df1c583fdf30290351968df9215dc (diff)
download	hugo-theme-fuji-dfb6e1f80754c1c8f2d4d332c5292319f008a67b.tar.gz hugo-theme-fuji-dfb6e1f80754c1c8f2d4d332c5292319f008a67b.tar.bz2 hugo-theme-fuji-dfb6e1f80754c1c8f2d4d332c5292319f008a67b.zip