From 6123eaac2c37ac3e4720eb9bf7faa77e508992d4 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 19 Jun 2025 11:51:52 +0800 Subject: [PATCH] :recycle: Refactor: move all files in layouts/_default up to the layouts/ root (#607) The `_default` folder is removed. --- assets/css/_partials/_single/_toc.scss | 3 ++- .../{_default => }/_markup/render-blockquote-alert.html | 0 .../{_default => }/_markup/render-codeblock-echarts.html | 0 .../{_default => }/_markup/render-codeblock-mermaid.html | 0 .../{_default => }/_markup/render-codeblock-timeline.html | 0 layouts/{_default => }/_markup/render-codeblock.html | 0 layouts/{_default => }/_markup/render-heading.html | 0 layouts/{_default => }/_markup/render-image.html | 0 layouts/{_default => }/_markup/render-link.html | 0 layouts/{_default => }/baseof.html | 0 layouts/{_default => }/friends.html | 0 layouts/{_default => }/home.archives.html | 0 layouts/{_default => }/home.baidu_urls.txt | 2 +- layouts/{_default => }/home.html | 0 layouts/{_default => }/home.offline.html | 0 layouts/{_default => }/home.readme.md | 7 +++++-- layouts/{_default => }/home.rss.xml | 0 layouts/{_default => }/home.search.json | 0 layouts/{_default/single.html => page.html} | 0 layouts/{_default/single.md => page.md} | 2 +- layouts/{_default => }/search.html | 0 layouts/{_default => }/section.html | 0 layouts/{_default => }/section.rss.xml | 0 layouts/{_default => }/summary.html | 0 layouts/{_default => }/tags.html | 0 layouts/{_default => }/taxonomies.html | 0 layouts/{_default/terms.html => taxonomy.html} | 0 layouts/{_default => }/term.html | 0 layouts/{_default => }/term.rss.xml | 0 29 files changed, 9 insertions(+), 5 deletions(-) rename layouts/{_default => }/_markup/render-blockquote-alert.html (100%) rename layouts/{_default => }/_markup/render-codeblock-echarts.html (100%) rename layouts/{_default => }/_markup/render-codeblock-mermaid.html (100%) rename layouts/{_default => }/_markup/render-codeblock-timeline.html (100%) rename layouts/{_default => }/_markup/render-codeblock.html (100%) rename layouts/{_default => }/_markup/render-heading.html (100%) rename layouts/{_default => }/_markup/render-image.html (100%) rename layouts/{_default => }/_markup/render-link.html (100%) rename layouts/{_default => }/baseof.html (100%) rename layouts/{_default => }/friends.html (100%) rename layouts/{_default => }/home.archives.html (100%) rename layouts/{_default => }/home.baidu_urls.txt (86%) rename layouts/{_default => }/home.html (100%) rename layouts/{_default => }/home.offline.html (100%) rename layouts/{_default => }/home.readme.md (56%) rename layouts/{_default => }/home.rss.xml (100%) rename layouts/{_default => }/home.search.json (100%) rename layouts/{_default/single.html => page.html} (100%) rename layouts/{_default/single.md => page.md} (85%) rename layouts/{_default => }/search.html (100%) rename layouts/{_default => }/section.html (100%) rename layouts/{_default => }/section.rss.xml (100%) rename layouts/{_default => }/summary.html (100%) rename layouts/{_default => }/tags.html (100%) rename layouts/{_default => }/taxonomies.html (100%) rename layouts/{_default/terms.html => taxonomy.html} (100%) rename layouts/{_default => }/term.html (100%) rename layouts/{_default => }/term.rss.xml (100%) diff --git a/assets/css/_partials/_single/_toc.scss b/assets/css/_partials/_single/_toc.scss index 944a54d0..7eda1f59 100644 --- a/assets/css/_partials/_single/_toc.scss +++ b/assets/css/_partials/_single/_toc.scss @@ -114,7 +114,8 @@ .toc-content { overflow-y: scroll; - max-height: calc(100vh - #{2*$header-height}); + // TODO 这里计算错误，待重构 + max-height: calc(100vh - #{2 * $header-height}); @include scrollbar-width(none, 0); &.always-active ul, diff --git a/layouts/_default/_markup/render-blockquote-alert.html b/layouts/_markup/render-blockquote-alert.html similarity index 100% rename from layouts/_default/_markup/render-blockquote-alert.html rename to layouts/_markup/render-blockquote-alert.html diff --git a/layouts/_default/_markup/render-codeblock-echarts.html b/layouts/_markup/render-codeblock-echarts.html similarity index 100% rename from layouts/_default/_markup/render-codeblock-echarts.html rename to layouts/_markup/render-codeblock-echarts.html diff --git a/layouts/_default/_markup/render-codeblock-mermaid.html b/layouts/_markup/render-codeblock-mermaid.html similarity index 100% rename from layouts/_default/_markup/render-codeblock-mermaid.html rename to layouts/_markup/render-codeblock-mermaid.html diff --git a/layouts/_default/_markup/render-codeblock-timeline.html b/layouts/_markup/render-codeblock-timeline.html similarity index 100% rename from layouts/_default/_markup/render-codeblock-timeline.html rename to layouts/_markup/render-codeblock-timeline.html diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_markup/render-codeblock.html similarity index 100% rename from layouts/_default/_markup/render-codeblock.html rename to layouts/_markup/render-codeblock.html diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_markup/render-heading.html similarity index 100% rename from layouts/_default/_markup/render-heading.html rename to layouts/_markup/render-heading.html diff --git a/layouts/_default/_markup/render-image.html b/layouts/_markup/render-image.html similarity index 100% rename from layouts/_default/_markup/render-image.html rename to layouts/_markup/render-image.html diff --git a/layouts/_default/_markup/render-link.html b/layouts/_markup/render-link.html similarity index 100% rename from layouts/_default/_markup/render-link.html rename to layouts/_markup/render-link.html diff --git a/layouts/_default/baseof.html b/layouts/baseof.html similarity index 100% rename from layouts/_default/baseof.html rename to layouts/baseof.html diff --git a/layouts/_default/friends.html b/layouts/friends.html similarity index 100% rename from layouts/_default/friends.html rename to layouts/friends.html diff --git a/layouts/_default/home.archives.html b/layouts/home.archives.html similarity index 100% rename from layouts/_default/home.archives.html rename to layouts/home.archives.html diff --git a/layouts/_default/home.baidu_urls.txt b/layouts/home.baidu_urls.txt similarity index 86% rename from layouts/_default/home.baidu_urls.txt rename to layouts/home.baidu_urls.txt index 3164374b..92a61355 100644 --- a/layouts/_default/home.baidu_urls.txt +++ b/layouts/home.baidu_urls.txt @@ -1,3 +1,3 @@ {{- range (where .Site.Pages "Kind" "page") -}} {{- println .Permalink -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/layouts/_default/home.html b/layouts/home.html similarity index 100% rename from layouts/_default/home.html rename to layouts/home.html diff --git a/layouts/_default/home.offline.html b/layouts/home.offline.html similarity index 100% rename from layouts/_default/home.offline.html rename to layouts/home.offline.html diff --git a/layouts/_default/home.readme.md b/layouts/home.readme.md similarity index 56% rename from layouts/_default/home.readme.md rename to layouts/home.readme.md index 48760fc4..f6a8ef49 100644 --- a/layouts/_default/home.readme.md +++ b/layouts/home.readme.md @@ -1,13 +1,16 @@ # {{ .Site.Title }} +> {{ .Site.Params.description }} + {{ $pages := .Scratch.Get "mainSectionPages" -}} {{- $pages = where $pages "Draft" "eq" false -}} -{{- T "section.archiveCounter" (len $pages) }} +{{- T "section.archiveCounter" (len $pages) }} by [{{ .Site.Params.author.name }}]({{ .Site.Params.author.link }}). {{ range $pages.GroupByPublishDate "2006" }} {{- if ne .Key "0001" -}} - {{- printf "\n## %v\n\n%v\n\n" .Key (T "section.archiveCounter" .Pages.Len) -}} + {{- printf "\n## %v\n\n
\n%v\n\n" .Key (T "section.archiveCounter" .Pages.Len) -}} {{- range .Pages -}} {{- printf "- %v [%v](%v \"%v\")\n" (.PublishDate.Format "01-02") .Title .Permalink (.PublishDate.Format "2006-01-02 15:04:05") -}} {{- end -}} + {{- printf "\n
\n" -}} {{- end -}} {{- end -}} diff --git a/layouts/_default/home.rss.xml b/layouts/home.rss.xml similarity index 100% rename from layouts/_default/home.rss.xml rename to layouts/home.rss.xml diff --git a/layouts/_default/home.search.json b/layouts/home.search.json similarity index 100% rename from layouts/_default/home.search.json rename to layouts/home.search.json diff --git a/layouts/_default/single.html b/layouts/page.html similarity index 100% rename from layouts/_default/single.html rename to layouts/page.html diff --git a/layouts/_default/single.md b/layouts/page.md similarity index 85% rename from layouts/_default/single.md rename to layouts/page.md index d8e0310a..d03072f5 100644 --- a/layouts/_default/single.md +++ b/layouts/page.md @@ -1,5 +1,5 @@ {{- $params := partial "function/params.html" -}} -{{- $author := .Store.Get "author" -}} +{{- $author := .Store.Get "author" | default (partial "function/get-author-map.html" .Params.author) -}} # {{ cond (.Param "capitalizeTitles") (title .Title) .Title }} {{ if $params.password -}} diff --git a/layouts/_default/search.html b/layouts/search.html similarity index 100% rename from layouts/_default/search.html rename to layouts/search.html diff --git a/layouts/_default/section.html b/layouts/section.html similarity index 100% rename from layouts/_default/section.html rename to layouts/section.html diff --git a/layouts/_default/section.rss.xml b/layouts/section.rss.xml similarity index 100% rename from layouts/_default/section.rss.xml rename to layouts/section.rss.xml diff --git a/layouts/_default/summary.html b/layouts/summary.html similarity index 100% rename from layouts/_default/summary.html rename to layouts/summary.html diff --git a/layouts/_default/tags.html b/layouts/tags.html similarity index 100% rename from layouts/_default/tags.html rename to layouts/tags.html diff --git a/layouts/_default/taxonomies.html b/layouts/taxonomies.html similarity index 100% rename from layouts/_default/taxonomies.html rename to layouts/taxonomies.html diff --git a/layouts/_default/terms.html b/layouts/taxonomy.html similarity index 100% rename from layouts/_default/terms.html rename to layouts/taxonomy.html diff --git a/layouts/_default/term.html b/layouts/term.html similarity index 100% rename from layouts/_default/term.html rename to layouts/term.html diff --git a/layouts/_default/term.rss.xml b/layouts/term.rss.xml similarity index 100% rename from layouts/_default/term.rss.xml rename to layouts/term.rss.xml