fix: #7 插件的字体设置会覆盖代码片段中的字体设置

terwer · Nov 3, 2023 · ba90b4e · ba90b4e
1 parent 1502bde
commit ba90b4e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/index.styl b/src/index.styl
@@ -1,22 +1,22 @@
 // 通用变量定义
-@import "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/conf/appearance/themes/Zhihu/style/common/vars/vars-common"
+@import "C:/Users/terwer/Documents/mydocs/siyuan-themes/siyuan-theme-zhihu/style/common/vars/vars-common"
 
 // web字体
 // fonts = lxgw + opensans
-@import "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/conf/appearance/themes/Zhihu/style/common/fonts/webfont/webfont.css"
+//@import "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/conf/appearance/themes/Zhihu/style/common/fonts/webfont/webfont.css"
 
 // ---------------------------------------------------------------------------------------------------------------------
 // 整体背景、字体颜色
 // _font-family-mono = "Open Sans", "LXGW WenKai", "JetBrains Mono", "-apple-system", "Microsoft YaHei", "Times New Roman", "方正北魏楷书_GBK"
 // @import "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/conf/appearance/themes/Zhihu/style/theme/basic"
 
 // 重写样式
-body
-  // 字体
-  --b3-font-family-code _font-family-mono
+//body
+//  // 字体
+//  --b3-font-family-code _font-family-mono
 
 // 代码块
-@import "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/conf/appearance/themes/Zhihu/style/theme/code-block"
+@import "C:/Users/terwer/Documents/mydocs/siyuan-themes/siyuan-theme-zhihu/style/theme/code-block"
 
 // 代码块适配
 @import "./code-block/code-block-savor"

diff --git a/vite.config.ts b/vite.config.ts
@@ -11,7 +11,10 @@ const isWatch = args.watch || args.w || false
 const isWindows = process.platform === "win32"
 let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/data/plugins/siyuan-plugin-code-block"
 if (isWindows) {
-  devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\public\\data\\plugins\\siyuan-plugin-code-block"
+  // Home
+  // devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-code-block"
+  // PDWin11
+  devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-code-block"
 }
 const distDir = isWatch ? devDistDir : "./dist"