Merge branch 'master' of https://github.com/BigCoke233/geek-death-project

5 files changed, 89 insertions, 72 deletions

diff --git a/layouts/cards/section.html b/layouts/cards/section.html
index 380faf28..5aaed0c3 100644
--- a/layouts/cards/section.html
+++ b/layouts/cards/section.html
@@ -1,28 +1,41 @@
 {{ define "main" }}
     <article class="card-list">
-      {{ partial "header.html" . }}
-      <div id="cards-section">
-        {{- range .Pages }}
-        <div class="card"
-            style="view-transition-name: card-{{ .File.UniqueID }}">
-            <div class="card-header">
-                <h3 class="card-title">
-                    <a href="{{ .Permalink }}" class="card-title-link">{{ .Title }}</a>
-                </h3>
-                {{- if .Params.tags }}
-                    <p class="card-tags markdown-body">
-                        {{- range .Params.tags }}
-                            <a href="{{ "/tags/" | relURL }}{{ . | urlize }}" class="card-tag">#{{ . }}</a>
-                        {{- end }}
-                    </p>
-                {{- end }}
-            </div>
+        {{ partial "header.html" . }}
+        <div id="cards-section">
+            {{- $cards := .Site.GetPage "section" "cards" }}  <!-- 获取 "cards" 部分的内容 -->
+            {{- $paginator := .Paginate $cards.Pages 8 }}  <!-- 对该部分内容进行分页 -->
+            {{- range $paginator.Pages }}
+            <div class="card"
+                style="view-transition-name: card-{{ .File.UniqueID }}">
+                <div class="card-header">
+                    <h3 class="card-title">
+                        <a href="{{ .Permalink }}" class="card-title-link">{{ .Title }}</a>
+                    </h3>
+                    {{- if .Params.tags }}
+                        <p class="card-tags markdown-body">
+                            {{- range .Params.tags }}
+                                <a href="{{ "/tags/" | relURL }}{{ . | urlize }}" class="card-tag">#{{ . }}</a>
+                            {{- end }}
+                        </p>
+                    {{- end }}
+                </div>
 
-            <div class="card-content markdown-body">
-                {{ .Summary }}
+                <div class="card-content markdown-body">
+                    {{ .Summary }}
+                </div>
             </div>
+            {{- end }}
+        </div>
+
+        <!-- 分页导航 -->
+        <div class="pagination">
+            {{ if $paginator.HasPrev }}
+                <a href="{{ $paginator.Prev.URL }}" class="pagination-prev">👈</a>
+            {{ end }}
+            <div style="width:100%"></div>
+            {{ if $paginator.HasNext }}
+                <a href="{{ $paginator.Next.URL }}" class="pagination-next">👉</a>
+            {{ end }}
         </div>
-        {{- end }}
-      </div>
     </article>
 {{ end }}
diff --git a/layouts/cards/single.html b/layouts/cards/single.html
index 2eb274f3..58f712d3 100644
--- a/layouts/cards/single.html
+++ b/layouts/cards/single.html
@@ -1,51 +1,46 @@
 {{ define "main" }}
-    <article
-        class="card-page {{ .Site.Language.LanguageName }}"
-        id="article"
-    >
+    <article class="card-page">
         {{ partial "header.html" . }}
-        <div id="post-content" class="post-content">
-            <div class="card markdown-body"
-                style="view-transition-name: card-{{ .File.UniqueID }}">
-                <a href="{{ .Permalink }}" class="card-corner"></a> <!-- 右上角折角 -->
-                <div class="card-header">
-                    <h3 class="card-title">{{ .Title }}</h3>
-                    {{- if .Params.tags }}
-                        <p class="card-tags">
-                            {{- range .Params.tags }}
-                                <a href="{{ "/tags/" | relURL }}{{ . | urlize }}" class="card-tag">#{{ . }}</a>
-                            {{- end }}
-                        </p>
-                    {{- end }}
-                </div>
-                <div class="card-content">
-                    {{ .Content }}
-                </div>
+        <div class="card markdown-body post-content"
+            style="view-transition-name: card-{{ .File.UniqueID }}">
+            <a href="{{ .Permalink }}" class="card-corner"></a> <!-- 右上角折角 -->
+            <div class="card-header">
+                <h3 class="card-title">{{ .Title }}</h3>
+                {{- if .Params.tags }}
+                    <p class="card-tags">
+                        {{- range .Params.tags }}
+                            <a href="{{ "/tags/" | relURL }}{{ . | urlize }}" class="card-tag">#{{ . }}</a>
+                        {{- end }}
+                    </p>
+                {{- end }}
             </div>
