From ab74c0abdf4d580b13a9b09807de44f1b38752c6 Mon Sep 17 00:00:00 2001 From: radishzzz Date: Thu, 27 Mar 2025 13:22:26 +0000 Subject: [PATCH] chore: adjust scrollbar max height and update theme guide --- package.json | 4 +- pnpm-lock.yaml | 65 ++++++++++++++++++++++++-- src/components/Widgets/Scrollbar.astro | 3 +- src/content/posts/Theme Guide-en.md | 3 +- src/content/posts/Theme Guide-es.md | 3 +- src/content/posts/Theme Guide-ja.md | 3 +- src/content/posts/Theme Guide-ru.md | 3 +- src/content/posts/Theme Guide-zh-tw.md | 3 +- src/content/posts/Theme Guide-zh.md | 4 +- 9 files changed, 71 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index f826480..18ee8f8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "astro-theme-retypeset", "type": "module", "version": "0.0.1", - "packageManager": "pnpm@10.6.4", + "packageManager": "pnpm@10.7.0", "repository": "https://github.com/radishzzz/astro-theme-retypeset", "scripts": { "dev": "astro check && astro dev", @@ -28,7 +28,9 @@ "photoswipe": "^5.4.4", "rehype-external-links": "^3.0.0", "rehype-katex": "^7.0.1", + "rehype-slug": "^6.0.0", "remark-math": "^6.0.0", + "remark-toc": "^9.0.0", "sanitize-html": "^2.15.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 72f6df0..8ff6a36 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,9 +53,15 @@ importers: rehype-katex: specifier: ^7.0.1 version: 7.0.1 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 remark-math: specifier: ^6.0.0 version: 6.0.0 + remark-toc: + specifier: ^9.0.0 + version: 9.0.0 sanitize-html: specifier: ^2.15.0 version: 2.15.0 @@ -919,6 +925,9 @@ packages: '@types/sax@1.2.7': resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==} + '@types/ungap__structured-clone@1.2.0': + resolution: {integrity: sha512-ZoaihZNLeZSxESbk9PUAPZOlSpcKx81I1+4emtULDVmBLkYutTcMlCj2K9VNlf9EWODxdO6gkAqEaLorXwZQVA==} + '@types/unist@2.0.11': resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==} @@ -1682,8 +1691,8 @@ packages: duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} - electron-to-chromium@1.5.125: - resolution: {integrity: sha512-A2+qEsSUc95QvyFDl7PNwkDDNphIKBVfBBtWWkPGRbiWEgzLo0SvLygYF6HgzVduHd+4WGPB/WD64POFgwzY3g==} + electron-to-chromium@1.5.126: + resolution: {integrity: sha512-AtH1uLcTC72LA4vfYcEJJkrMk/MY/X0ub8Hv7QGAePW2JkeUFHEL/QfS4J77R6M87Sss8O0OcqReSaN1bpyA+Q==} emmet@2.4.11: resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==} @@ -2113,6 +2122,9 @@ packages: hast-util-from-parse5@8.0.3: resolution: {integrity: sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==} + hast-util-heading-rank@3.0.0: + resolution: {integrity: sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==} + hast-util-is-element@3.0.0: resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==} @@ -2134,6 +2146,9 @@ packages: hast-util-to-parse5@8.0.0: resolution: {integrity: sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==} + hast-util-to-string@3.0.1: + resolution: {integrity: sha512-XelQVTDWvqcl3axRfI0xSeoVKzyIFPwsAGSLIsKdJKQMXDYJS4WYrBNF/8J7RdhIcFI2BOHgAifggsvsxp/3+A==} + hast-util-to-text@4.0.2: resolution: {integrity: sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==} @@ -2538,6 +2553,9 @@ packages: mdast-util-to-string@4.0.0: resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} + mdast-util-toc@7.1.0: + resolution: {integrity: sha512-2TVKotOQzqdY7THOdn2gGzS9d1Sdd66bvxUyw3aNpWfcPXCLYSJCCgfPy30sEtuzkDraJgqF35dzgmz6xlvH/w==} + mdn-data@2.0.28: resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} @@ -3018,6 +3036,9 @@ packages: rehype-recma@1.0.0: resolution: {integrity: sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==} + rehype-slug@6.0.0: + resolution: {integrity: sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==} + rehype-stringify@10.0.1: resolution: {integrity: sha512-k9ecfXHmIPuFVI61B9DeLPN0qFHfawM6RsuX48hoqlaKSF61RskNjSm1lI8PhBEM0MRdLxVVm4WmTqJQccH9mA==} @@ -3050,6 +3071,9 @@ packages: remark-stringify@11.0.0: resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==} + remark-toc@9.0.0: + resolution: {integrity: sha512-KJ9txbo33GjDAV1baHFze7ij4G8c7SGYoY8Kzsm2gzFpbhL/bSoVpMMzGa3vrNDSWASNd/3ppAqL7cP2zD6JIA==} + request-light@0.5.8: resolution: {integrity: sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==} @@ -4586,6 +4610,8 @@ snapshots: dependencies: '@types/node': 22.13.14 + '@types/ungap__structured-clone@1.2.0': {} + '@types/unist@2.0.11': {} '@types/unist@3.0.3': {} @@ -5304,7 +5330,7 @@ snapshots: browserslist@4.24.4: dependencies: caniuse-lite: 1.0.30001707 - electron-to-chromium: 1.5.125 + electron-to-chromium: 1.5.126 node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.24.4) @@ -5563,7 +5589,7 @@ snapshots: duplexer@0.1.2: {} - electron-to-chromium@1.5.125: {} + electron-to-chromium@1.5.126: {} emmet@2.4.11: dependencies: @@ -6136,6 +6162,10 @@ snapshots: vfile-location: 5.0.3 web-namespaces: 2.0.1 + hast-util-heading-rank@3.0.0: + dependencies: + '@types/hast': 3.0.4 + hast-util-is-element@3.0.0: dependencies: '@types/hast': 3.0.4 @@ -6225,6 +6255,10 @@ snapshots: web-namespaces: 2.0.1 zwitch: 2.0.4 + hast-util-to-string@3.0.1: + dependencies: + '@types/hast': 3.0.4 + hast-util-to-text@4.0.2: dependencies: '@types/hast': 3.0.4 @@ -6720,6 +6754,16 @@ snapshots: dependencies: '@types/mdast': 4.0.4 + mdast-util-toc@7.1.0: + dependencies: + '@types/mdast': 4.0.4 + '@types/ungap__structured-clone': 1.2.0 + '@ungap/structured-clone': 1.3.0 + github-slugger: 2.0.0 + mdast-util-to-string: 4.0.0 + unist-util-is: 6.0.0 + unist-util-visit: 5.0.0 + mdn-data@2.0.28: {} mdn-data@2.0.30: {} @@ -7394,6 +7438,14 @@ snapshots: transitivePeerDependencies: - supports-color + rehype-slug@6.0.0: + dependencies: + '@types/hast': 3.0.4 + github-slugger: 2.0.0 + hast-util-heading-rank: 3.0.0 + hast-util-to-string: 3.0.1 + unist-util-visit: 5.0.0 + rehype-stringify@10.0.1: dependencies: '@types/hast': 3.0.4 @@ -7466,6 +7518,11 @@ snapshots: mdast-util-to-markdown: 2.1.2 unified: 11.0.5 + remark-toc@9.0.0: + dependencies: + '@types/mdast': 4.0.4 + mdast-util-toc: 7.1.0 + request-light@0.5.8: {} request-light@0.7.0: {} diff --git a/src/components/Widgets/Scrollbar.astro b/src/components/Widgets/Scrollbar.astro index ff52c31..e0e6284 100644 --- a/src/components/Widgets/Scrollbar.astro +++ b/src/components/Widgets/Scrollbar.astro @@ -60,7 +60,7 @@ document.addEventListener('astro:after-swap', setupScrollbar) --os-handle-bg: oklch(var(--un-preset-theme-colors-secondary) / 0.25); --os-handle-bg-hover: oklch(var(--un-preset-theme-colors-secondary) / 0.40); --os-handle-bg-active: oklch(var(--un-preset-theme-colors-secondary) / 0.40); - --os-handle-max-size: 60%; + --os-handle-max-size: 80%; --os-handle-min-size: 12%; } @@ -76,7 +76,6 @@ document.addEventListener('astro:after-swap', setupScrollbar) --os-handle-bg: oklch(var(--un-preset-theme-colors-secondary) / 0.20); --os-handle-bg-hover: oklch(var(--un-preset-theme-colors-secondary) / 0.35); --os-handle-bg-active: oklch(var(--un-preset-theme-colors-secondary) / 0.35); - --os-handle-max-size: 60%; --os-handle-min-size: 12%; } diff --git a/src/content/posts/Theme Guide-en.md b/src/content/posts/Theme Guide-en.md index e66c99e..fc8b523 100644 --- a/src/content/posts/Theme Guide-en.md +++ b/src/content/posts/Theme Guide-en.md @@ -76,7 +76,7 @@ global: { locale: 'zh' // zh, zh-tw, ja, en, es, ru // more languages // Generate multi-language paths such as '/es/' '/ru/' - // not fill in the locale code above again + // do not include the default language again, can be an empty array [] moreLocales: ['zh-tw', 'ja', 'en', 'es', 'ru'] // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // font style fontStyle: 'sans' // sans, serif @@ -252,7 +252,6 @@ src/content/posts/apple.md -> example.com/posts/apple/ src/content/posts/banana.md -> example.com/es/posts/banana/ # lang: ru src/content/posts/orange.md -> example.com/ru/posts/orange/ - ``` #### abbrlink diff --git a/src/content/posts/Theme Guide-es.md b/src/content/posts/Theme Guide-es.md index 287e583..a10b484 100644 --- a/src/content/posts/Theme Guide-es.md +++ b/src/content/posts/Theme Guide-es.md @@ -76,7 +76,7 @@ global: { locale: 'zh' // zh, zh-tw, ja, en, es, ru // más idiomas // Genera rutas multilingües como '/es/' '/ru/' - // no rellenar de nuevo el código de localización anterior + // no incluir el idioma predeterminado nuevamente, puede ser un array vacío [] moreLocales: ['zh-tw', 'ja', 'en', 'es', 'ru'] // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // estilo de fuente fontStyle: 'sans' // sans, serif @@ -252,7 +252,6 @@ src/content/posts/apple.md -> example.com/posts/apple/ src/content/posts/banana.md -> example.com/es/posts/banana/ # lang: ru src/content/posts/orange.md -> example.com/ru/posts/orange/ - ``` #### abbrlink diff --git a/src/content/posts/Theme Guide-ja.md b/src/content/posts/Theme Guide-ja.md index c8c04d4..a6e0e6a 100644 --- a/src/content/posts/Theme Guide-ja.md +++ b/src/content/posts/Theme Guide-ja.md @@ -76,7 +76,7 @@ global: { locale: 'zh' // zh, zh-tw, ja, en, es, ru // その他の言語 // '/ja/' '/en/' などの多言語パスを生成 - // デフォルト言語を重複して入力しないでください + // デフォルト言語を重複して入力しないでください、空の配列 [] も可能です moreLocales: ['zh-tw', 'ja', 'en', 'es', 'ru'] // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // フォントスタイル fontStyle: 'sans' // sans, serif @@ -252,7 +252,6 @@ src/content/posts/apple.md -> example.com/posts/apple/ src/content/posts/banana.md -> example.com/es/posts/banana/ # lang: ru src/content/posts/orange.md -> example.com/ru/posts/orange/ - ``` #### abbrlink diff --git a/src/content/posts/Theme Guide-ru.md b/src/content/posts/Theme Guide-ru.md index 51be969..bbafe31 100644 --- a/src/content/posts/Theme Guide-ru.md +++ b/src/content/posts/Theme Guide-ru.md @@ -76,7 +76,7 @@ global: { locale: 'zh' // zh, zh-tw, ja, en, es, ru // дополнительные языки // Создает многоязычные пути, такие как '/es/' '/ru/' - // не указывайте повторно код локали, указанный выше + // не указывайте повторно язык по умолчанию, можно оставить пустым массивом [] moreLocales: ['zh-tw', 'ja', 'en', 'es', 'ru'] // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // стиль шрифта fontStyle: 'sans' // sans, serif @@ -252,7 +252,6 @@ src/content/posts/apple.md -> example.com/posts/apple/ src/content/posts/banana.md -> example.com/es/posts/banana/ # lang: ru src/content/posts/orange.md -> example.com/ru/posts/orange/ - ``` #### abbrlink diff --git a/src/content/posts/Theme Guide-zh-tw.md b/src/content/posts/Theme Guide-zh-tw.md index bc83a45..b19b2e6 100644 --- a/src/content/posts/Theme Guide-zh-tw.md +++ b/src/content/posts/Theme Guide-zh-tw.md @@ -76,7 +76,7 @@ global: { locale: 'zh' // zh, zh-tw, ja, en, es, ru // 更多語言 // 生成 '/ja/' '/en/' 等多語言路徑 - // 不要重複填寫默認語言 + // 不要重複填寫默認語言，可以為空 [] moreLocales: ['zh-tw', 'ja', 'en', 'es', 'ru'] // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // 字體樣式 fontStyle: 'sans' // sans, serif @@ -252,7 +252,6 @@ src/content/posts/apple.md -> example.com/posts/apple/ src/content/posts/banana.md -> example.com/es/posts/banana/ # lang: ru src/content/posts/orange.md -> example.com/ru/posts/orange/ - ``` #### abbrlink diff --git a/src/content/posts/Theme Guide-zh.md b/src/content/posts/Theme Guide-zh.md index 0452f39..6f2820d 100644 --- a/src/content/posts/Theme Guide-zh.md +++ b/src/content/posts/Theme Guide-zh.md @@ -76,7 +76,7 @@ global: { locale: 'zh' // zh, zh-tw, ja, en, es, ru // 更多语言 // 生成 ‘/ja/' '/en/’ 等多语言路径 - // 不要重复填写默认语言 + // 不要重复填写默认语言，可以为空 [] moreLocales: ['zh-tw', 'ja', 'en', 'es', 'ru'] // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // 字体样式 fontStyle: 'sans' // sans, serif @@ -252,7 +252,6 @@ src/content/posts/apple.md -> example.com/posts/apple/ src/content/posts/banana.md -> example.com/es/posts/banana/ # lang: ru src/content/posts/orange.md -> example.com/ru/posts/orange/ - ``` #### abbrlink @@ -279,4 +278,3 @@ src/content/posts/2025/03/apple.md -> example.com/es/posts/banana/ ### 自动化配置介绍 自动计算文章阅读时间。自动为每篇文章生成 Open Graph 图片。相同 abbrlink 的文章会自动共享 Waline 评论，且不受 lang 配置影响。 -