Skip to content

Commit 1826ca9

Browse files
feat: 代碼塊改以 Expressive Code 字體設定為優先, 並改善對 Windows NT 系統 CJK 字體的支援 (#437)
* feat: respect express code font settings for code blocks and add microsoft cjk fonts support for windows * feat: add microsoft cjk fonts support for windows in expressive code
1 parent 3068369 commit 1826ca9

5 files changed

Lines changed: 20 additions & 8 deletions

File tree

astro.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default defineConfig({
9393
borderColor: "none",
9494
codeFontSize: "0.875rem",
9595
codeFontFamily:
96-
"'JetBrains Mono Variable', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace",
96+
"'JetBrains Mono Variable', SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', 'Microsoft JhengHei', '微軟正黑體', 'Microsoft YaHei', '微软雅黑', 'Noto Sans HK', 'Noto Sans TC', 'Noto Sans JP', 'Noto Sans SC', 'Noto Sans KR', ui-monospace, monospace",
9797
codeLineHeight: "1.5rem",
9898
frames: {
9999
editorBackground: "var(--codeblock-bg)",

src/plugins/expressive-code/language-badge.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,19 @@ export function pluginLanguageBadge() {
2626
top: 0.5rem;
2727
padding: 0.1rem 0.5rem;
2828
content: attr(data-language);
29-
font-family: "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
29+
font-family: var(
30+
--ec-codeFontFml,
31+
"JetBrains Mono Variable",
32+
"JetBrains Mono",
33+
ui-monospace,
34+
SFMono-Regular,
35+
Menlo,
36+
Monaco,
37+
Consolas,
38+
"Liberation Mono",
39+
"Courier New",
40+
monospace
41+
);
3042
font-size: 0.75rem;
3143
font-weight: bold;
3244
text-transform: uppercase;

src/styles/encrypted-content.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
@apply px-4 py-2 text-xs font-medium;
4040
background: var(--primary);
4141
color: white;
42-
font-family: "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
42+
font-family: var(--ec-codeFontFml, "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
4343
}
4444

4545
/* pre元素样式 */
4646
#decrypted-content .frame pre {
4747
@apply p-4 overflow-x-auto m-0;
48-
font-family: "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
48+
font-family: var(--ec-codeFontFml, "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
4949
font-size: 0.875rem;
5050
line-height: 1.5rem;
5151
background: var(--codeblock-bg);
@@ -67,7 +67,7 @@
6767

6868
/* 代码元素样式 */
6969
#decrypted-content code {
70-
font-family: "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
70+
font-family: var(--ec-codeFontFml, "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
7171
}
7272

7373
/* 内联代码样式 - 与markdown.css保持一致 */
@@ -306,7 +306,7 @@
306306
top: 0.5rem;
307307
padding: 0.1rem 0.5rem;
308308
content: attr(data-language);
309-
font-family: "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
309+
font-family: var(--ec-codeFontFml, "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
310310
font-size: 0.75rem;
311311
font-weight: bold;
312312
text-transform: uppercase;

src/styles/expressive-code.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
.title {
22-
font-family: "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
22+
font-family: var(--ec-codeFontFml, "JetBrains Mono Variable", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
2323
}
2424

2525
/* 复制按钮样式 (Copy Button) */

src/styles/markdown.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
code {
4040
@apply bg-(--inline-code-bg) text-(--inline-code-color) px-1 py-0.5 rounded-md overflow-hidden;
4141

42-
font-family: "JetBrains Mono Variable", "JetBrains Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
42+
font-family: var(--ec-codeFontFml, "JetBrains Mono Variable", "JetBrains Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
4343

4444
&:before,
4545
&:after {

0 commit comments

Comments
 (0)