+            <div class="card-content">
+                {{ .Content }}
+            </div>
+        </div>
 
-            {{- /* 查询引用了这个卡片的文章 */ -}}
-            {{- $currentCard := .File.BaseFileName -}}  <!-- 获取当前卡片的文件名 -->
-            {{- $referencedBy := slice -}}  <!-- 初始化一个空数组 -->
+        {{- /* 查询引用了这个卡片的文章 */ -}}
+        {{- $currentCard := .File.BaseFileName -}}  <!-- 获取当前卡片的文件名 -->
+        {{- $referencedBy := slice -}}  <!-- 初始化一个空数组 -->
 
-            {{- range .Site.Pages }}
-                {{- if and (isset .Params "related_cards") (in .Params.related_cards $currentCard) }}
-                    {{- $referencedBy = $referencedBy | append . }}
-                {{- end }}
+        {{- range .Site.Pages }}
+            {{- if and (isset .Params "related_cards") (in .Params.related_cards $currentCard) }}
+                {{- $referencedBy = $referencedBy | append . }}
             {{- end }}
+        {{- end }}
 
-            {{- /* 如果有文章引用这个卡片，就显示它们 */ -}}
-            {{ if gt (len $referencedBy) 0 }}
-                <section class="referenced-articles">
-                    <h2>引用了本卡片的文章</h2>
-                    <ul>
-                        {{- range $referencedBy }}
-                            <li>
-                                <a href="{{ .Permalink }}">{{ .Title }}</a>
-                            </li>
-                        {{- end }}
-                    </ul>
-                </section>
-            {{ end }}
-        </div>
+        {{- /* 如果有文章引用这个卡片，就显示它们 */ -}}
+        {{ if gt (len $referencedBy) 0 }}
+        <section class="referenced-articles post-content">
+            <h2>引用了本卡片的文章</h2>
+            <ul>
+                {{- range $referencedBy }}
+                    <li>
+                        <a href="{{ .Permalink }}">{{ .Title }}</a>
+                    </li>
+                {{- end }}
+            </ul>
+        </section>
+        {{ end }}
     </article>
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 1d1c9347..99323bee 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -12,17 +12,17 @@
                       <time>
                           {{ .Date.Format "Jan 2" }}
                       </time>
-                      <h3>
+                      <h3{{ if $firstPost }} style="margin-bottom: 0"{{ end }}>
                           <a href="{{ .Permalink }}">{{ .Title }}</a>
                       </h3>
                   </div>
+                  {{ with .Params.categories }}
                   <div class="posts-item-category">
-                      {{ with .Params.categories }}
                       <a href="/categories/{{ . }}" style="padding: 0.1rem 0.3rem;">
                           {{ . }}
                       </a>
-                      {{ end }}
                   </div>
+                  {{ end }}
               </header>
               <!-- 如果是第一篇文章，则显示摘要 -->
               {{ if $firstPost }}
diff --git a/layouts/partials/components/global-search.html b/layouts/partials/components/global-search.html
index c1051ee4..5b158abe 100644
--- a/layouts/partials/components/global-search.html
+++ b/layouts/partials/components/global-search.html
@@ -106,9 +106,15 @@
       }
     });
 
+    // trigger by clicking instruction text
+    // to allow mobile users to search
     const searchInstruction = document.getElementById("search-instruction");
-    searchInstruction.addEventListener("click", (event) => {
-      turnOn();
-    });
+    if (searchInstruction) {
+      searchInstruction.addEventListener("click", turnOn);
+    }
+
+    // double-click to turn off search
+    // in case esc and ctrl/cmd+k cannot be used
+    search.addEventListener("dblclick", turnOff);
   })();
 </script>
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index b22c8989..dbf6aee0 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -8,9 +8,12 @@
   <script>{{ $lazyload.Content | safeJS }}</script>
 {{- end }}
 
-{{- $fancybox := resources.Get "js/fancybox.js" | minify }}
-{{- if $fancybox }}
-  <script>{{ $fancybox.Content | safeJS }}</script>
+{{- if or (in .Section "posts") (in .Section "cards") (in .Section "library") (eq .Type "single") }}
+  <script src="/js/fancybox.umd.js"></script>
+  {{- $fancybox := resources.Get "js/fancybox.js" | minify }}
+  {{- if $fancybox }}
+    <script>{{ $fancybox.Content | safeJS }}</script>
+  {{- end }}
 {{- end }}
 
 <script>