优化主题切换组件,更新页面标题,移除冗余样式,调整代码块样式,
This commit is contained in:
parent
7dda1dfc34
commit
3146fc99cd
28
README.md
28
README.md
@ -14,7 +14,7 @@
|
|||||||
## 📌 项目地址 & 使用教程
|
## 📌 项目地址 & 使用教程
|
||||||
|
|
||||||
🔗 **GitHub**:[lsy2246/newechoes](https://github.com/lsy2246/newechoes)
|
🔗 **GitHub**:[lsy2246/newechoes](https://github.com/lsy2246/newechoes)
|
||||||
📖 **使用教程**:[点击查看](https://blog.lsy22.com/articles/web/echoes%E5%8D%9A%E5%AE%A2%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E)
|
📖 **使用教程**:[点击查看](https://blog.lsy22.com/articles/技术日志/web/echoes博客使用说明)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@ -24,29 +24,3 @@
|
|||||||
|----------|----------------|
|
|----------|----------------|
|
||||||
| 🇨🇳 国内访问 | [blog.lsy22.com](https://blog.lsy22.com/) |
|
| 🇨🇳 国内访问 | [blog.lsy22.com](https://blog.lsy22.com/) |
|
||||||
| 🌍 国外访问 | [vercel.blog.lsy22.com](https://vercel.blog.lsy22.com/) |
|
| 🌍 国外访问 | [vercel.blog.lsy22.com](https://vercel.blog.lsy22.com/) |
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📸 界面预览
|
|
||||||
|
|
||||||
### 🔹 文章管理
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### 🔹 文章界面
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### 🔹 项目
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### 🔹 观影记录
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### 🔹 旅行足迹
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
---
|
|
||||||
|
@ -13,9 +13,7 @@ import swup from "@swup/astro"
|
|||||||
import { SITE_URL } from "./src/consts";
|
import { SITE_URL } from "./src/consts";
|
||||||
import pagefind from "astro-pagefind";
|
import pagefind from "astro-pagefind";
|
||||||
import compressor from "astro-compressor";
|
import compressor from "astro-compressor";
|
||||||
|
|
||||||
import vercel from "@astrojs/vercel";
|
import vercel from "@astrojs/vercel";
|
||||||
|
|
||||||
import expressiveCode from "astro-expressive-code";
|
import expressiveCode from "astro-expressive-code";
|
||||||
import { pluginLineNumbers } from "@expressive-code/plugin-line-numbers";
|
import { pluginLineNumbers } from "@expressive-code/plugin-line-numbers";
|
||||||
import { pluginCollapsibleSections } from "@expressive-code/plugin-collapsible-sections";
|
import { pluginCollapsibleSections } from "@expressive-code/plugin-collapsible-sections";
|
||||||
@ -69,6 +67,9 @@ export default defineConfig({
|
|||||||
defaultProps: {
|
defaultProps: {
|
||||||
showLineNumbers: true,
|
showLineNumbers: true,
|
||||||
collapseStyle: 'collapsible-auto',
|
collapseStyle: 'collapsible-auto',
|
||||||
|
wrap: true,
|
||||||
|
preserveIndent: true,
|
||||||
|
hangingIndent: 2,
|
||||||
},
|
},
|
||||||
frames: {
|
frames: {
|
||||||
extractFileNameFromCode: true,
|
extractFileNameFromCode: true,
|
||||||
|
50
package-lock.json
generated
50
package-lock.json
generated
@ -24,7 +24,6 @@
|
|||||||
"astro": "^5.7.4",
|
"astro": "^5.7.4",
|
||||||
"astro-expressive-code": "^0.41.2",
|
"astro-expressive-code": "^0.41.2",
|
||||||
"astro-pagefind": "^1.8.3",
|
"astro-pagefind": "^1.8.3",
|
||||||
"astro-theme-toggle": "^0.6.0",
|
|
||||||
"cheerio": "^1.0.0",
|
"cheerio": "^1.0.0",
|
||||||
"node-fetch": "^3.3.2",
|
"node-fetch": "^3.3.2",
|
||||||
"octokit": "^3.2.1",
|
"octokit": "^3.2.1",
|
||||||
@ -5097,15 +5096,6 @@
|
|||||||
"astro": "^2.0.4 || ^3 || ^4 || ^5"
|
"astro": "^2.0.4 || ^3 || ^4 || ^5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/astro-theme-toggle": {
|
|
||||||
"version": "0.6.0",
|
|
||||||
"resolved": "https://registry.npmmirror.com/astro-theme-toggle/-/astro-theme-toggle-0.6.0.tgz",
|
|
||||||
"integrity": "sha512-Pe2DTeckxJaspMXNWbHzhn3fQq6K4JTEZ/Gutehgty6qzfLWehsGPFtsKOhsS0r2EOK18MaUnONliE5+sDBLYw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/ocavue"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/async": {
|
"node_modules/async": {
|
||||||
"version": "3.2.6",
|
"version": "3.2.6",
|
||||||
"resolved": "https://registry.npmmirror.com/async/-/async-3.2.6.tgz",
|
"resolved": "https://registry.npmmirror.com/async/-/async-3.2.6.tgz",
|
||||||
@ -6040,6 +6030,15 @@
|
|||||||
"node": ">=10"
|
"node": ">=10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/cosmiconfig/node_modules/yaml": {
|
||||||
|
"version": "1.10.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
|
||||||
|
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
|
||||||
|
"license": "ISC",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/cross-fetch": {
|
"node_modules/cross-fetch": {
|
||||||
"version": "3.2.0",
|
"version": "3.2.0",
|
||||||
"resolved": "https://registry.npmmirror.com/cross-fetch/-/cross-fetch-3.2.0.tgz",
|
"resolved": "https://registry.npmmirror.com/cross-fetch/-/cross-fetch-3.2.0.tgz",
|
||||||
@ -6249,6 +6248,15 @@
|
|||||||
"postcss": "^8.2.15"
|
"postcss": "^8.2.15"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/cssnano/node_modules/yaml": {
|
||||||
|
"version": "1.10.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
|
||||||
|
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
|
||||||
|
"license": "ISC",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/csso": {
|
"node_modules/csso": {
|
||||||
"version": "4.2.0",
|
"version": "4.2.0",
|
||||||
"resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
|
"resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
|
||||||
@ -11904,6 +11912,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/postcss-load-config/node_modules/yaml": {
|
||||||
|
"version": "1.10.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
|
||||||
|
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
|
||||||
|
"license": "ISC",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/postcss-merge-longhand": {
|
"node_modules/postcss-merge-longhand": {
|
||||||
"version": "5.1.7",
|
"version": "5.1.7",
|
||||||
"resolved": "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
|
"resolved": "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
|
||||||
@ -15575,12 +15592,17 @@
|
|||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/yaml": {
|
"node_modules/yaml": {
|
||||||
"version": "1.10.2",
|
"version": "2.7.1",
|
||||||
"resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
|
"resolved": "https://registry.npmmirror.com/yaml/-/yaml-2.7.1.tgz",
|
||||||
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
|
"integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
|
"optional": true,
|
||||||
|
"peer": true,
|
||||||
|
"bin": {
|
||||||
|
"yaml": "bin.mjs"
|
||||||
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 6"
|
"node": ">= 14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/yargs": {
|
"node_modules/yargs": {
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
"astro": "^5.7.4",
|
"astro": "^5.7.4",
|
||||||
"astro-expressive-code": "^0.41.2",
|
"astro-expressive-code": "^0.41.2",
|
||||||
"astro-pagefind": "^1.8.3",
|
"astro-pagefind": "^1.8.3",
|
||||||
"astro-theme-toggle": "^0.6.0",
|
|
||||||
"cheerio": "^1.0.0",
|
"cheerio": "^1.0.0",
|
||||||
"node-fetch": "^3.3.2",
|
"node-fetch": "^3.3.2",
|
||||||
"octokit": "^3.2.1",
|
"octokit": "^3.2.1",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
import { SITE_NAME, NAV_LINKS } from "@/consts.ts";
|
import { SITE_NAME, NAV_LINKS } from "@/consts.ts";
|
||||||
import { Toggle } from "astro-theme-toggle";
|
|
||||||
import Search from "astro-pagefind/components/Search";
|
import Search from "astro-pagefind/components/Search";
|
||||||
|
import ThemeToggle from "@/components/ThemeToggle.astro";
|
||||||
|
|
||||||
// 获取当前路径
|
// 获取当前路径
|
||||||
const currentPath = Astro.url.pathname;
|
const currentPath = Astro.url.pathname;
|
||||||
@ -76,39 +76,9 @@ const normalizedPath =
|
|||||||
</a>
|
</a>
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
<div
|
<!-- 使用自定义主题切换组件 -->
|
||||||
class="inline-flex items-center justify-center cursor-pointer rounded-md hover:bg-gray-100 dark:hover:bg-gray-700/50 group relative mt-1.5 w-8 h-8"
|
<div class="mt-1.5">
|
||||||
>
|
<ThemeToggle className="group" />
|
||||||
<Toggle class="flex items-center justify-center h-full w-full">
|
|
||||||
<Fragment
|
|
||||||
slot="icon-light"
|
|
||||||
class="flex items-center justify-center h-full w-full"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
class="w-4 h-4 text-gray-900 dark:text-white group-hover:text-primary-600 dark:group-hover:text-primary-400 fill-current flex-shrink-0 m-auto absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</Fragment>
|
|
||||||
<Fragment
|
|
||||||
slot="icon-dark"
|
|
||||||
class="flex items-center justify-center h-full w-full"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
class="w-4 h-4 text-gray-900 dark:text-white group-hover:text-primary-600 dark:group-hover:text-primary-400 fill-current flex-shrink-0 m-auto absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</Fragment>
|
|
||||||
</Toggle>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -245,36 +215,11 @@ const normalizedPath =
|
|||||||
<div
|
<div
|
||||||
class="group relative w-7 h-7 mt-1 flex items-center justify-center"
|
class="group relative w-7 h-7 mt-1 flex items-center justify-center"
|
||||||
>
|
>
|
||||||
<Toggle class="flex items-center justify-center h-full w-full">
|
<ThemeToggle
|
||||||
<Fragment
|
width={14}
|
||||||
slot="icon-light"
|
height={14}
|
||||||
class="flex items-center justify-center h-full w-full"
|
className="group"
|
||||||
>
|
/>
|
||||||
<svg
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
class="w-3.5 h-3.5 text-gray-900 dark:text-white group-hover:text-primary-600 dark:group-hover:text-primary-400 fill-current flex-shrink-0 m-auto absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</Fragment>
|
|
||||||
<Fragment
|
|
||||||
slot="icon-dark"
|
|
||||||
class="flex items-center justify-center h-full w-full"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
class="w-3.5 h-3.5 text-gray-900 dark:text-white group-hover:text-primary-600 dark:group-hover:text-primary-400 fill-current flex-shrink-0 m-auto absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</Fragment>
|
|
||||||
</Toggle>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -439,14 +384,20 @@ const normalizedPath =
|
|||||||
// 清空桌面搜索框的函数
|
// 清空桌面搜索框的函数
|
||||||
function clearDesktopSearch(): void {
|
function clearDesktopSearch(): void {
|
||||||
// 获取关键元素
|
// 获取关键元素
|
||||||
const searchInput = document.querySelector('.pagefind-ui__search-input');
|
const searchInput = document.querySelector(
|
||||||
const clearButton = document.querySelector('.pagefind-ui__search-clear');
|
".pagefind-ui__search-input",
|
||||||
const resultsContainer = document.querySelector('.pagefind-ui__results');
|
);
|
||||||
|
const clearButton = document.querySelector(
|
||||||
|
".pagefind-ui__search-clear",
|
||||||
|
);
|
||||||
|
const resultsContainer = document.querySelector(
|
||||||
|
".pagefind-ui__results",
|
||||||
|
);
|
||||||
|
|
||||||
// 隐藏搜索结果面板
|
// 隐藏搜索结果面板
|
||||||
if (resultsContainer) {
|
if (resultsContainer) {
|
||||||
// 直接隐藏结果容器
|
// 直接隐藏结果容器
|
||||||
resultsContainer.setAttribute('style', 'display: none !important');
|
resultsContainer.setAttribute("style", "display: none !important");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果有清除按钮,点击它清空输入框
|
// 如果有清除按钮,点击它清空输入框
|
||||||
@ -454,8 +405,8 @@ const normalizedPath =
|
|||||||
(clearButton as HTMLElement).click();
|
(clearButton as HTMLElement).click();
|
||||||
} else if (searchInput) {
|
} else if (searchInput) {
|
||||||
// 备选方案,设置输入框为空
|
// 备选方案,设置输入框为空
|
||||||
(searchInput as HTMLInputElement).value = '';
|
(searchInput as HTMLInputElement).value = "";
|
||||||
searchInput.dispatchEvent(new Event('input', { bubbles: true }));
|
searchInput.dispatchEvent(new Event("input", { bubbles: true }));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -653,40 +604,13 @@ const normalizedPath =
|
|||||||
// 初始化搜索功能
|
// 初始化搜索功能
|
||||||
initSearch();
|
initSearch();
|
||||||
|
|
||||||
// 处理移动端主题切换容器
|
|
||||||
const themeToggleContainer = document.getElementById(
|
|
||||||
"theme-toggle-container",
|
|
||||||
);
|
|
||||||
if (themeToggleContainer) {
|
|
||||||
(themeToggleContainer as HTMLElement).style.pointerEvents = "auto";
|
|
||||||
addListener(
|
|
||||||
themeToggleContainer,
|
|
||||||
"click",
|
|
||||||
(e: Event) => {
|
|
||||||
const target = e.target as HTMLElement;
|
|
||||||
if (
|
|
||||||
target.tagName !== "ASTRO-THEME-TOGGLE" &&
|
|
||||||
!target.closest("astro-theme-toggle")
|
|
||||||
) {
|
|
||||||
e.stopPropagation();
|
|
||||||
const toggleButton =
|
|
||||||
themeToggleContainer.querySelector("astro-theme-toggle");
|
|
||||||
if (toggleButton) {
|
|
||||||
(toggleButton as HTMLElement).click();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ capture: true },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 路由变化时处理
|
// 路由变化时处理
|
||||||
const routeEvents = [
|
const routeEvents = [
|
||||||
"astro:page-load", // Astro路由导航完成
|
"astro:page-load", // Astro路由导航完成
|
||||||
"astro:after-swap" // Astro视图变化后
|
"astro:after-swap", // Astro视图变化后
|
||||||
];
|
];
|
||||||
|
|
||||||
routeEvents.forEach(eventName => {
|
routeEvents.forEach((eventName) => {
|
||||||
addListener(document, eventName, () => {
|
addListener(document, eventName, () => {
|
||||||
// 页面加载后清空搜索框和隐藏结果面板
|
// 页面加载后清空搜索框和隐藏结果面板
|
||||||
clearDesktopSearch();
|
clearDesktopSearch();
|
||||||
@ -702,9 +626,12 @@ const normalizedPath =
|
|||||||
|
|
||||||
// 添加自定义监听处理history API
|
// 添加自定义监听处理history API
|
||||||
const originalPushState = history.pushState;
|
const originalPushState = history.pushState;
|
||||||
history.pushState = function(...args) {
|
history.pushState = function (...args) {
|
||||||
// 调用原始方法
|
// 调用原始方法
|
||||||
const result = originalPushState.apply(this, args as [any, string, string | URL | null]);
|
const result = originalPushState.apply(
|
||||||
|
this,
|
||||||
|
args as [any, string, string | URL | null],
|
||||||
|
);
|
||||||
|
|
||||||
// 触发自定义事件
|
// 触发自定义事件
|
||||||
const event = new Event("pushstate");
|
const event = new Event("pushstate");
|
||||||
|
@ -2,9 +2,14 @@
|
|||||||
import "@/styles/global.css";
|
import "@/styles/global.css";
|
||||||
import Header from "@/components/Header.astro";
|
import Header from "@/components/Header.astro";
|
||||||
import Footer from "@/components/Footer.astro";
|
import Footer from "@/components/Footer.astro";
|
||||||
import { ICP, PSB_ICP, PSB_ICP_URL, SITE_NAME, SITE_DESCRIPTION } from "@/consts";
|
import {
|
||||||
import { ThemeScript } from 'astro-theme-toggle';
|
ICP,
|
||||||
import { AstroSeo } from '@astrolib/seo';
|
PSB_ICP,
|
||||||
|
PSB_ICP_URL,
|
||||||
|
SITE_NAME,
|
||||||
|
SITE_DESCRIPTION,
|
||||||
|
} from "@/consts";
|
||||||
|
import { AstroSeo } from "@astrolib/seo";
|
||||||
|
|
||||||
// 定义Props接口
|
// 定义Props接口
|
||||||
interface Props {
|
interface Props {
|
||||||
@ -18,16 +23,38 @@ interface Props {
|
|||||||
const canonicalURL = new URL(Astro.url.pathname, Astro.site);
|
const canonicalURL = new URL(Astro.url.pathname, Astro.site);
|
||||||
|
|
||||||
// 从props中获取页面特定信息
|
// 从props中获取页面特定信息
|
||||||
const { title = SITE_NAME, description = SITE_DESCRIPTION, date, tags } = Astro.props;
|
const {
|
||||||
|
title = SITE_NAME,
|
||||||
|
description = SITE_DESCRIPTION,
|
||||||
|
date,
|
||||||
|
tags,
|
||||||
|
} = Astro.props;
|
||||||
---
|
---
|
||||||
|
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="zh-CN" class="m-0 w-full h-full">
|
<html
|
||||||
|
lang="zh-CN"
|
||||||
|
class="m-0 w-full h-full"
|
||||||
|
>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width" />
|
<meta
|
||||||
<meta name="referrer" content="no-referrer" />
|
name="viewport"
|
||||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
content="width=device-width"
|
||||||
<meta name="generator" content={Astro.generator} />
|
/>
|
||||||
|
<meta
|
||||||
|
name="referrer"
|
||||||
|
content="no-referrer"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
rel="icon"
|
||||||
|
type="image/svg+xml"
|
||||||
|
href="/favicon.svg"
|
||||||
|
/>
|
||||||
|
<meta
|
||||||
|
name="generator"
|
||||||
|
content={Astro.generator}
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- 使用 AstroSeo 组件替换原有的 SEO 标签 -->
|
<!-- 使用 AstroSeo 组件替换原有的 SEO 标签 -->
|
||||||
<AstroSeo
|
<AstroSeo
|
||||||
@ -35,59 +62,117 @@ const { title = SITE_NAME, description = SITE_DESCRIPTION, date, tags } = Astro.
|
|||||||
description={description || `${SITE_NAME} - 个人博客`}
|
description={description || `${SITE_NAME} - 个人博客`}
|
||||||
canonical={canonicalURL.toString()}
|
canonical={canonicalURL.toString()}
|
||||||
openGraph={{
|
openGraph={{
|
||||||
type: 'article',
|
type: "article",
|
||||||
url: canonicalURL.toString(),
|
url: canonicalURL.toString(),
|
||||||
title: title,
|
title: title,
|
||||||
description: description || `${SITE_NAME} - 个人博客`,
|
description: description || `${SITE_NAME} - 个人博客`,
|
||||||
site_name: SITE_NAME,
|
site_name: SITE_NAME,
|
||||||
...(date && { article: {
|
...(date && {
|
||||||
|
article: {
|
||||||
publishedTime: date.toISOString(),
|
publishedTime: date.toISOString(),
|
||||||
tags: tags || []
|
tags: tags || [],
|
||||||
}}),
|
},
|
||||||
|
}),
|
||||||
}}
|
}}
|
||||||
twitter={{
|
twitter={{
|
||||||
cardType: 'summary_large_image',
|
cardType: "summary_large_image",
|
||||||
site: SITE_NAME,
|
site: SITE_NAME,
|
||||||
handle: SITE_NAME,
|
handle: SITE_NAME,
|
||||||
}}
|
}}
|
||||||
additionalMetaTags={[
|
additionalMetaTags={[
|
||||||
{
|
{
|
||||||
property: 'article:published_time',
|
property: "article:published_time",
|
||||||
content: date ? date.toISOString() : '',
|
content: date ? date.toISOString() : "",
|
||||||
},
|
},
|
||||||
...(tags?.map(tag => ({
|
...(tags?.map((tag) => ({
|
||||||
property: 'article:tag',
|
property: "article:tag",
|
||||||
content: tag,
|
content: tag,
|
||||||
})) || []),
|
})) || []),
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- 主题切换脚本 -->
|
<!-- 主题切换脚本 -->
|
||||||
<ThemeScript />
|
<script is:inline>
|
||||||
|
// 立即执行主题初始化,采用"无闪烁"加载方式
|
||||||
|
(function () {
|
||||||
|
try {
|
||||||
|
// 获取系统首选主题
|
||||||
|
const getSystemTheme = () => {
|
||||||
|
return window.matchMedia("(prefers-color-scheme: dark)").matches
|
||||||
|
? "dark"
|
||||||
|
: "light";
|
||||||
|
};
|
||||||
|
|
||||||
|
const storedTheme =
|
||||||
|
typeof localStorage !== "undefined"
|
||||||
|
? localStorage.getItem("theme")
|
||||||
|
: null;
|
||||||
|
const systemTheme = getSystemTheme();
|
||||||
|
let theme = "light"; // 默认浅色主题
|
||||||
|
|
||||||
|
// 按照逻辑优先级应用主题
|
||||||
|
if (storedTheme) {
|
||||||
|
// 如果有存储的主题设置,则应用它
|
||||||
|
theme = storedTheme;
|
||||||
|
} else if (systemTheme) {
|
||||||
|
// 如果没有存储的设置,检查系统主题
|
||||||
|
theme = systemTheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 立即设置文档主题,在DOM渲染前应用,避免闪烁
|
||||||
|
document.documentElement.dataset.theme = theme;
|
||||||
|
|
||||||
|
// 监听系统主题变化(只有当主题设为跟随系统时才响应)
|
||||||
|
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
||||||
|
|
||||||
|
const handleMediaChange = (e) => {
|
||||||
|
// 只有当主题设置为跟随系统时才更新主题
|
||||||
|
if (!localStorage.getItem("theme")) {
|
||||||
|
const newTheme = e.matches ? "dark" : "light";
|
||||||
|
document.documentElement.dataset.theme = newTheme;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 添加系统主题变化监听
|
||||||
|
mediaQuery.addEventListener("change", handleMediaChange);
|
||||||
|
} catch (error) {
|
||||||
|
// 出错时应用默认浅色主题,确保页面正常显示
|
||||||
|
document.documentElement.dataset.theme = "light";
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body class="m-0 w-full h-full bg-gray-50 dark:bg-dark-bg flex flex-col min-h-screen">
|
<body
|
||||||
|
class="m-0 w-full h-full bg-gray-50 dark:bg-dark-bg flex flex-col min-h-screen"
|
||||||
|
>
|
||||||
<Header />
|
<Header />
|
||||||
<main class="pt-16 flex-grow">
|
<main class="pt-16 flex-grow">
|
||||||
<slot />
|
<slot />
|
||||||
</main>
|
</main>
|
||||||
<Footer icp={ICP} psbIcp={PSB_ICP} psbIcpUrl={PSB_ICP_URL} />
|
<Footer
|
||||||
|
icp={ICP}
|
||||||
|
psbIcp={PSB_ICP}
|
||||||
|
psbIcpUrl={PSB_ICP_URL}
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- 预获取脚本 -->
|
<!-- 预获取脚本 -->
|
||||||
<script>
|
<script>
|
||||||
// 在DOM加载完成后执行
|
// 在DOM加载完成后执行
|
||||||
document.addEventListener('astro:page-load', () => {
|
document.addEventListener("astro:page-load", () => {
|
||||||
// 获取所有视口预获取链接
|
// 获取所有视口预获取链接
|
||||||
const viewportLinks = document.querySelectorAll('[data-astro-prefetch="viewport"]');
|
const viewportLinks = document.querySelectorAll(
|
||||||
|
'[data-astro-prefetch="viewport"]',
|
||||||
|
);
|
||||||
|
|
||||||
if (viewportLinks.length > 0) {
|
if (viewportLinks.length > 0) {
|
||||||
// 创建一个交叉观察器
|
// 创建一个交叉观察器
|
||||||
const observer = new IntersectionObserver((entries) => {
|
const observer = new IntersectionObserver((entries) => {
|
||||||
entries.forEach(entry => {
|
entries.forEach((entry) => {
|
||||||
if (entry.isIntersecting) {
|
if (entry.isIntersecting) {
|
||||||
const link = entry.target;
|
const link = entry.target;
|
||||||
// 进入视口时,添加data-astro-prefetch="true"属性触发预获取
|
// 进入视口时,添加data-astro-prefetch="true"属性触发预获取
|
||||||
if (link.getAttribute('data-astro-prefetch') === 'viewport') {
|
if (link.getAttribute("data-astro-prefetch") === "viewport") {
|
||||||
link.setAttribute('data-astro-prefetch', 'true');
|
link.setAttribute("data-astro-prefetch", "true");
|
||||||
}
|
}
|
||||||
// 一旦预获取,就不再观察这个链接
|
// 一旦预获取,就不再观察这个链接
|
||||||
observer.unobserve(link);
|
observer.unobserve(link);
|
||||||
@ -96,7 +181,7 @@ const { title = SITE_NAME, description = SITE_DESCRIPTION, date, tags } = Astro.
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 观察所有视口预获取链接
|
// 观察所有视口预获取链接
|
||||||
viewportLinks.forEach(link => {
|
viewportLinks.forEach((link) => {
|
||||||
observer.observe(link);
|
observer.observe(link);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
949
src/components/ThemeToggle.astro
Normal file
949
src/components/ThemeToggle.astro
Normal file
@ -0,0 +1,949 @@
|
|||||||
|
---
|
||||||
|
interface Props {
|
||||||
|
height?: number;
|
||||||
|
width?: number;
|
||||||
|
fill?: string;
|
||||||
|
className?: string;
|
||||||
|
// 更新主题过渡动画模式配置
|
||||||
|
transitionMode?: "expand" | "shrink" | "auto" | "reverse-auto";
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
height = 16,
|
||||||
|
width = 16,
|
||||||
|
fill = "currentColor",
|
||||||
|
className = "",
|
||||||
|
transitionMode = "auto", // 默认为自动模式
|
||||||
|
} = Astro.props;
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<button
|
||||||
|
id="theme-toggle-button"
|
||||||
|
class={`inline-flex items-center justify-center h-8 w-8 cursor-pointer rounded-md hover:bg-gray-100 dark:hover:bg-gray-700/50 text-secondary-600 dark:text-secondary-400 hover:text-primary-600 dark:hover:text-primary-400 ${className} overflow-hidden relative`}
|
||||||
|
aria-label="切换主题"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
data-transition-mode={transitionMode}
|
||||||
|
>
|
||||||
|
<!-- 月亮图标 (暗色模式) -->
|
||||||
|
<svg
|
||||||
|
id="dark-icon"
|
||||||
|
style={`height: ${height}px; width: ${width}px;`}
|
||||||
|
fill={fill}
|
||||||
|
viewBox="0 0 16 16"
|
||||||
|
class="hover:scale-110 hidden dark:block relative z-10"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<!-- 太阳图标 (亮色模式) -->
|
||||||
|
<svg
|
||||||
|
id="light-icon"
|
||||||
|
style={`height: ${height}px; width: ${width}px;`}
|
||||||
|
fill={fill}
|
||||||
|
viewBox="0 0 16 16"
|
||||||
|
class="hover:scale-110 block dark:hidden relative z-10"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"
|
||||||
|
></path>
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<!-- 波纹效果容器 -->
|
||||||
|
<span id="ripple-container" class="absolute inset-0 pointer-events-none z-0"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<style is:global>
|
||||||
|
/* 波纹效果相关样式 */
|
||||||
|
@keyframes ripple-effect {
|
||||||
|
from {
|
||||||
|
transform: scale(0);
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
transform: scale(10);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.theme-ripple {
|
||||||
|
position: absolute;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: rgba(var(--theme-ripple-color, 100, 100, 100), 0.15);
|
||||||
|
width: 10px;
|
||||||
|
height: 10px;
|
||||||
|
pointer-events: none;
|
||||||
|
transform-origin: center;
|
||||||
|
animation: ripple-effect 800ms ease-out forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 暗色模式下使用不同颜色变量 */
|
||||||
|
.dark .theme-ripple {
|
||||||
|
background-color: rgba(var(--theme-ripple-color, 200, 200, 200), 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* View Transitions 样式控制 */
|
||||||
|
::view-transition-old(root),
|
||||||
|
::view-transition-new(root) {
|
||||||
|
animation: none !important;
|
||||||
|
mix-blend-mode: normal !important;
|
||||||
|
isolation: auto !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 新增特殊模式样式 */
|
||||||
|
html.theme-transition-active {
|
||||||
|
transition: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::view-transition-old(root) {
|
||||||
|
z-index: 999 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::view-transition-new(root) {
|
||||||
|
z-index: 1000 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 设置主题容器在移动设备上的样式 */
|
||||||
|
#theme-toggle-container {
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<script is:inline>
|
||||||
|
// 主题切换逻辑
|
||||||
|
(function () {
|
||||||
|
// 页面导航计数器(跟踪页面跳转次数)
|
||||||
|
let pageNavigationCount = 0;
|
||||||
|
|
||||||
|
// 存储事件监听器,便于统一清理
|
||||||
|
const listeners = [];
|
||||||
|
|
||||||
|
// 定时器
|
||||||
|
let transitionTimeout = null;
|
||||||
|
|
||||||
|
// 波纹动画定时器
|
||||||
|
let rippleTimeout = null;
|
||||||
|
|
||||||
|
// 主题过渡模式 - 从localStorage读取,如果没有则使用默认值
|
||||||
|
const TRANSITION_MODES = {
|
||||||
|
EXPAND: 'expand', // 扩散模式
|
||||||
|
SHRINK: 'shrink', // 收缩模式
|
||||||
|
AUTO: 'auto', // 自动模式(根据切换方向选择)
|
||||||
|
REVERSE_AUTO: 'reverse-auto' // 反向自动模式
|
||||||
|
};
|
||||||
|
|
||||||
|
// 从本地存储获取主题过渡模式,如果没有则使用默认值
|
||||||
|
function getThemeTransitionMode() {
|
||||||
|
const savedMode = localStorage.getItem('theme-transition-mode');
|
||||||
|
return Object.values(TRANSITION_MODES).includes(savedMode)
|
||||||
|
? savedMode
|
||||||
|
: TRANSITION_MODES.AUTO;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 保存主题过渡模式到本地存储
|
||||||
|
function saveThemeTransitionMode(mode) {
|
||||||
|
if (Object.values(TRANSITION_MODES).includes(mode)) {
|
||||||
|
localStorage.setItem('theme-transition-mode', mode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 直接从按钮移除事件监听器
|
||||||
|
function cleanupButtonListeners() {
|
||||||
|
// 查找所有主题切换按钮
|
||||||
|
const buttons = document.querySelectorAll("#theme-toggle-button");
|
||||||
|
|
||||||
|
buttons.forEach((button) => {
|
||||||
|
// 移除所有可能的事件
|
||||||
|
if (button._clickHandler) {
|
||||||
|
button.removeEventListener("click", button._clickHandler, {
|
||||||
|
capture: true,
|
||||||
|
});
|
||||||
|
delete button._clickHandler;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (button._keydownHandler) {
|
||||||
|
button.removeEventListener("keydown", button._keydownHandler);
|
||||||
|
delete button._keydownHandler;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清除其他可能的事件
|
||||||
|
const otherClickHandlers = button.__themeToggleClickHandlers || [];
|
||||||
|
otherClickHandlers.forEach((handler) => {
|
||||||
|
try {
|
||||||
|
button.removeEventListener("click", handler, { capture: true });
|
||||||
|
} catch (e) {
|
||||||
|
// 忽略错误
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const otherKeydownHandlers = button.__themeToggleKeydownHandlers || [];
|
||||||
|
otherKeydownHandlers.forEach((handler) => {
|
||||||
|
try {
|
||||||
|
button.removeEventListener("keydown", handler);
|
||||||
|
} catch (e) {
|
||||||
|
// 忽略错误
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 重置处理函数数组
|
||||||
|
button.__themeToggleClickHandlers = [];
|
||||||
|
button.__themeToggleKeydownHandlers = [];
|
||||||
|
});
|
||||||
|
|
||||||
|
// 清理容器
|
||||||
|
const container = document.getElementById("theme-toggle-container");
|
||||||
|
if (container) {
|
||||||
|
if (container._clickHandler) {
|
||||||
|
container.removeEventListener("click", container._clickHandler);
|
||||||
|
delete container._clickHandler;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清除其他可能的事件
|
||||||
|
const otherClickHandlers = container.__themeToggleClickHandlers || [];
|
||||||
|
otherClickHandlers.forEach((handler) => {
|
||||||
|
try {
|
||||||
|
container.removeEventListener("click", handler);
|
||||||
|
} catch (e) {
|
||||||
|
// 忽略错误
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 重置处理函数数组
|
||||||
|
container.__themeToggleClickHandlers = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 添加事件监听器并记录,方便后续统一清理
|
||||||
|
function addListener(element, eventType, handler, options) {
|
||||||
|
if (!element) return null;
|
||||||
|
|
||||||
|
// 确保先移除可能已存在的同类型事件处理函数
|
||||||
|
if (eventType === "click" && element.id === "theme-toggle-button") {
|
||||||
|
if (element._clickHandler) {
|
||||||
|
element.removeEventListener("click", element._clickHandler, {
|
||||||
|
capture: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
element._clickHandler = handler;
|
||||||
|
|
||||||
|
// 保存到数组中以便清理
|
||||||
|
if (!element.__themeToggleClickHandlers) {
|
||||||
|
element.__themeToggleClickHandlers = [];
|
||||||
|
}
|
||||||
|
element.__themeToggleClickHandlers.push(handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (eventType === "keydown" && element.id === "theme-toggle-button") {
|
||||||
|
if (element._keydownHandler) {
|
||||||
|
element.removeEventListener("keydown", element._keydownHandler);
|
||||||
|
}
|
||||||
|
element._keydownHandler = handler;
|
||||||
|
|
||||||
|
// 保存到数组中以便清理
|
||||||
|
if (!element.__themeToggleKeydownHandlers) {
|
||||||
|
element.__themeToggleKeydownHandlers = [];
|
||||||
|
}
|
||||||
|
element.__themeToggleKeydownHandlers.push(handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (eventType === "click" && element.id === "theme-toggle-container") {
|
||||||
|
if (element._clickHandler) {
|
||||||
|
element.removeEventListener("click", element._clickHandler);
|
||||||
|
}
|
||||||
|
element._clickHandler = handler;
|
||||||
|
|
||||||
|
// 保存到数组中以便清理
|
||||||
|
if (!element.__themeToggleClickHandlers) {
|
||||||
|
element.__themeToggleClickHandlers = [];
|
||||||
|
}
|
||||||
|
element.__themeToggleClickHandlers.push(handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
element.addEventListener(eventType, handler, options);
|
||||||
|
listeners.push({ element, eventType, handler, options });
|
||||||
|
return handler;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清理函数 - 移除所有事件监听器
|
||||||
|
function cleanup() {
|
||||||
|
// 先直接从按钮清理事件
|
||||||
|
cleanupButtonListeners();
|
||||||
|
|
||||||
|
// 移除所有监听器
|
||||||
|
listeners.forEach(({ element, eventType, handler, options }) => {
|
||||||
|
try {
|
||||||
|
element.removeEventListener(eventType, handler, options);
|
||||||
|
} catch (err) {
|
||||||
|
// 忽略错误
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 清空数组
|
||||||
|
listeners.length = 0;
|
||||||
|
|
||||||
|
// 清理任何定时器
|
||||||
|
if (transitionTimeout) {
|
||||||
|
clearTimeout(transitionTimeout);
|
||||||
|
transitionTimeout = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rippleTimeout) {
|
||||||
|
clearTimeout(rippleTimeout);
|
||||||
|
rippleTimeout = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建波纹动画元素
|
||||||
|
function createRippleEffect(x, y, element) {
|
||||||
|
// 清理旧的波纹元素
|
||||||
|
const container = element.querySelector("#ripple-container") || element;
|
||||||
|
const oldRipples = container.querySelectorAll(".theme-ripple");
|
||||||
|
oldRipples.forEach(ripple => ripple.remove());
|
||||||
|
|
||||||
|
// 创建新的波纹元素
|
||||||
|
const ripple = document.createElement("span");
|
||||||
|
ripple.classList.add("theme-ripple");
|
||||||
|
|
||||||
|
// 设置波纹位置
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
const relativeX = x - rect.left;
|
||||||
|
const relativeY = y - rect.top;
|
||||||
|
|
||||||
|
ripple.style.left = `${relativeX}px`;
|
||||||
|
ripple.style.top = `${relativeY}px`;
|
||||||
|
|
||||||
|
// 添加波纹到容器
|
||||||
|
container.appendChild(ripple);
|
||||||
|
|
||||||
|
// 自动清理波纹元素
|
||||||
|
rippleTimeout = setTimeout(() => {
|
||||||
|
ripple.remove();
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
return ripple;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 确定应该使用的动画类型
|
||||||
|
function determineAnimationType(transitionMode, fromTheme, toTheme) {
|
||||||
|
// 如果是固定模式,直接返回
|
||||||
|
if (transitionMode === TRANSITION_MODES.EXPAND ||
|
||||||
|
transitionMode === TRANSITION_MODES.SHRINK) {
|
||||||
|
return transitionMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果是自动模式,根据切换方向决定
|
||||||
|
if (transitionMode === TRANSITION_MODES.AUTO) {
|
||||||
|
// 默认自动模式:亮色->暗色用扩散,暗色->亮色用收缩
|
||||||
|
return (fromTheme === 'light' && toTheme === 'dark')
|
||||||
|
? TRANSITION_MODES.EXPAND
|
||||||
|
: TRANSITION_MODES.SHRINK;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果是反向自动模式,反向选择
|
||||||
|
if (transitionMode === TRANSITION_MODES.REVERSE_AUTO) {
|
||||||
|
// 反向自动模式:亮色->暗色用收缩,暗色->亮色用扩散
|
||||||
|
return (fromTheme === 'light' && toTheme === 'dark')
|
||||||
|
? TRANSITION_MODES.SHRINK
|
||||||
|
: TRANSITION_MODES.EXPAND;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 默认返回扩散模式
|
||||||
|
return TRANSITION_MODES.EXPAND;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用View Transitions API创建全屏过渡效果
|
||||||
|
function createViewTransition(callback, x, y, fromTheme, toTheme, transitionMode) {
|
||||||
|
// 检查浏览器是否支持View Transitions API
|
||||||
|
if (!document.startViewTransition) {
|
||||||
|
// 尝试使用简单的回退动画
|
||||||
|
try {
|
||||||
|
// 创建一个圆形蒙版元素
|
||||||
|
const mask = document.createElement('div');
|
||||||
|
mask.style.position = 'fixed';
|
||||||
|
mask.style.zIndex = '9999';
|
||||||
|
mask.style.top = '0';
|
||||||
|
mask.style.left = '0';
|
||||||
|
mask.style.width = '100vw';
|
||||||
|
mask.style.height = '100vh';
|
||||||
|
mask.style.pointerEvents = 'none';
|
||||||
|
|
||||||
|
// 设置当前主题的背景颜色
|
||||||
|
if (fromTheme === 'dark') {
|
||||||
|
mask.style.backgroundColor = '#1a1a1a'; // 暗色主题背景色
|
||||||
|
} else {
|
||||||
|
mask.style.backgroundColor = '#ffffff'; // 亮色主题背景色
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建圆形过渡裁剪区域
|
||||||
|
const clipType = determineAnimationType(transitionMode, fromTheme, toTheme);
|
||||||
|
|
||||||
|
if (clipType === TRANSITION_MODES.EXPAND) {
|
||||||
|
// 扩散效果 - 从点击位置向外扩散
|
||||||
|
mask.style.clipPath = `circle(0px at ${x}px ${y}px)`;
|
||||||
|
document.body.appendChild(mask);
|
||||||
|
|
||||||
|
// 先执行回调改变主题
|
||||||
|
callback();
|
||||||
|
|
||||||
|
// 然后执行动画
|
||||||
|
setTimeout(() => {
|
||||||
|
mask.style.transition = 'clip-path 0.7s ease-out';
|
||||||
|
mask.style.clipPath = `circle(150vmax at ${x}px ${y}px)`;
|
||||||
|
|
||||||
|
// 动画结束后删除遮罩
|
||||||
|
setTimeout(() => {
|
||||||
|
mask.remove();
|
||||||
|
}, 700);
|
||||||
|
}, 20);
|
||||||
|
} else {
|
||||||
|
// 收缩效果 - 从全屏向点击位置收缩
|
||||||
|
mask.style.clipPath = `circle(150vmax at ${x}px ${y}px)`;
|
||||||
|
document.body.appendChild(mask);
|
||||||
|
|
||||||
|
// 添加过渡样式
|
||||||
|
mask.style.transition = 'clip-path 0.7s ease-in';
|
||||||
|
|
||||||
|
// 强制回流
|
||||||
|
void mask.offsetWidth;
|
||||||
|
|
||||||
|
// 设置目标状态
|
||||||
|
mask.style.clipPath = `circle(0px at ${x}px ${y}px)`;
|
||||||
|
|
||||||
|
// 等待动画结束后切换主题并移除遮罩
|
||||||
|
setTimeout(() => {
|
||||||
|
callback();
|
||||||
|
mask.remove();
|
||||||
|
}, 700);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Promise(resolve => setTimeout(resolve, 800));
|
||||||
|
} catch (e) {
|
||||||
|
// 如果回退方案也失败,直接执行回调
|
||||||
|
callback();
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 计算从点击位置到页面四个角的最大距离
|
||||||
|
const w = window.innerWidth;
|
||||||
|
const h = window.innerHeight;
|
||||||
|
|
||||||
|
// 计算最大半径,确保覆盖整个屏幕
|
||||||
|
const maxDistance = Math.max(
|
||||||
|
Math.hypot(x, y), // 左上角
|
||||||
|
Math.hypot(w - x, y), // 右上角
|
||||||
|
Math.hypot(x, h - y), // 左下角
|
||||||
|
Math.hypot(w - x, h - y) // 右下角
|
||||||
|
);
|
||||||
|
|
||||||
|
// 设置CSS变量用于波纹颜色
|
||||||
|
document.documentElement.style.setProperty(
|
||||||
|
'--theme-ripple-color',
|
||||||
|
toTheme === 'dark' ? '230, 230, 230' : '20, 20, 20'
|
||||||
|
);
|
||||||
|
|
||||||
|
// 添加主题过渡标记类
|
||||||
|
document.documentElement.classList.add('theme-transition-active');
|
||||||
|
|
||||||
|
// 确定动画类型
|
||||||
|
const animationType = determineAnimationType(transitionMode, fromTheme, toTheme);
|
||||||
|
|
||||||
|
// 启动视图过渡
|
||||||
|
const transition = document.startViewTransition(() => {
|
||||||
|
// 执行主题切换回调
|
||||||
|
callback();
|
||||||
|
|
||||||
|
// 确保DOM已更新
|
||||||
|
document.documentElement.classList.toggle('dark', toTheme === 'dark');
|
||||||
|
});
|
||||||
|
|
||||||
|
// 生成动画需要的SVG资源
|
||||||
|
const gradientOffset = 0.75;
|
||||||
|
const maskSvg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><defs><radialGradient id="toggle-theme-gradient"><stop offset="${gradientOffset}"/><stop offset="1" stop-opacity="0"/></radialGradient></defs><circle cx="4" cy="4" r="4" fill="url(#toggle-theme-gradient)"/></svg>`;
|
||||||
|
const maskUrl = `data:image/svg+xml;base64,${btoa(maskSvg)}`;
|
||||||
|
|
||||||
|
// 计算动画需要多大才能覆盖整个屏幕
|
||||||
|
const maxRadius = Math.ceil(maxDistance / gradientOffset);
|
||||||
|
|
||||||
|
// 过渡开始后,应用自定义动画
|
||||||
|
transition.ready.then(() => {
|
||||||
|
// 应用基础样式到document
|
||||||
|
const style = document.createElement('style');
|
||||||
|
style.id = 'theme-transition-temp-style';
|
||||||
|
|
||||||
|
if (animationType === TRANSITION_MODES.EXPAND) {
|
||||||
|
// 扩散效果 - 新主题从点击位置向外扩散
|
||||||
|
style.textContent = `
|
||||||
|
::view-transition-new(root) {
|
||||||
|
animation: none !important;
|
||||||
|
-webkit-mask-image: url('${maskUrl}') !important;
|
||||||
|
mask-image: url('${maskUrl}') !important;
|
||||||
|
-webkit-mask-repeat: no-repeat !important;
|
||||||
|
mask-repeat: no-repeat !important;
|
||||||
|
-webkit-mask-position: ${x}px ${y}px !important;
|
||||||
|
mask-position: ${x}px ${y}px !important;
|
||||||
|
-webkit-mask-size: 0 !important;
|
||||||
|
mask-size: 0 !important;
|
||||||
|
z-index: 1000 !important;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
document.head.appendChild(style);
|
||||||
|
|
||||||
|
// 强制重新计算样式
|
||||||
|
window.getComputedStyle(document.documentElement).getPropertyValue('--force-reflow');
|
||||||
|
|
||||||
|
// 立即设置最终状态
|
||||||
|
setTimeout(() => {
|
||||||
|
style.textContent = `
|
||||||
|
::view-transition-new(root) {
|
||||||
|
animation: none !important;
|
||||||
|
-webkit-mask-image: url('${maskUrl}') !important;
|
||||||
|
mask-image: url('${maskUrl}') !important;
|
||||||
|
-webkit-mask-repeat: no-repeat !important;
|
||||||
|
mask-repeat: no-repeat !important;
|
||||||
|
-webkit-mask-position: ${x - maxRadius}px ${y - maxRadius}px !important;
|
||||||
|
mask-position: ${x - maxRadius}px ${y - maxRadius}px !important;
|
||||||
|
-webkit-mask-size: ${maxRadius * 2}px !important;
|
||||||
|
mask-size: ${maxRadius * 2}px !important;
|
||||||
|
z-index: 1000 !important;
|
||||||
|
transition: -webkit-mask-position 0.7s ease-out, -webkit-mask-size 0.7s ease-out,
|
||||||
|
mask-position 0.7s ease-out, mask-size 0.7s ease-out !important;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
}, 20);
|
||||||
|
|
||||||
|
// 清理临时样式
|
||||||
|
setTimeout(() => {
|
||||||
|
if (document.getElementById('theme-transition-temp-style')) {
|
||||||
|
document.getElementById('theme-transition-temp-style').remove();
|
||||||
|
}
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// 收缩效果 - 旧主题从全屏向点击位置收缩
|
||||||
|
style.textContent = `
|
||||||
|
::view-transition-old(root) {
|
||||||
|
animation: none !important;
|
||||||
|
-webkit-mask-image: url('${maskUrl}') !important;
|
||||||
|
mask-image: url('${maskUrl}') !important;
|
||||||
|
-webkit-mask-repeat: no-repeat !important;
|
||||||
|
mask-repeat: no-repeat !important;
|
||||||
|
-webkit-mask-position: ${x - maxRadius}px ${y - maxRadius}px !important;
|
||||||
|
mask-position: ${x - maxRadius}px ${y - maxRadius}px !important;
|
||||||
|
-webkit-mask-size: ${maxRadius * 2}px !important;
|
||||||
|
mask-size: ${maxRadius * 2}px !important;
|
||||||
|
z-index: 999 !important;
|
||||||
|
}
|
||||||
|
::view-transition-new(root) {
|
||||||
|
z-index: 998 !important;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
document.head.appendChild(style);
|
||||||
|
|
||||||
|
// 强制重新计算样式
|
||||||
|
window.getComputedStyle(document.documentElement).getPropertyValue('--force-reflow');
|
||||||
|
|
||||||
|
// 立即设置最终状态
|
||||||
|
setTimeout(() => {
|
||||||
|
style.textContent = `
|
||||||
|
::view-transition-old(root) {
|
||||||
|
animation: none !important;
|
||||||
|
-webkit-mask-image: url('${maskUrl}') !important;
|
||||||
|
mask-image: url('${maskUrl}') !important;
|
||||||
|
-webkit-mask-repeat: no-repeat !important;
|
||||||
|
mask-repeat: no-repeat !important;
|
||||||
|
-webkit-mask-position: ${x}px ${y}px !important;
|
||||||
|
mask-position: ${x}px ${y}px !important;
|
||||||
|
-webkit-mask-size: 0 !important;
|
||||||
|
mask-size: 0 !important;
|
||||||
|
z-index: 999 !important;
|
||||||
|
transition: -webkit-mask-position 0.7s ease-in, -webkit-mask-size 0.7s ease-in,
|
||||||
|
mask-position 0.7s ease-in, mask-size 0.7s ease-in !important;
|
||||||
|
}
|
||||||
|
::view-transition-new(root) {
|
||||||
|
z-index: 998 !important;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
}, 20);
|
||||||
|
|
||||||
|
// 清理临时样式
|
||||||
|
setTimeout(() => {
|
||||||
|
if (document.getElementById('theme-transition-temp-style')) {
|
||||||
|
document.getElementById('theme-transition-temp-style').remove();
|
||||||
|
}
|
||||||
|
}, 1000);
|
||||||
|
}
|
||||||
|
}).catch(error => {
|
||||||
|
console.error('过渡动画错误', error);
|
||||||
|
});
|
||||||
|
|
||||||
|
// 返回过渡完成的Promise
|
||||||
|
return transition.finished.then(() => {
|
||||||
|
// 移除主题过渡标记类
|
||||||
|
document.documentElement.classList.remove('theme-transition-active');
|
||||||
|
}).catch(error => {
|
||||||
|
console.error('过渡动画错误', error);
|
||||||
|
// 确保标记类被移除
|
||||||
|
document.documentElement.classList.remove('theme-transition-active');
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('主题切换错误', error);
|
||||||
|
// 在出错时也要执行回调
|
||||||
|
callback();
|
||||||
|
// 确保标记类被移除
|
||||||
|
document.documentElement.classList.remove('theme-transition-active');
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化主题切换功能
|
||||||
|
function setupThemeToggle() {
|
||||||
|
// 确保当前没有活动的主题切换按钮事件
|
||||||
|
cleanup();
|
||||||
|
|
||||||
|
// 获取所有主题切换按钮
|
||||||
|
const themeToggleButtons = document.querySelectorAll(
|
||||||
|
"#theme-toggle-button",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!themeToggleButtons.length) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let transitioning = false;
|
||||||
|
|
||||||
|
// 获取系统首选主题
|
||||||
|
const getSystemTheme = () => {
|
||||||
|
return window.matchMedia("(prefers-color-scheme: dark)").matches
|
||||||
|
? "dark"
|
||||||
|
: "light";
|
||||||
|
};
|
||||||
|
|
||||||
|
// 初始化主题
|
||||||
|
const initializeTheme = () => {
|
||||||
|
const storedTheme = localStorage.getItem("theme");
|
||||||
|
const systemTheme = getSystemTheme();
|
||||||
|
|
||||||
|
// 按照逻辑优先级应用主题
|
||||||
|
if (storedTheme) {
|
||||||
|
document.documentElement.dataset.theme = storedTheme;
|
||||||
|
} else if (systemTheme) {
|
||||||
|
document.documentElement.dataset.theme = systemTheme;
|
||||||
|
} else {
|
||||||
|
document.documentElement.dataset.theme = "light";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 确保同步类名
|
||||||
|
document.documentElement.classList.toggle('dark',
|
||||||
|
document.documentElement.dataset.theme === 'dark');
|
||||||
|
};
|
||||||
|
|
||||||
|
// 切换主题
|
||||||
|
const toggleTheme = (e) => {
|
||||||
|
if (transitioning) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
transitioning = true;
|
||||||
|
|
||||||
|
// 记录点击坐标
|
||||||
|
const clickX = e instanceof Event ? e.clientX : window.innerWidth / 2;
|
||||||
|
const clickY = e instanceof Event ? e.clientY : window.innerHeight / 2;
|
||||||
|
|
||||||
|
// 在按钮上创建小波纹效果
|
||||||
|
if (e instanceof Event && e.target) {
|
||||||
|
const button = e.target.closest("#theme-toggle-button");
|
||||||
|
if (button) {
|
||||||
|
createRippleEffect(clickX, clickY, button);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取当前主题
|
||||||
|
const currentTheme = document.documentElement.dataset.theme;
|
||||||
|
const newTheme = currentTheme === "light" ? "dark" : "light";
|
||||||
|
|
||||||
|
// 获取过渡模式
|
||||||
|
const button = e.target?.closest("#theme-toggle-button");
|
||||||
|
// 首先尝试从按钮属性获取过渡模式,如果没有则从本地存储获取
|
||||||
|
const transitionMode = button?.dataset?.transitionMode || getThemeTransitionMode();
|
||||||
|
|
||||||
|
// 使用视图过渡API切换主题
|
||||||
|
createViewTransition(
|
||||||
|
() => {
|
||||||
|
// 更新 HTML 属性
|
||||||
|
document.documentElement.dataset.theme = newTheme;
|
||||||
|
|
||||||
|
// 更新本地存储
|
||||||
|
const systemTheme = getSystemTheme();
|
||||||
|
|
||||||
|
if (newTheme === systemTheme) {
|
||||||
|
localStorage.removeItem("theme");
|
||||||
|
} else {
|
||||||
|
localStorage.setItem("theme", newTheme);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
clickX,
|
||||||
|
clickY,
|
||||||
|
currentTheme,
|
||||||
|
newTheme,
|
||||||
|
transitionMode
|
||||||
|
).then(() => {
|
||||||
|
// 过渡完成后恢复状态
|
||||||
|
setTimeout(() => {
|
||||||
|
transitioning = false;
|
||||||
|
}, 50);
|
||||||
|
}).catch(error => {
|
||||||
|
console.error('过渡动画错误', error);
|
||||||
|
transitioning = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 添加防抖
|
||||||
|
if (transitionTimeout) {
|
||||||
|
clearTimeout(transitionTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
transitionTimeout = setTimeout(() => {
|
||||||
|
transitioning = false;
|
||||||
|
}, 800); // 延长时间以匹配动画持续时间
|
||||||
|
};
|
||||||
|
|
||||||
|
// 监听系统主题变化
|
||||||
|
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
||||||
|
|
||||||
|
const handleMediaChange = (e) => {
|
||||||
|
if (!localStorage.getItem("theme")) {
|
||||||
|
const newTheme = e.matches ? "dark" : "light";
|
||||||
|
document.documentElement.dataset.theme = newTheme;
|
||||||
|
document.documentElement.classList.toggle('dark', e.matches);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 添加系统主题变化监听
|
||||||
|
addListener(mediaQuery, "change", handleMediaChange);
|
||||||
|
|
||||||
|
// 为每个按钮添加事件
|
||||||
|
themeToggleButtons.forEach((button, index) => {
|
||||||
|
// 确保移除旧的事件监听
|
||||||
|
if (button._clickHandler) {
|
||||||
|
button.removeEventListener("click", button._clickHandler, {
|
||||||
|
capture: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (button._keydownHandler) {
|
||||||
|
button.removeEventListener("keydown", button._keydownHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
button.style.pointerEvents = "auto";
|
||||||
|
} catch (e) {
|
||||||
|
// 忽略样式错误
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建点击处理函数
|
||||||
|
const clickHandler = (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
toggleTheme(e);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 点击事件 - 使用捕获模式并保存引用
|
||||||
|
addListener(button, "click", clickHandler, { capture: true });
|
||||||
|
|
||||||
|
// 键盘事件
|
||||||
|
const keydownHandler = (e) => {
|
||||||
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
|
e.preventDefault();
|
||||||
|
// 为键盘事件创建模拟点击事件,使其中心点位于按钮中央
|
||||||
|
const rect = button.getBoundingClientRect();
|
||||||
|
const centerX = rect.left + rect.width / 2;
|
||||||
|
const centerY = rect.top + rect.height / 2;
|
||||||
|
|
||||||
|
// 创建模拟事件对象
|
||||||
|
const simulatedEvent = {
|
||||||
|
clientX: centerX,
|
||||||
|
clientY: centerY,
|
||||||
|
target: button,
|
||||||
|
preventDefault: () => {},
|
||||||
|
stopPropagation: () => {}
|
||||||
|
};
|
||||||
|
|
||||||
|
toggleTheme(simulatedEvent);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
addListener(button, "keydown", keydownHandler);
|
||||||
|
});
|
||||||
|
|
||||||
|
// 处理移动端主题切换容器
|
||||||
|
const themeToggleContainer = document.getElementById(
|
||||||
|
"theme-toggle-container",
|
||||||
|
);
|
||||||
|
if (themeToggleContainer) {
|
||||||
|
// 确保移除旧的事件监听
|
||||||
|
if (themeToggleContainer._clickHandler) {
|
||||||
|
themeToggleContainer.removeEventListener(
|
||||||
|
"click",
|
||||||
|
themeToggleContainer._clickHandler,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const containerClickHandler = (e) => {
|
||||||
|
const target = e.target;
|
||||||
|
if (
|
||||||
|
target.id !== "theme-toggle-button" &&
|
||||||
|
!target.closest("#theme-toggle-button")
|
||||||
|
) {
|
||||||
|
e.stopPropagation();
|
||||||
|
toggleTheme(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
addListener(themeToggleContainer, "click", containerClickHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化主题
|
||||||
|
initializeTheme();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 注册清理函数 - 确保在每次页面转换前清理事件
|
||||||
|
function registerCleanup() {
|
||||||
|
const cleanupEvents = [
|
||||||
|
"astro:before-preparation",
|
||||||
|
"astro:before-swap",
|
||||||
|
"swup:willReplaceContent",
|
||||||
|
];
|
||||||
|
|
||||||
|
// 为每个事件注册一次性清理函数
|
||||||
|
cleanupEvents.forEach((eventName) => {
|
||||||
|
const handler = () => {
|
||||||
|
cleanup();
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener(eventName, handler, { once: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
// 页面卸载时清理
|
||||||
|
window.addEventListener(
|
||||||
|
"beforeunload",
|
||||||
|
() => {
|
||||||
|
cleanup();
|
||||||
|
},
|
||||||
|
{ once: true },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化函数
|
||||||
|
function init() {
|
||||||
|
pageNavigationCount++;
|
||||||
|
setupThemeToggle();
|
||||||
|
registerCleanup();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 监听页面转换事件
|
||||||
|
function setupPageTransitionEvents() {
|
||||||
|
// 确保事件处理程序唯一性的函数
|
||||||
|
function setupUniqueEvent(eventName, callback) {
|
||||||
|
const eventKey = `__theme_toggle_event_${eventName.replace(/:/g, "_")}`;
|
||||||
|
|
||||||
|
// 移除可能存在的旧处理函数
|
||||||
|
if (window[eventKey]) {
|
||||||
|
document.removeEventListener(eventName, window[eventKey]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 保存新处理函数并注册
|
||||||
|
window[eventKey] = callback;
|
||||||
|
document.addEventListener(eventName, window[eventKey]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 页面转换后事件
|
||||||
|
const pageTransitionEvents = [
|
||||||
|
{ name: "astro:after-swap", delay: 10 },
|
||||||
|
{ name: "astro:page-load", delay: 10 },
|
||||||
|
{ name: "swup:contentReplaced", delay: 10 },
|
||||||
|
];
|
||||||
|
|
||||||
|
// 设置每个页面转换事件
|
||||||
|
pageTransitionEvents.forEach(({ name, delay }) => {
|
||||||
|
setupUniqueEvent(name, () => {
|
||||||
|
cleanupButtonListeners(); // 立即清理按钮上的事件
|
||||||
|
|
||||||
|
// 延迟初始化,确保DOM完全更新
|
||||||
|
setTimeout(() => {
|
||||||
|
cleanupButtonListeners(); // 再次清理,确保没有遗漏
|
||||||
|
init();
|
||||||
|
}, delay);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// 特别处理 swup:pageView 事件
|
||||||
|
setupUniqueEvent("swup:pageView", () => {
|
||||||
|
// 对于偶数次页面跳转,特别确保事件被正确重新绑定
|
||||||
|
if (pageNavigationCount % 2 === 0) {
|
||||||
|
setTimeout(() => {
|
||||||
|
const buttons = document.querySelectorAll("#theme-toggle-button");
|
||||||
|
if (buttons.length > 0) {
|
||||||
|
cleanupButtonListeners();
|
||||||
|
setupThemeToggle();
|
||||||
|
}
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置页面转换事件监听
|
||||||
|
setupPageTransitionEvents();
|
||||||
|
|
||||||
|
// 在页面加载后初始化
|
||||||
|
if (document.readyState === "loading") {
|
||||||
|
document.addEventListener(
|
||||||
|
"DOMContentLoaded",
|
||||||
|
() => {
|
||||||
|
init();
|
||||||
|
},
|
||||||
|
{ once: true },
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
setTimeout(() => {
|
||||||
|
init();
|
||||||
|
}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 全局暴露主题切换函数和配置,方便调试和高级用法
|
||||||
|
window.__themeToggle = {
|
||||||
|
modes: TRANSITION_MODES,
|
||||||
|
getMode: getThemeTransitionMode,
|
||||||
|
setMode: saveThemeTransitionMode,
|
||||||
|
// 添加新的帮助方法:切换动画模式
|
||||||
|
toggleMode: function() {
|
||||||
|
const currentMode = getThemeTransitionMode();
|
||||||
|
const modes = Object.values(TRANSITION_MODES);
|
||||||
|
const currentIndex = modes.indexOf(currentMode);
|
||||||
|
const nextIndex = (currentIndex + 1) % modes.length;
|
||||||
|
const nextMode = modes[nextIndex];
|
||||||
|
saveThemeTransitionMode(nextMode);
|
||||||
|
return nextMode;
|
||||||
|
},
|
||||||
|
// 描述当前模式
|
||||||
|
describeModeEffect: function() {
|
||||||
|
const mode = getThemeTransitionMode();
|
||||||
|
const currentTheme = document.documentElement.dataset.theme || 'light';
|
||||||
|
const nextTheme = currentTheme === 'light' ? 'dark' : 'light';
|
||||||
|
|
||||||
|
// 确定将使用的动画类型
|
||||||
|
const animationType = determineAnimationType(mode, currentTheme, nextTheme);
|
||||||
|
|
||||||
|
if (animationType === TRANSITION_MODES.EXPAND) {
|
||||||
|
return `当前模式: ${mode}, ${currentTheme}→${nextTheme} 将使用扩散效果`;
|
||||||
|
} else {
|
||||||
|
return `当前模式: ${mode}, ${currentTheme}→${nextTheme} 将使用收缩效果`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
})();
|
||||||
|
</script>
|
@ -131,6 +131,8 @@ function greet(user: User): string {
|
|||||||
```
|
```
|
||||||
````
|
````
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
|
||||||
```typescript
|
```typescript
|
||||||
interface User {
|
interface User {
|
||||||
id: number;
|
id: number;
|
||||||
@ -199,6 +201,8 @@ function greet(user: User): string {
|
|||||||
---
|
---
|
||||||
```
|
```
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### 1.9 表情符号
|
### 1.9 表情符号
|
||||||
|
@ -7,7 +7,7 @@ export const prerender = true;
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout title={`404 - 页面未找到 | ${SITE_NAME}`}>
|
<Layout title={`404 - 页面未找到`}>
|
||||||
<div class="min-h-[calc(100vh-4rem)] flex items-center justify-center">
|
<div class="min-h-[calc(100vh-4rem)] flex items-center justify-center">
|
||||||
<div class="text-center px-4">
|
<div class="text-center px-4">
|
||||||
<h1 class="text-6xl md:text-8xl font-bold bg-gradient-to-r from-primary-600 to-primary-400 dark:from-primary-400 dark:to-primary-200 text-transparent bg-clip-text mb-6">
|
<h1 class="text-6xl md:text-8xl font-bold bg-gradient-to-r from-primary-600 to-primary-400 dark:from-primary-400 dark:to-primary-200 text-transparent bg-clip-text mb-6">
|
||||||
|
@ -69,7 +69,7 @@ const pageTitle = currentPath ? currentPath : '文章列表';
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout>
|
<Layout title={`${pageTitle}`}>
|
||||||
<div class="bg-gray-50 dark:bg-dark-bg min-h-screen">
|
<div class="bg-gray-50 dark:bg-dark-bg min-h-screen">
|
||||||
<main class="mx-auto px-4 sm:px-6 lg:px-8 py-6 max-w-7xl">
|
<main class="mx-auto px-4 sm:px-6 lg:px-8 py-6 max-w-7xl">
|
||||||
<!-- 页面标题 -->
|
<!-- 页面标题 -->
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
---
|
---
|
||||||
import Layout from '@/components/Layout.astro';
|
import Layout from "@/components/Layout.astro";
|
||||||
import MediaGrid from '@/components/MediaGrid.tsx';
|
import MediaGrid from "@/components/MediaGrid.tsx";
|
||||||
import { SITE_NAME, DOUBAN_ID } from '@/consts';
|
import { DOUBAN_ID } from "@/consts";
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout title={`图书 - ${SITE_NAME}`}>
|
<Layout title={`豆瓣图书`}>
|
||||||
<MediaGrid
|
<MediaGrid
|
||||||
type="book"
|
type="book"
|
||||||
title="我读过的书"
|
title="我读过的书"
|
||||||
@ -12,3 +12,4 @@ import { SITE_NAME, DOUBAN_ID } from '@/consts';
|
|||||||
client:load
|
client:load
|
||||||
/>
|
/>
|
||||||
</Layout>
|
</Layout>
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
}
|
}
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout>
|
<Layout title="文章筛选">
|
||||||
<div class="bg-gray-50 dark:bg-dark-bg min-h-screen">
|
<div class="bg-gray-50 dark:bg-dark-bg min-h-screen">
|
||||||
<main class="mx-auto px-4 sm:px-6 lg:px-8 py-6 max-w-7xl">
|
<main class="mx-auto px-4 sm:px-6 lg:px-8 py-6 max-w-7xl">
|
||||||
<!-- 页面标题 -->
|
<!-- 页面标题 -->
|
||||||
@ -66,7 +66,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
|
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
|
||||||
<!-- 时间筛选 -->
|
<!-- 时间筛选 -->
|
||||||
<div class="filter-group">
|
<div class="filter-group">
|
||||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">发布时间</label>
|
<label for="dateFilter" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">发布时间</label>
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<select
|
<select
|
||||||
id="dateFilter"
|
id="dateFilter"
|
||||||
@ -89,7 +89,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
<div id="customDateContainer" class="mt-3 hidden">
|
<div id="customDateContainer" class="mt-3 hidden">
|
||||||
<div class="grid grid-cols-2 gap-2">
|
<div class="grid grid-cols-2 gap-2">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">开始日期</label>
|
<label for="startDate" class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">开始日期</label>
|
||||||
<input
|
<input
|
||||||
type="date"
|
type="date"
|
||||||
id="startDate"
|
id="startDate"
|
||||||
@ -97,7 +97,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">结束日期</label>
|
<label for="endDate" class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">结束日期</label>
|
||||||
<input
|
<input
|
||||||
type="date"
|
type="date"
|
||||||
id="endDate"
|
id="endDate"
|
||||||
@ -116,7 +116,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
|
|
||||||
<!-- 排序方式 -->
|
<!-- 排序方式 -->
|
||||||
<div class="filter-group">
|
<div class="filter-group">
|
||||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">排序方式</label>
|
<label for="sortOption" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">排序方式</label>
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<select
|
<select
|
||||||
id="sortOption"
|
id="sortOption"
|
||||||
@ -137,7 +137,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
|
|
||||||
<!-- 标签筛选器 -->
|
<!-- 标签筛选器 -->
|
||||||
<div class="filter-group">
|
<div class="filter-group">
|
||||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">文章标签</label>
|
<label for="tagSelectorButton" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">文章标签</label>
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<button
|
<button
|
||||||
id="tagSelectorButton"
|
id="tagSelectorButton"
|
||||||
@ -155,6 +155,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
<div class="p-2">
|
<div class="p-2">
|
||||||
<div class="sticky top-0 bg-white dark:bg-gray-800 pb-2 mb-1 border-b border-gray-200 dark:border-gray-700">
|
<div class="sticky top-0 bg-white dark:bg-gray-800 pb-2 mb-1 border-b border-gray-200 dark:border-gray-700">
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
|
<label for="tagSearchInput" class="sr-only">搜索标签</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="tagSearchInput"
|
id="tagSearchInput"
|
||||||
@ -172,6 +173,8 @@ function getArticleUrl(articleId: string) {
|
|||||||
<label class="flex items-center p-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 rounded cursor-pointer">
|
<label class="flex items-center p-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 rounded cursor-pointer">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
|
id={`tag-${tag}`}
|
||||||
|
name="selected-tags"
|
||||||
value={tag}
|
value={tag}
|
||||||
class="tag-checkbox h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 dark:border-gray-600 rounded"
|
class="tag-checkbox h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 dark:border-gray-600 rounded"
|
||||||
/>
|
/>
|
||||||
@ -222,7 +225,7 @@ function getArticleUrl(articleId: string) {
|
|||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
<!-- 每页显示数量选择器 -->
|
<!-- 每页显示数量选择器 -->
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<label class="mr-2 text-sm text-gray-600 dark:text-gray-400">每页显示:</label>
|
<label for="pageSizeOption" class="mr-2 text-sm text-gray-600 dark:text-gray-400">每页显示:</label>
|
||||||
<select
|
<select
|
||||||
id="pageSizeOption"
|
id="pageSizeOption"
|
||||||
class="bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-200 py-1 px-2 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 focus:ring-1 appearance-none"
|
class="bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-200 py-1 px-2 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 focus:ring-1 appearance-none"
|
||||||
|
@ -3,7 +3,7 @@ import Layout from '@/components/Layout.astro';
|
|||||||
import { SITE_NAME } from '@/consts';
|
import { SITE_NAME } from '@/consts';
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout>
|
<Layout title={SITE_NAME}>
|
||||||
<div class="min-h-[calc(100vh-4rem)] flex items-center justify-center">
|
<div class="min-h-[calc(100vh-4rem)] flex items-center justify-center">
|
||||||
<div class="text-center px-4">
|
<div class="text-center px-4">
|
||||||
<h1 class="text-6xl md:text-8xl font-bold bg-gradient-to-r from-primary-600 to-primary-400 dark:from-primary-400 dark:to-primary-200 text-transparent bg-clip-text mb-6">
|
<h1 class="text-6xl md:text-8xl font-bold bg-gradient-to-r from-primary-600 to-primary-400 dark:from-primary-400 dark:to-primary-200 text-transparent bg-clip-text mb-6">
|
||||||
|
@ -4,7 +4,7 @@ import MediaGrid from "@/components/MediaGrid.tsx";
|
|||||||
import { SITE_NAME, DOUBAN_ID } from "@/consts.ts";
|
import { SITE_NAME, DOUBAN_ID } from "@/consts.ts";
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout title={`电影 - ${SITE_NAME}`}>
|
<Layout title={`电影`}>
|
||||||
<MediaGrid
|
<MediaGrid
|
||||||
type="movie"
|
type="movie"
|
||||||
title="我看过的电影"
|
title="我看过的电影"
|
||||||
|
@ -4,7 +4,7 @@ import GitProjectCollection from '@/components/GitProjectCollection';
|
|||||||
import { GitPlatform } from '@/components/GitProjectCollection';
|
import { GitPlatform } from '@/components/GitProjectCollection';
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout title="项目 | echoes">
|
<Layout title="项目">
|
||||||
<main class="container mx-auto px-4 py-8">
|
<main class="container mx-auto px-4 py-8">
|
||||||
<h1 class="text-4xl font-bold mb-8 text-center">项目</h1>
|
<h1 class="text-4xl font-bold mb-8 text-center">项目</h1>
|
||||||
<div class="space-y-12">
|
<div class="space-y-12">
|
||||||
|
@ -38,37 +38,39 @@
|
|||||||
color: #6b7280;
|
color: #6b7280;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 增强代码块样式 */
|
/* 行内代码样式 */
|
||||||
.prose pre {
|
|
||||||
margin: 1.5em 0;
|
|
||||||
padding: 1em;
|
|
||||||
border-radius: 0.375rem;
|
|
||||||
overflow-x: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.prose :not(pre) > code {
|
.prose :not(pre) > code {
|
||||||
background-color: rgba(0, 0, 0, 0.1);
|
background-color: rgba(0, 0, 0, 0.05);
|
||||||
|
color: var(--color-primary-700);
|
||||||
padding: 0.2em 0.4em;
|
padding: 0.2em 0.4em;
|
||||||
border-radius: 0.25em;
|
border-radius: 0.375em;
|
||||||
font-weight: 400;
|
font-weight: 500;
|
||||||
white-space: nowrap;
|
font-family: "JetBrains Mono", Menlo, Monaco, Consolas, "Courier New", monospace;
|
||||||
|
font-size: 0.875em;
|
||||||
|
white-space: normal;
|
||||||
|
word-wrap: break-word;
|
||||||
|
overflow-wrap: break-word;
|
||||||
|
border: 1px solid rgba(0, 0, 0, 0.05);
|
||||||
|
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
|
||||||
|
letter-spacing: -0.025em;
|
||||||
|
transition: all 0.2s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 移除 Tailwind Typography 添加的引号 */
|
.prose :not(pre) > code:hover {
|
||||||
.prose code::before,
|
background-color: rgba(var(--color-primary-600-rgb), 0.08);
|
||||||
.prose code::after {
|
border-color: rgba(var(--color-primary-400-rgb), 0.2);
|
||||||
content: none !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 表情符号样式 */
|
[data-theme="dark"] .prose :not(pre) > code {
|
||||||
.prose img.emoji {
|
background-color: rgba(255, 255, 255, 0.07);
|
||||||
height: 1em;
|
color: var(--color-primary-300);
|
||||||
width: 1em;
|
border-color: rgba(255, 255, 255, 0.1);
|
||||||
margin: 0 0.05em 0 0.1em;
|
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
|
||||||
vertical-align: -0.1em;
|
}
|
||||||
display: inline-block;
|
|
||||||
border: none;
|
[data-theme="dark"] .prose :not(pre) > code:hover {
|
||||||
box-shadow: none;
|
background-color: rgba(var(--color-primary-500-rgb), 0.15);
|
||||||
|
border-color: rgba(var(--color-primary-300-rgb), 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 标题样式 */
|
/* 标题样式 */
|
||||||
|
@ -1,36 +0,0 @@
|
|||||||
/* 表情符号样式 */
|
|
||||||
.emoji {
|
|
||||||
height: 1em;
|
|
||||||
width: 1em;
|
|
||||||
margin: 0 0.05em 0 0.1em;
|
|
||||||
vertical-align: -0.1em;
|
|
||||||
display: inline-block !important;
|
|
||||||
border: none !important;
|
|
||||||
box-shadow: none !important;
|
|
||||||
background: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 确保表情符号在列表项中正确显示 */
|
|
||||||
li .emoji {
|
|
||||||
margin-right: 0.2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 确保表情符号在标题中正确显示 */
|
|
||||||
h1 .emoji,
|
|
||||||
h2 .emoji,
|
|
||||||
h3 .emoji,
|
|
||||||
h4 .emoji,
|
|
||||||
h5 .emoji,
|
|
||||||
h6 .emoji {
|
|
||||||
vertical-align: -0.1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 确保表情符号在表格中正确显示 */
|
|
||||||
td .emoji,
|
|
||||||
th .emoji {
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
|
|
||||||
[data-theme="dark"] .emoji {
|
|
||||||
filter: brightness(0.8) contrast(1.2);
|
|
||||||
}
|
|
@ -1,7 +1,6 @@
|
|||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
@import "./content-styles.css";
|
@import "./content-styles.css";
|
||||||
@import "./table-styles.css";
|
@import "./table-styles.css";
|
||||||
@import "./emoji.css";
|
|
||||||
@import "./header.css";
|
@import "./header.css";
|
||||||
|
|
||||||
/* 定义深色模式选择器 */
|
/* 定义深色模式选择器 */
|
||||||
|
Loading…
Reference in New Issue
Block a user