Skip to content

Commit 102401a

Browse files
committed
Refactor language-specific font definitions to use CSS variables for improved readability and maintainability
1 parent 7e16c02 commit 102401a

2 files changed

Lines changed: 56 additions & 30 deletions

File tree

stylesheets/compiled.css

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,20 +1944,8 @@ video {
19441944
display: none;
19451945
}
19461946

1947-
body:lang(zh-CN) {
1948-
font-family: "Plus Jakarta Sans", "Noto Sans SC", -apple-system, BlinkMacSystemFont, sans-serif;
1949-
}
1950-
1951-
body:lang(zh-TW) {
1952-
font-family: "Plus Jakarta Sans", "Noto Sans TC", -apple-system, BlinkMacSystemFont, sans-serif;
1953-
}
1954-
1955-
body:lang(ko) {
1956-
font-family: "Plus Jakarta Sans", "Noto Sans KR", -apple-system, BlinkMacSystemFont, sans-serif;
1957-
}
1958-
1959-
body:lang(ja) {
1960-
font-family: "Plus Jakarta Sans", "Noto Sans JP", -apple-system, BlinkMacSystemFont, sans-serif;
1947+
body:lang(ja),body:lang(ko),body:lang(zh-CN),body:lang(zh-TW) {
1948+
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
19611949
}
19621950

19631951
body{
@@ -1978,20 +1966,39 @@ body:is(.dark *){
19781966
color: rgb(250 250 249 / var(--tw-text-opacity, 1));
19791967
}
19801968

1981-
html:lang(zh-CN), body:lang(zh-CN), .font-default:lang(zh-CN), .font-sans:lang(zh-CN) {
1982-
font-family: "Plus Jakarta Sans", "Noto Sans SC", -apple-system, BlinkMacSystemFont, sans-serif;
1969+
html:lang(zh-CN), [lang="zh-CN"] {
1970+
--noto-sans-subset: "Noto Sans SC";
19831971
}
19841972

1985-
html:lang(zh-TW), body:lang(zh-TW), .font-default:lang(zh-TW), .font-sans:lang(zh-TW) {
1986-
font-family: "Plus Jakarta Sans", "Noto Sans TC", -apple-system, BlinkMacSystemFont, sans-serif;
1973+
html:lang(zh-TW), [lang="zh-TW"] {
1974+
--noto-sans-subset: "Noto Sans TC";
19871975
}
19881976

1989-
html:lang(ko), body:lang(ko), .font-default:lang(ko), .font-sans:lang(ko) {
1990-
font-family: "Plus Jakarta Sans", "Noto Sans KR", -apple-system, BlinkMacSystemFont, sans-serif;
1977+
html:lang(ko), [lang="ko"] {
1978+
--noto-sans-subset: "Noto Sans KR";
19911979
}
19921980

1993-
html:lang(ja), body:lang(ja), .font-default:lang(ja), .font-sans:lang(ja) {
1994-
font-family: "Plus Jakarta Sans", "Noto Sans JP", -apple-system, BlinkMacSystemFont, sans-serif;
1981+
html:lang(ja), [lang="ja"] {
1982+
--noto-sans-subset: "Noto Sans JP";
1983+
}
1984+
1985+
html:lang(ja),
1986+
body:lang(ja),
1987+
.font-default:lang(ja),
1988+
.font-sans:lang(ja),
1989+
html:lang(ko),
1990+
body:lang(ko),
1991+
.font-default:lang(ko),
1992+
.font-sans:lang(ko),
1993+
html:lang(zh-CN),
1994+
body:lang(zh-CN),
1995+
.font-default:lang(zh-CN),
1996+
.font-sans:lang(zh-CN),
1997+
html:lang(zh-TW),
1998+
body:lang(zh-TW),
1999+
.font-default:lang(zh-TW),
2000+
.font-sans:lang(zh-TW) {
2001+
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
19952002
}
19962003

19972004
.container{

stylesheets/tailwind.css

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,38 @@
2424
@apply dark:bg-stone-900 dark:text-stone-50;
2525
}
2626

27-
html:lang(zh-CN), body:lang(zh-CN), .font-default:lang(zh-CN), .font-sans:lang(zh-CN) {
28-
font-family: "Plus Jakarta Sans", "Noto Sans SC", -apple-system, BlinkMacSystemFont, sans-serif;
27+
html:lang(zh-CN), [lang="zh-CN"] {
28+
--noto-sans-subset: "Noto Sans SC";
2929
}
3030

31-
html:lang(zh-TW), body:lang(zh-TW), .font-default:lang(zh-TW), .font-sans:lang(zh-TW) {
32-
font-family: "Plus Jakarta Sans", "Noto Sans TC", -apple-system, BlinkMacSystemFont, sans-serif;
31+
html:lang(zh-TW), [lang="zh-TW"] {
32+
--noto-sans-subset: "Noto Sans TC";
3333
}
3434

35-
html:lang(ko), body:lang(ko), .font-default:lang(ko), .font-sans:lang(ko) {
36-
font-family: "Plus Jakarta Sans", "Noto Sans KR", -apple-system, BlinkMacSystemFont, sans-serif;
35+
html:lang(ko), [lang="ko"] {
36+
--noto-sans-subset: "Noto Sans KR";
3737
}
3838

39-
html:lang(ja), body:lang(ja), .font-default:lang(ja), .font-sans:lang(ja) {
40-
font-family: "Plus Jakarta Sans", "Noto Sans JP", -apple-system, BlinkMacSystemFont, sans-serif;
39+
html:lang(ja), [lang="ja"] {
40+
--noto-sans-subset: "Noto Sans JP";
41+
}
42+
43+
html:lang(ja),
44+
body:lang(ja),
45+
.font-default:lang(ja),
46+
.font-sans:lang(ja),
47+
html:lang(ko),
48+
body:lang(ko),
49+
.font-default:lang(ko),
50+
.font-sans:lang(ko),
51+
html:lang(zh-CN),
52+
body:lang(zh-CN),
53+
.font-default:lang(zh-CN),
54+
.font-sans:lang(zh-CN),
55+
html:lang(zh-TW),
56+
body:lang(zh-TW),
57+
.font-default:lang(zh-TW),
58+
.font-sans:lang(zh-TW) {
59+
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
4160
}
4261
}

0 commit comments

Comments
 (0)