From 91b583817a2bca52d03022735a28e2f5d5e14070 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Fri, 28 Jun 2024 14:17:48 +0800 Subject: [PATCH 01/46] :bug: Fix: fix custom-assets block postion --- layouts/partials/assets.html | 6 +++--- layouts/partials/init/index.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/partials/assets.html b/layouts/partials/assets.html index abda23e72..0d77ad3c8 100644 --- a/layouts/partials/assets.html +++ b/layouts/partials/assets.html @@ -284,6 +284,9 @@ {{- end -}} {{- dict "Source" (resources.Get "js/theme.js") "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} +{{- /* Custom Assets */ -}} +{{- block "custom-assets" . }}{{ end -}} + {{- /* Custom script */ -}} {{- with ((resources.Get "js/custom.js") | default (resources.Get "js/_custom.js")) -}} {{- $options := dict "targetPath" "js/custom.min.js" "minify" hugo.IsProduction -}} @@ -306,6 +309,3 @@ {{- end -}} {{- partial "plugin/analytics.html" . -}} - -{{- /* Custom Assets */ -}} -{{- block "custom-assets" . }}{{ end -}} diff --git a/layouts/partials/init/index.html b/layouts/partials/init/index.html index 2ad8c3e64..e36e5bdd7 100644 --- a/layouts/partials/init/index.html +++ b/layouts/partials/init/index.html @@ -1,4 +1,4 @@ -{{- .Scratch.Set "version" "v0.3.8" -}} +{{- .Scratch.Set "version" "v0.3.9-RC" -}} {{- .Scratch.Set "this" dict -}} {{- partial "init/detection-env.html" . -}} From 052d128922d88aadbd4dadb58cf27a805d3d6fa4 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Sun, 30 Jun 2024 13:33:21 +0800 Subject: [PATCH 02/46] :bug: Fix: fix code title overflow in code header --- assets/css/_partials/_single/_code.scss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/assets/css/_partials/_single/_code.scss b/assets/css/_partials/_single/_code.scss index 03dc239f7..12826ae9b 100644 --- a/assets/css/_partials/_single/_code.scss +++ b/assets/css/_partials/_single/_code.scss @@ -78,6 +78,7 @@ pre:not(.mermaid[data-processed='true']) { position: relative; .code-header { + --#{$prefix}bg-code-header: #{darken($code-background-color, 3%)}; display: flex; justify-content: space-between; align-items: center; @@ -87,13 +88,13 @@ pre:not(.mermaid[data-processed='true']) { font-weight: bold; line-height: 1.4em; color: $code-info-color; - background-color: darken($code-background-color, 3%); + background-color: var(--#{$prefix}bg-code-header); @include border-radius($global-border-radius); @include transition(border-radius 0.2s ease); [data-theme='dark'] & { color: $code-info-color-dark; - background-color: darken($code-background-color-dark, 6%); + --#{$prefix}bg-code-header: #{darken($code-background-color-dark, 3%)}; } &:hover { @@ -119,6 +120,13 @@ pre:not(.mermaid[data-processed='true']) { position: absolute; left: 50%; transform: translateX(-50%); + background-color: var(--#{$prefix}bg-code-header); + padding-inline: 1em; + max-width: 80%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + @include z-index(0, 1); } } @@ -217,11 +225,11 @@ pre:not(.mermaid[data-processed='true']) { &.open { .code-header { - background-color: darken($code-background-color, 6%); + --#{$prefix}bg-code-header: #{darken($code-background-color, 6%)}; @include border-radius($global-border-radius $global-border-radius 0 0); [data-theme='dark'] & { - background-color: darken($code-background-color-dark, 3%); + --#{$prefix}bg-code-header: #{darken($code-background-color-dark, 6%)}; } } From cf91f230e8b0b32c66c3d75edcf799971b1d08de Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 4 Jul 2024 23:07:31 +0800 Subject: [PATCH 03/46] :memo: Docs: update default hugo.toml --- hugo.toml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hugo.toml b/hugo.toml index 1f2249c5e..1126b7efa 100644 --- a/hugo.toml +++ b/hugo.toml @@ -157,10 +157,22 @@ enableEmoji = true definitionList = true footnote = true linkify = true - strikethrough = true + strikethrough = false table = true taskList = true typographer = true + # https://gohugo.io/getting-started/configuration-markup/#extras + [markup.goldmark.extensions.extras] + [markup.goldmark.extensions.extras.delete] + enable = true + [markup.goldmark.extensions.extras.insert] + enable = true + [markup.goldmark.extensions.extras.mark] + enable = true + [markup.goldmark.extensions.extras.subscript] + enable = true + [markup.goldmark.extensions.extras.superscript] + enable = true [markup.goldmark.renderer] # whether to use HTML tags directly in the document unsafe = true From 44d0c7611ddb2cd16360d823f76279a4b85db566 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 4 Jul 2024 23:37:08 +0800 Subject: [PATCH 04/46] :recycle: Refactor: deprecate .Sites.First in favor of .Sites.Default .Sites.First was deprecated in Hugo v0.127.0 and will be removed in a future release. Use .Sites.Default instead. --- README.md | 2 +- README.zh-cn.md | 2 +- hugo.toml | 2 +- layouts/partials/init/detection-env.html | 2 +- layouts/partials/init/detection-version.html | 2 +- theme.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c18c683b0..6ffc6fd8c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # FixIt Theme | Hugo [![GitHub release (latest by date)](https://img.shields.io/github/v/release/hugo-fixit/FixIt?style=flat)](https://github.com/hugo-fixit/FixIt/releases) -[![Hugo](https://img.shields.io/badge/Hugo-%5E0.123.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/) +[![Hugo](https://img.shields.io/badge/Hugo-%5E0.127.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/) [![License](https://img.shields.io/github/license/hugo-fixit/FixIt?style=flat)](/LICENSE) 👉 English README | [简体中文说明](README.zh-cn.md) diff --git a/README.zh-cn.md b/README.zh-cn.md index 11eceba50..6ba1639f7 100644 --- a/README.zh-cn.md +++ b/README.zh-cn.md @@ -1,7 +1,7 @@ # FixIt 主题 | Hugo [![GitHub release (latest by date)](https://img.shields.io/github/v/release/hugo-fixit/FixIt?style=flat)](https://github.com/hugo-fixit/FixIt/releases) -[![Hugo](https://img.shields.io/badge/Hugo-%5E0.123.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/) +[![Hugo](https://img.shields.io/badge/Hugo-%5E0.127.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/) [![License](https://img.shields.io/github/license/hugo-fixit/FixIt?style=flat)](/LICENSE) 👉 [English README](README.md) | 简体中文说明 diff --git a/hugo.toml b/hugo.toml index 1126b7efa..145e01484 100644 --- a/hugo.toml +++ b/hugo.toml @@ -133,7 +133,7 @@ enableEmoji = true [module] [module.hugoVersion] extended = true - min = "0.123.0" + min = "0.127.0" # ------------------------------------------------------------------------------------- # Markup related configuration in Hugo diff --git a/layouts/partials/init/detection-env.html b/layouts/partials/init/detection-env.html index fb9899948..e61671790 100644 --- a/layouts/partials/init/detection-env.html +++ b/layouts/partials/init/detection-env.html @@ -26,7 +26,7 @@ {{- if ne .Site.Params.dev.enable true -}} {{- .Scratch.Set "devOpts" dict -}} {{- end -}} - {{- if eq .Site .Sites.First -}} + {{- if eq .Site .Sites.Default -}} {{- warnf "FixIt %v\n%v\n\n" (.Scratch.Get "version") (T "init.devEnvWarn") -}} {{- end -}} {{- end -}} diff --git a/layouts/partials/init/detection-version.html b/layouts/partials/init/detection-version.html index 6944857c2..f53e803ee 100644 --- a/layouts/partials/init/detection-version.html +++ b/layouts/partials/init/detection-version.html @@ -10,7 +10,7 @@ {{- end -}} {{- /* FixIt theme version detection */ -}} -{{- if eq .Site .Sites.First -}} +{{- if eq .Site .Sites.Default -}} {{- if not .Site.Params.version -}} {{- errorf "FixIt %v\n%v\n\n" $version (T "init.configurationError") -}} {{- else if gt "0.2.0" (strings.TrimPrefix "v" .Site.Params.version) -}} diff --git a/theme.toml b/theme.toml index 9ebab62df..7ea28e150 100644 --- a/theme.toml +++ b/theme.toml @@ -7,7 +7,7 @@ licenselink = "https://github.com/hugo-fixit/FixIt/blob/master/LICENSE" description = "A Clean, Elegant but Advanced Hugo Theme for Hugo." homepage = "https://github.com/hugo-fixit/FixIt" demosite = "https://fixit.lruihao.cn" -min_version = "0.123.0" +min_version = "0.127.0" tags = [ "blog", From 061a3e3e2b76e9cdbeea8f38c40d209eee8f9c76 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 4 Jul 2024 23:40:08 +0800 Subject: [PATCH 05/46] :recycle: Refactor: deprecate .Site.IsMultiLingual in favor of hugo.IsMultilingual .Site.IsMultiLingual was deprecated in Hugo v0.124.0 and will be removed in a future release. Use hugo.IsMultilingual --- layouts/partials/header.html | 4 ++-- layouts/shortcodes/version.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index a9680b236..438fd7563 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -106,7 +106,7 @@
  • {{ dict "Class" "fa-solid fa-adjust fa-fw" | partial "plugin/icon.html" }}
    • - {{- if .Site.IsMultiLingual -}} + {{- if hugo.IsMultilingual -}}
  • {{- dict "Class" "fa-solid fa-language fa-fw" | partial "plugin/icon.html" -}} @@ -276,7 +276,7 @@ {{- end -}}
  • {{ dict "Class" "fa-solid fa-adjust fa-fw" | partial "plugin/icon.html" }} - {{- if .Site.IsMultiLingual -}} + {{- if hugo.IsMultilingual -}} {{- .Language.LanguageName -}} diff --git a/layouts/shortcodes/version.html b/layouts/shortcodes/version.html index be999006b..e7213603f 100644 --- a/layouts/shortcodes/version.html +++ b/layouts/shortcodes/version.html @@ -3,7 +3,7 @@ {{- $type := .Get 1 | default "new" | lower -}} {{- $label := T (printf "version.%v" $type) -}} {{- $color := cond (eq $type "changed") "ff9101" "00b1ff" | cond (eq $type "deleted") "ff5252" -}} -{{- $pathTemplate := cond .Site.IsMultiLingual (printf "images/version/%%v-%%v.%v.svg" .Page.Language.Lang) "images/version/%v-%v.svg" -}} +{{- $pathTemplate := cond hugo.IsMultilingual (printf "images/version/%%v-%%v.%v.svg" .Page.Language.Lang) "images/version/%v-%v.svg" -}} {{- $path := printf $pathTemplate $version $type -}} {{- $resource := resources.Get "images/version.template.svg" -}} {{- $resource = $resource | resources.ExecuteAsTemplate $path (dict "version" $version "label" $label "color" $color "isCJK" .Page.Params.IsCJKLanguage) | minify -}} From 4f56a40653a7a49f713ffa3c485396a58641f014 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Fri, 5 Jul 2024 00:02:45 +0800 Subject: [PATCH 06/46] :bug: Fix: fix code block scrollbar color error --- assets/css/_page/_single.scss | 12 +++++++----- assets/css/_partials/_single/_code.scss | 5 ----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss index 1b50a309d..0890f3413 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single.scss @@ -257,11 +257,13 @@ } .table-wrapper { - overflow-x: auto; - --#{$prefix}scrollbar-thumb-color: #{$table-background-color}; - - [data-theme='dark'] & { - --#{$prefix}scrollbar-thumb-color: #{$table-background-color-dark}; + &:not(> .lntable) { + overflow-x: auto; + --#{$prefix}scrollbar-thumb-color: #{$table-background-color}; + + [data-theme='dark'] & { + --#{$prefix}scrollbar-thumb-color: #{$table-background-color-dark}; + } } > table { diff --git a/assets/css/_partials/_single/_code.scss b/assets/css/_partials/_single/_code.scss index 12826ae9b..8a1c40aed 100644 --- a/assets/css/_partials/_single/_code.scss +++ b/assets/css/_partials/_single/_code.scss @@ -356,11 +356,6 @@ pre:not(.mermaid[data-processed='true']) { } .table-wrapper { - --#{$prefix}scrollbar-thumb-color: #{$code-background-color}; - - [data-theme='dark'] & { - --#{$prefix}scrollbar-thumb-color: #{$code-background-color-dark}; - } .highlight { background-color: $code-background-color; From c18aac486bc7e2cfe80ded412253d1681709eab0 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Fri, 5 Jul 2024 00:37:24 +0800 Subject: [PATCH 07/46] :bug: Fix: fix admontion overflow error --- assets/css/_shortcodes/_admonition.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/_shortcodes/_admonition.scss b/assets/css/_shortcodes/_admonition.scss index e896b3f8f..1a8c38ef1 100644 --- a/assets/css/_shortcodes/_admonition.scss +++ b/assets/css/_shortcodes/_admonition.scss @@ -3,7 +3,7 @@ margin: 1rem 0; padding: 0 0.75rem; border-left: .25rem solid; - overflow: auto; + overflow: hidden; @include border-radius($global-border-radius); .admonition-title { From b067289648e1141d9f528b5e57a1ddb8ad8c3382 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Fri, 5 Jul 2024 00:39:08 +0800 Subject: [PATCH 08/46] :bug: Fix: fix footnote style error --- assets/css/_page/_single.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss index 0890f3413..6e6aab9d9 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single.scss @@ -399,7 +399,7 @@ @include link(false, true); } - sup[id^='fnref:']:has(.footnote-ref) { + sup[id^='fnref']:has(.footnote-ref) { padding: 2px 4px; background-color: rgba(238, 238, 238, 0.7); color: #555555; From c021a53d152573049b6178da533f7b666357ed1f Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Sun, 7 Jul 2024 12:07:45 +0800 Subject: [PATCH 09/46] :memo: Docs: update embed archetypes --- archetypes/friends.md | 23 ++++++++++++++++------- archetypes/post-bundle/index.md | 4 +++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/archetypes/friends.md b/archetypes/friends.md index 93c46989b..375aa38d4 100644 --- a/archetypes/friends.md +++ b/archetypes/friends.md @@ -11,7 +11,7 @@ keywords: comment: false --- - + --- @@ -19,18 +19,27 @@ comment: false ## Base info -```yaml - nickname: Lruihao - avatar: https://lruihao.cn/images/avatar.jpg - url: https://lruihao.cn - description: Lruihao's Note -``` +- avatar: https://lruihao.cn/images/avatar.jpg +- url: https://lruihao.cn +- description: Lruihao's Note ## Friendly Reminder +Comment like this: + +````markdown +```yaml +- nickname: + avatar: + url: + description: +``` +```` + {{< admonition info "Notice" true >}} -1. If you want to exchange link, please leave a comment in the above format. (personal non-commercial blogs / websites only) +1. If you want to exchange link, please leave a comment as the above format. (personal non-commercial blogs / websites only) 2. :(fa-solid fa-exclamation-triangle): Website failure, stop maintenance and improper content may be unlinked! 3. Those websites that do not respect other people's labor achievements, reprint without source, or malicious acts, please do not come to exchange. diff --git a/archetypes/post-bundle/index.md b/archetypes/post-bundle/index.md index 9be79ded3..35dc82729 100644 --- a/archetypes/post-bundle/index.md +++ b/archetypes/post-bundle/index.md @@ -40,4 +40,6 @@ repost: # See details front matter: https://fixit.lruihao.cn/documentation/content-management/introduction/#front-matter --- - \ No newline at end of file + + + From adf2acd22cb8f21e8b3bc60d3b5e8dfac33b0d9d Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Sun, 7 Jul 2024 18:27:06 +0800 Subject: [PATCH 10/46] :lipstick: Style: update bilibili and douyin shortcode style --- assets/css/_shortcodes/_bilibili.scss | 6 +++--- assets/css/_shortcodes/_douyin.scss | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/css/_shortcodes/_bilibili.scss b/assets/css/_shortcodes/_bilibili.scss index 6eef8e649..ce47f3c65 100644 --- a/assets/css/_shortcodes/_bilibili.scss +++ b/assets/css/_shortcodes/_bilibili.scss @@ -1,9 +1,9 @@ .bilibili { position: relative; width: 100%; - height: 0; - padding-bottom: 75%; - margin: 3% auto; + height: auto; + aspect-ratio: 16 / 9; + margin: 1rem auto; text-align: center; iframe { diff --git a/assets/css/_shortcodes/_douyin.scss b/assets/css/_shortcodes/_douyin.scss index d8a31aa4d..47daba952 100644 --- a/assets/css/_shortcodes/_douyin.scss +++ b/assets/css/_shortcodes/_douyin.scss @@ -3,7 +3,7 @@ width: 100%; height: 0; padding-bottom: 60.725%; - margin: 3% auto; + margin: 1rem auto; text-align: center; iframe { From 906f3463bae37ab9f32eb2a8e63d816aae9fe2cd Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Tue, 9 Jul 2024 16:08:17 +0800 Subject: [PATCH 11/46] :pencil: Docs: fix typo in translations --- i18n/en.toml | 2 +- i18n/hi.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/i18n/en.toml b/i18n/en.toml index bdc5482e5..23020c543 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -14,7 +14,7 @@ quicklyUpgrade = "Quickly upgrade use command: " [baseof] backToTop = "Back to Top" viewComments = "View Comments" -noscript = "यह वेबसाइट जावास्क्रिप्ट सक्षम होने पर सबसे अच्छा काम करती है।" +noscript = "This website works best with JavaScript enabled." # === baseof === # === Taxonomy === diff --git a/i18n/hi.toml b/i18n/hi.toml index 5acaff42a..1db449530 100644 --- a/i18n/hi.toml +++ b/i18n/hi.toml @@ -15,7 +15,6 @@ quicklyUpgrade = "शीघ्रता से अपग्रेड यह क [baseof] backToTop = "वापस शीर्ष पर" viewComments = "टिप्पणियाँ देखें" -# This website works best with JavaScript enabled. noscript = "यह वेबसाइट जेएस को चालू करके बेहतर काम करती है।" # === baseof === From 3dcb3b1a98afaa8d939a8a174413fe6a36b52b2b Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Tue, 9 Jul 2024 16:08:52 +0800 Subject: [PATCH 12/46] :memo: Docs: update hugo.toml --- hugo.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hugo.toml b/hugo.toml index 145e01484..06f52f564 100644 --- a/hugo.toml +++ b/hugo.toml @@ -152,11 +152,14 @@ enableEmoji = true ########## necessary configurations ########## guessSyntax = true # Goldmark is from Hugo 0.60 the default library used for Markdown + # https://gohugo.io/getting-started/configuration-markup/#goldmark [markup.goldmark] + duplicateResourceFiles = false [markup.goldmark.extensions] definitionList = true footnote = true linkify = true + linkifyProtocol = 'https' strikethrough = false table = true taskList = true @@ -173,9 +176,17 @@ enableEmoji = true enable = true [markup.goldmark.extensions.extras.superscript] enable = true + # TODO passthrough refactor https://gohugo.io/getting-started/configuration-markup/#parserattributeblock + # TODO hugo 0.122.0 https://gohugo.io/content-management/mathematics/ + [markup.goldmark.parser] + [markup.goldmark.parser.attribute] + block = true + title = true [markup.goldmark.renderer] + hardWraps = false # whether to use HTML tags directly in the document unsafe = true + xhtml = false # Table Of Contents settings [markup.tableOfContents] ordered = false From e39d78965f64a48aa553f296c8398b66260ca982 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Tue, 9 Jul 2024 16:10:19 +0800 Subject: [PATCH 13/46] :recycle: Refactor: refactor breadcrumb translations with .TranslationKey --- layouts/partials/breadcrumb.html | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/layouts/partials/breadcrumb.html b/layouts/partials/breadcrumb.html index 9788217b1..effea7576 100644 --- a/layouts/partials/breadcrumb.html +++ b/layouts/partials/breadcrumb.html @@ -2,11 +2,31 @@ {{- end -}} From 45c71ef58ed66feca635373610617f4c1ab27f5d Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Wed, 10 Jul 2024 12:40:15 +0800 Subject: [PATCH 14/46] :bug: Fix: .hiddenFormRss not taking effect --- layouts/index.rss.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/index.rss.xml b/layouts/index.rss.xml index 2d80744ed..dd7087f47 100644 --- a/layouts/index.rss.xml +++ b/layouts/index.rss.xml @@ -37,7 +37,8 @@ {{ printf "" .Permalink .MediaType | safeHTML }} {{ end }} {{- range .Scratch.Get "mainSectionPages" | first (.Site.Params.home.rss | default 10) -}} - {{- $params := partial "function/params.html" -}} + {{- /* TODO 0.4.0 待重构为去掉 `.page` 改用 hugo 推荐的 .Param 方法获取页面参数 */ -}} + {{- $params := .Params | merge site.Params.page -}} {{- if $params.password | or $params.hiddenFromRss }}{{ continue }}{{ end -}} {{- dict "Page" . "Site" .Site | partial "rss/item.html" -}} {{- end -}} From 6d9c6f5b93bb53a4eab9955641058d9a412f30b7 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Wed, 10 Jul 2024 17:59:09 +0800 Subject: [PATCH 15/46] :bulb: Feat: use the original title after archiving the articles --- layouts/index.archives.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/index.archives.html b/layouts/index.archives.html index a3c9fe850..ca22c484e 100644 --- a/layouts/index.archives.html +++ b/layouts/index.archives.html @@ -51,7 +51,8 @@

    {{- if eq $repost.enable true -}} {{- dict "Class" "fa-solid fa-share fa-fw text-success me-1" | partial "plugin/icon.html" -}} {{- end -}} - {{- title .LinkTitle -}} + {{- /* Use the original title after archiving the articles */ -}} + {{- title .Title -}} {{- .Date | dateFormat ($.Site.Params.archives.dateFormat | default "01-02") -}} From 2b2bde7ba846fdbba9feab0671b23765cf977f66 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 11 Jul 2024 09:45:32 +0800 Subject: [PATCH 16/46] :bug: Fix: collection nav and list can not show in posts that have password --- layouts/partials/single/collection-list.html | 4 ++-- layouts/partials/single/collection-nav.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/partials/single/collection-list.html b/layouts/partials/single/collection-list.html index 37490dfbf..66defcb84 100644 --- a/layouts/partials/single/collection-list.html +++ b/layouts/partials/single/collection-list.html @@ -1,14 +1,14 @@ {{- /* Collection List */ -}} {{- $params := partial "function/params.html" -}} -{{- if .Params.collections | and $params.collectionList | and (not $params.password) -}} +{{- if .Params.collections | and $params.collectionList -}} {{- $collectionTerms := .GetTerms "collections" -}} {{- range $collectionTerms -}} {{- $pages := (where .Pages "Params.Weight" "!=" nil) | append (where .Pages "Params.Weight" "eq" nil).ByDate -}} {{- $open := eq (index $collectionTerms 0) . -}} {{- $currentKey := 0 -}} -
    +
    {{ dict "Class" "fa-solid fa-layer-group fa-fw" | partial "plugin/icon.html" }} {{ .LinkTitle }} diff --git a/layouts/partials/single/collection-nav.html b/layouts/partials/single/collection-nav.html index a340d6323..adbf46e68 100644 --- a/layouts/partials/single/collection-nav.html +++ b/layouts/partials/single/collection-nav.html @@ -1,7 +1,7 @@ {{- /* Collection Navigation */ -}} {{- $params := partial "function/params.html" -}} -{{- if .Params.collections | and $params.collectionNavigation | and (not $params.password) -}} +{{- if .Params.collections | and $params.collectionNavigation -}} {{- $collectionTerms := .GetTerms "collections" -}} {{- range $collectionTerms -}} {{- $termLink := printf `%v %v・%v` @@ -10,7 +10,7 @@ (T "collection") .LinkTitle -}} -
    +
    {{- dict "Collections" $termLink | T "single.includedIn.collections" | strings.FirstUpper | safeHTML }} {{ .Pages.Len -}}
    From f9a09e46103b21b81c0482ab2394b56805674c18 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 11 Jul 2024 22:03:32 +0800 Subject: [PATCH 17/46] :sparkles: Feat: add submenu param divided and change submenu border color --- assets/css/_core/_header.scss | 19 ++++++++++++--- assets/css/_variables.scss | 7 ++++++ hugo.toml | 2 ++ layouts/partials/header.html | 46 ++++++++++++++++++++--------------- 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/assets/css/_core/_header.scss b/assets/css/_core/_header.scss index 6eb8f1820..a71c2b5f3 100644 --- a/assets/css/_core/_header.scss +++ b/assets/css/_core/_header.scss @@ -58,6 +58,17 @@ header { margin: 0; padding: 0; + .menu-item-divider { + list-style: none; + margin: 0.25rem 0.5rem; + height: 1px; + background-color: $menu-border-color; + + [data-theme='dark'] & { + background-color: $menu-border-color-dark; + } + } + .menu-item { list-style: none; @@ -262,20 +273,20 @@ header { display: none; top: calc(#{$header-height} - 0.75rem); border-radius: $global-border-radius; - border: 1px solid $global-border-color; + border: 1px solid $menu-border-color; background-color: $header-background-color; @include transition(box-shadow 0.3s ease); @include box-shadow(0 0 1.5rem 0 rgba(0, 0, 0, 0.1)); [data-theme='dark'] & { background-color: $header-background-color-dark; - border-color: $global-border-color-dark; + border-color: $menu-border-color-dark; @include box-shadow(0 0 1.5rem 0 rgba(255, 255, 255, 0.1)); } .menu-item { - height: $header-height*0.5; - line-height: $header-height*0.5; + height: $submenu-height; + line-height: $submenu-height; max-width: 15rem; white-space: nowrap; text-overflow: ellipsis; diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index d9244983e..efac4a5a5 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -73,6 +73,13 @@ $header-title-font-size: 1.5rem !default; $menu-active-color: #161209 !default; $menu-active-color-dark: #fff !default; +// Border color of the menu item +$menu-border-color: darken($global-border-color, 5%) !default; +$menu-border-color-dark: lighten($global-border-color-dark, 5%) !default; + +// Height of the submenu item of desktop header +$submenu-height: $header-height * 0.5 !default; + // Color of the search background $search-background-color: #e9e9e9 !default; $search-background-color-dark: #363636 !default; diff --git a/hugo.toml b/hugo.toml index 06f52f564..9939e5885 100644 --- a/hugo.toml +++ b/hugo.toml @@ -63,6 +63,8 @@ enableEmoji = true icon = "fa-solid fa-archive" # FixIt 0.2.16 | NEW set menu item type, optional values: ["mobile", "desktop"] type = "" + # FixIt 0.3.9 | NEW whether to show the submenu item divider line + divided = false [[menu.main]] identifier = "categories" parent = "" diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 438fd7563..1170f7d5c 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -58,25 +58,28 @@ {{- if .HasChildren -}} {{ dict "Class" "dropdown-icon fa-solid fa-chevron-down" | partial "plugin/icon.html" }}
    + {{/* TODO JS 实现 reverse 翻转顺序 */}} {{- $pages := (where .Pages "Params.Weight" "!=" nil) | append (where .Pages "Params.Weight" "eq" nil).ByDate -}} {{- with $pages.Next $ -}}