Skip to content

Add missing code font var#1907

Merged
fdncred merged 1 commit into
nushell:mainfrom
Kissaki:fix/fontvar
May 1, 2025
Merged

Add missing code font var#1907
fdncred merged 1 commit into
nushell:mainfrom
Kissaki:fix/fontvar

Conversation

@Kissaki
Copy link
Copy Markdown
Contributor

@Kissaki Kissaki commented May 1, 2025

Code blocks use a different variable, which this commit adds.

On the current Nushell website, for example Quick Tour page, we can see that the font-family being applied is in the generated style-*.css, with declaration code { font-family(--code-font-family); }, which does not match our supposed override which defines a var under a different name --font-family-code.

This var name has been used since the introduction of the override in 83ced1d.

Maybe vuepress changed the variable at some point?

This is a follow-up to 2ec6143 (PR #1890, PR #1906), which attempts to solve Android monospace due to missing font coverage (#83).

Instead of replacing --font-family-code, --code-font-family is added as an additional value-identical declaration just in case the other variable is being used somewhere still.

Code blocks use a different variable, which this commit adds.

On the current Nushell website, for example [Quick Tour][quicktour] page,
we can see that the font-family being applied is in the generated style-*.css,
with declaration `code { font-family(--code-font-family); }`,
which does not match our supposed override which defines a var
under a different name `--font-family-code`.

This var name has been used since the introduction of the override in 83ced1d.

Maybe vuepress changed the variable at some point?

This is a follow-up to 2ec6143 (PR nushell#1890, PR nushell#1906),
which attempts to solve Android monospace due to missing font coverage (nushell#83).

Instead of replacing `--font-family-code`, `--code-font-family` is added as an additional value-identical declaration just in case the other variable is being used somewhere still.

[quicktour]: https://www.nushell.sh/book/quick_tour.html#nushell-commands-output-data
@fdncred
Copy link
Copy Markdown
Contributor

fdncred commented May 1, 2025

Let's try and see. Thanks

@fdncred fdncred merged commit 2adb836 into nushell:main May 1, 2025
2 checks passed
@Kissaki Kissaki deleted the fix/fontvar branch May 1, 2025 20:19
@Kissaki
Copy link
Copy Markdown
Contributor Author

Kissaki commented May 1, 2025

Unfortunately, vuepress puts their declaration after ours. I'll submit a followup.

Kissaki added a commit to Kissaki/nushell.github.io that referenced this pull request May 1, 2025
VuePress puts our `:root` declaration before their own,
meaning the declaration we intended as an override was overridden instead.

Use higher specificity (`body`) to make sure it takes precedence.

This is a follow-up to nushell#1907
fdncred pushed a commit that referenced this pull request May 1, 2025
VuePress puts our `:root` declaration before their own,
meaning the declaration we intended as an override was overridden instead.

Use higher specificity (`body`) to make sure it takes precedence.

This is a follow-up to #1907
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants