Skip to content

Improve font stack #3771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liberaldev wants to merge 3 commits into
base: master
Choose a base branch
from
+48 −33
Open

Improve font stack #3771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
612040e
Refined CJK font stack implementation and adjusted `lang` selectors f…
liberaldev Dec 28, 2025
5e2433d
Removed redundant font utility classes and simplified `lang` selector…
liberaldev Dec 28, 2025
076f7ae
Fixed incorrect application of CJK fonts to elements with non-CJK `la…
liberaldev Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions stylesheets/compiled.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
--color-text-success: #047857;
/* Icon colors */
--color-icon-default: #78716c;
/* CJK font stack */
--font-sans-cjk: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont;
}

/* Dark mode */
Expand Down Expand Up @@ -1962,8 +1964,12 @@ video {
display: none;
}

body:lang(ja),body:lang(ko),body:lang(zh-CN),body:lang(zh-TW) {
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
html [lang]:not(code):not(pre):not(kbd):not(samp){
font-family: "Plus Jakarta Sans", -apple-system, BlinkMacSystemFont, sans-serif;
}

html [lang]:not(code):not(pre):not(kbd):not(samp):lang(ja),html [lang]:not(code):not(pre):not(kbd):not(samp):lang(ko),html [lang]:not(code):not(pre):not(kbd):not(samp):lang(zh-CN),html [lang]:not(code):not(pre):not(kbd):not(samp):lang(zh-TW) {
font-family: var(--font-sans-cjk), sans-serif;
}

body{
Expand All @@ -1977,44 +1983,32 @@ body{
color: rgb(28 25 23 / var(--tw-text-opacity, 1));
}

body:lang(ja),body:lang(ko),body:lang(zh-CN),body:lang(zh-TW) {
font-family: var(--font-sans-cjk), sans-serif;
}

body:is(.dark *){
--tw-bg-opacity: 1;
background-color: rgb(28 25 23 / var(--tw-bg-opacity, 1));
--tw-text-opacity: 1;
color: rgb(250 250 249 / var(--tw-text-opacity, 1));
}

[lang]:lang(ja),[lang]:lang(ko),[lang]:lang(zh-CN),[lang]:lang(zh-TW) {
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
}

[lang]{
font-family: "Plus Jakarta Sans", -apple-system, BlinkMacSystemFont, sans-serif;
}

/* CJK fonts */

html:lang(ja),
body:lang(ja),
.font-default:lang(ja),
.font-sans:lang(ja),
[lang="ja"],
html:lang(ko),
body:lang(ko),
.font-default:lang(ko),
.font-sans:lang(ko),
[lang="ko"],
html:lang(zh-CN),
body:lang(zh-CN),
.font-default:lang(zh-CN),
.font-sans:lang(zh-CN),
[lang="zh-CN"],
html:lang(zh-TW),
body:lang(zh-TW),
.font-default:lang(zh-TW),
.font-sans:lang(zh-TW),
[lang="zh-TW"] {
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
font-family: var(--font-sans-cjk), sans-serif;
}

/* Ensure syntax highlighting colors are not overridden by body color */
Expand Down Expand Up @@ -4737,6 +4731,17 @@ html:lang(ja),
will-change: transform;
}

.font-default:lang(ja),
.font-sans:lang(ja),
.font-default:lang(ko),
.font-sans:lang(ko),
.font-default:lang(zh-CN),
.font-sans:lang(zh-CN),
.font-default:lang(zh-TW),
.font-sans:lang(zh-TW) {
font-family: var(--font-sans-cjk), sans-serif;
}

.\[ruby-core\:03694\]{
ruby-core: 03694;
}
Expand Down
35 changes: 21 additions & 14 deletions stylesheets/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,33 @@
@tailwind utilities;

@layer base {
/* Fixed: CJK fonts incorrectly applied to elements
with non-CJK lang attribute when page language is CJK */
html [lang]:not(.font-serif):not(.font-mono):not(.font-sans):not(code):not(pre):not(kbd):not(samp) {
@apply font-default;
}

body {
@apply bg-white text-stone-900 text-base leading-5 font-default;
@apply dark:bg-stone-900 dark:text-stone-50;
}

[lang] {
@apply font-default;
}

/* CJK fonts */
html:lang(ja),
body:lang(ja),
.font-default:lang(ja),
.font-sans:lang(ja),
[lang="ja"],
html:lang(ko),
body:lang(ko),
.font-default:lang(ko),
.font-sans:lang(ko),
[lang="ko"],
html:lang(zh-CN),
body:lang(zh-CN),
.font-default:lang(zh-CN),
.font-sans:lang(zh-CN),
[lang="zh-CN"],
html:lang(zh-TW),
body:lang(zh-TW),
.font-default:lang(zh-TW),
.font-sans:lang(zh-TW),
[lang="zh-TW"] {
font-family: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont, sans-serif;
font-family: var(--font-sans-cjk), sans-serif;
}

/* Ensure syntax highlighting colors are not overridden by body color */
.highlight code {
color: inherit;
Expand All @@ -60,3 +54,16 @@
color: var(--color-text-default);
}
}

@layer utilities {
.font-default:lang(ja),
.font-sans:lang(ja),
.font-default:lang(ko),
.font-sans:lang(ko),
.font-default:lang(zh-CN),
.font-sans:lang(zh-CN),
.font-default:lang(zh-TW),
.font-sans:lang(zh-TW) {
font-family: var(--font-sans-cjk), sans-serif;
}
}
3 changes: 3 additions & 0 deletions stylesheets/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@

/* Icon colors */
--color-icon-default: #78716c;

/* CJK font stack */
--font-sans-cjk: "Plus Jakarta Sans", var(--noto-sans-subset), -apple-system, BlinkMacSystemFont;
}

/* Dark mode */
Expand Down
Loading