Skip to content

migrate: variable fonts #748

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

Merged
baseplate-admin merged 5 commits into from
Apr 17, 2026
Merged

migrate: variable fonts #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87f17eb
migrate: fronts from local to @fontsource
baseplate-admin Apr 17, 2026
d296d4a
feat: use for loop
baseplate-admin Apr 17, 2026
9373f25
migrate: variable fonts
baseplate-admin Apr 17, 2026
b6a528d
lock
baseplate-admin Apr 17, 2026
58d450c
Merge branch 'main' into migrate/variable-fonts
baseplate-admin Apr 17, 2026
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
16 changes: 8 additions & 8 deletions src/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@codemirror/view": "^6.40.0",
"@eslint/compat": "^2.0.3",
"@eslint/js": "^10.0.1",
"@fontsource/geist": "^5.2.8",
"@fontsource/jetbrains-mono": "^5.2.8",
"@fontsource-variable/geist": "^5.2.8",
"@fontsource-variable/jetbrains-mono": "^5.2.8",
"@icons-pack/svelte-simple-icons": "^7.1.0",
"@internationalized/date": "^3.12.0",
"@lucide/svelte": "^1.7.0",
Expand Down
15 changes: 2 additions & 13 deletions src/frontend/src/css/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
// Geist
@each $i in (100, 200, 300, 400, 500, 600, 700, 800, 900) {
@at-root {
@import url("@fontsource/geist/#{$i}.css");
}
}

// Jetbrains Mono
@each $i in (100, 200, 300, 400, 500, 600, 700, 800) {
@at-root {
@import url("@fontsource/jetbrains-mono/#{$i}.css");
}
}
@use "@fontsource-variable/geist";
@use "@fontsource-variable/jetbrains-mono";
31 changes: 18 additions & 13 deletions src/frontend/src/css/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
@import 'tailwindcss';

@plugin '@tailwindcss/typography';

@import 'tw-animate-css';
@plugin '@tailwindcss/typography';

/* Modern V4 Custom Variant */
@custom-variant dark (&:is(.dark *));

:root {
--font-sans:
'Geist', system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans',
'Liberation Sans', sans-serif;
--font-mono:
'JetBrains Mono', ui-monospace, SFMono-Regular, Menlo, Monaco, 'Roboto Mono', 'Noto Mono',
monospace;
/* Fonts */
--font-sans: 'Geist Variable', ui-sans-serif, system-ui;
--font-mono: 'JetBrains Mono Variable', ui-monospace, monospace;

--radius: 0.625rem;
--background: oklch(1 0 0);
--foreground: oklch(0.145 0 0);
Expand Down Expand Up @@ -82,6 +79,10 @@
}

@theme inline {
/* Map font-family tokens directly */
--font-sans: var(--font-sans);
--font-mono: var(--font-mono);

--radius-sm: calc(var(--radius) - 4px);
--radius-md: calc(var(--radius) - 2px);
--radius-lg: var(--radius);
Expand Down Expand Up @@ -132,11 +133,14 @@
* {
@apply border-border outline-ring/50;
}
html {
/* Optimize for variable fonts */
font-variation-settings: 'wght' 400;
scroll-behavior: smooth;
}
body {
@apply bg-background text-foreground;
@apply bg-background text-foreground antialiased;
font-family: var(--font-sans);
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
}

/* Use JetBrains Mono for inline code and preformatted blocks */
Expand All @@ -145,6 +149,7 @@
samp,
pre {
font-family: var(--font-mono);
font-feature-settings: 'ss01' on;
font-feature-settings:
'ss01', 'ss02', 'cv01', 'cv02'; /* Enable mono ligatures/alt characters */
}
}