fix: Zhihu theme code block

terwer · Nov 5, 2024 · bda512f · bda512f
1 parent 7c9143c
commit bda512f
Show file tree

Hide file tree

Showing 9 changed files with 917 additions and 8 deletions.
diff --git a/components/setting/Basic.vue b/components/setting/Basic.vue
@@ -78,7 +78,7 @@ const formData = reactive({
   versionMap: {
     midlight: "3.1.10",
     daylight: "3.1.10",
-    Zhihu: "0.1.2",
+    Zhihu: "0.1.3",
     Savor: "4.2.3",
   } as any,
 })

diff --git a/composables/useStaticThemeMode.ts b/composables/useStaticThemeMode.ts
@@ -74,7 +74,7 @@ export const useStaticThemeMode = async () => {
   const siyuanLightTheme = (query.lightTheme ?? setting.theme?.lightTheme ?? "Zhihu") as string
   const siyuanDarkTheme = (query.darkTheme ?? setting.theme?.darkTheme ?? "Zhihu") as string
   const siyuanThemeV = (query.themeVersion ?? setting.theme?.themeVersion ?? "0.1.2") as string
-  const detectedMode = color.preference
+  const detectedMode = color.preference == "system" ? "light" : color.preference
   const isDarkMode = detectedMode === "dark"
   useHead({
     htmlAttrs: {

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -67,7 +67,7 @@ export default defineNuxtConfig({
       viewport: "width=device-width, initial-scale=1",
       htmlAttrs: {
         lang: "zh_CN",
-        "data-theme-mode": "system",
+        "data-theme-mode": "light",
         "data-light-theme": "Zhihu",
         "data-dark-theme": "Zhihu",
       },

diff --git a/nuxt.node.config.ts b/nuxt.node.config.ts
@@ -67,7 +67,7 @@ export default defineNuxtConfig({
       viewport: "width=device-width, initial-scale=1",
       htmlAttrs: {
         lang: "zh_CN",
-        "data-theme-mode": "system",
+        "data-theme-mode": "light",
         "data-light-theme": "Zhihu",
         "data-dark-theme": "Zhihu",
       },

diff --git a/nuxt.siyuan.config.ts b/nuxt.siyuan.config.ts
@@ -82,7 +82,7 @@ export default defineNuxtConfig({
       viewport: "width=device-width, initial-scale=1",
       htmlAttrs: {
         lang: "zh_CN",
-        "data-theme-mode": "system",
+        "data-theme-mode": "light",
         "data-light-theme": "Zhihu",
         "data-dark-theme": "Zhihu",
       },

diff --git a/nuxt.vercel.config.ts b/nuxt.vercel.config.ts
@@ -68,7 +68,7 @@ export default defineNuxtConfig({
       viewport: "width=device-width, initial-scale=1",
       htmlAttrs: {
         lang: "zh_CN",
-        "data-theme-mode": "system",
+        "data-theme-mode": "light",
         "data-light-theme": "Zhihu",
         "data-dark-theme": "Zhihu",
       },

diff --git a/plugins/01.hljs.client.ts b/plugins/01.hljs.client.ts
@@ -52,12 +52,15 @@ export default defineNuxtPlugin(({ vueApp }) => {
           // 创建 <pre> 和 <code> 元素
           const pre = document.createElement("pre")
           const code = document.createElement("code")
+          const div = document.createElement("div")
+          div.className = "hljs"
           // 将 block 的内容移动到 <code> 中
           code.innerHTML = block.innerHTML
           // 将 <code> 添加到 <pre> 中
           pre.appendChild(code)
+          div.appendChild(pre)
           // 将 <pre> 插入到 block 的位置，并移除原始的 block
-          block.parentNode?.insertBefore(pre, block)
+          block.parentNode?.insertBefore(div, block)
           block.remove()
         })
 

diff --git a/public/resources/appearance/themes/Zhihu/style/common/fonts/webfont/webfont.css b/public/resources/appearance/themes/Zhihu/style/common/fonts/webfont/webfont.css
diff --git a/public/resources/appearance/themes/Zhihu/theme.css b/public/resources/appearance/themes/Zhihu/theme.css