Fix

coder · mtojek · Apr 7, 2025 · Apr 4, 2025 · Apr 4, 2025 · Apr 4, 2025
commit 59854a66eb24902ed673490b1340249498edfd86
@@ -15,12 +15,8 @@ import { PreviewBadge } from "components/Badges/Badges";
 import { Stack } from "components/Stack/Stack";
 import { ThemeOverride } from "contexts/ThemeProvider";
 import type { FC } from "react";
-import themes, {
-	DEFAULT_TERMINAL_FONT,
-	DEFAULT_THEME,
-	fontLabels,
-	type Theme,
-} from "theme";
+import themes, { DEFAULT_THEME, type Theme } from "theme";
+import { DEFAULT_TERMINAL_FONT, terminalFontLabels } from "theme/constants";
 import { Section } from "../Section";
 
 export interface AppearanceFormProps {
@@ -119,8 +115,8 @@ export const AppearanceForm: FC<AppearanceFormProps> = ({
 								value={name}
 								control={<Radio />}
 								label={
-									<div css={{ fontFamily: fontLabels[name] }}>
-										{fontLabels[name]}
+									<div css={{ fontFamily: terminalFontLabels[name] }}>
+										{terminalFontLabels[name]}
 									</div>
 								}
 							/>

@@ -3,14 +3,21 @@ import type { TerminalFontName } from "api/typesGenerated";
 export const borderRadius = 8;
 export const MONOSPACE_FONT_FAMILY =
 	"'IBM Plex Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'Liberation Mono', 'Monaco', 'Courier New', Courier, monospace";
+export const BODY_FONT_FAMILY = `"Inter Variable", system-ui, sans-serif`;
+
 export const terminalFonts: Record<TerminalFontName, string> = {
 	"fira-code": MONOSPACE_FONT_FAMILY.replace("IBM Plex Mono", "Fira Code"),
 	"ibm-plex-mono": MONOSPACE_FONT_FAMILY,
 
 	"": MONOSPACE_FONT_FAMILY,
 };
+export const terminalFontLabels: Record<TerminalFontName, string> = {
+	"fira-code": "Fira Code",
+	"ibm-plex-mono": "IBM Plex Mono",
+	"": "", // needed for enum completeness, otherwise fails the build
+};
+export const DEFAULT_TERMINAL_FONT = "ibm-plex-mono";
 
-export const BODY_FONT_FAMILY = `"Inter Variable", system-ui, sans-serif`;
 export const navHeight = 62;
 export const containerWidth = 1380;
 export const containerWidthMedium = 1080;

diff --git a/site/src/theme/index.ts b/site/src/theme/index.ts
@@ -2,9 +2,7 @@
 import type { Theme as MuiTheme } from "@mui/material/styles";
 import type { TerminalFontName } from "api/typesGenerated";
 import type * as monaco from "monaco-editor";
-import { of } from "rxjs";
 import type { Branding } from "./branding";
-import { terminalFonts } from "./constants";
 import dark from "./dark";
 import type { NewTheme } from "./experimental";
 import type { ExternalImageModeStyles } from "./externalImages";
@@ -39,11 +37,3 @@ const theme = {
 } satisfies Record<string, Theme>;
 
 export default theme;
-
-export const fontLabels: Record<TerminalFontName, string> = {
-	"fira-code": "Fira Code",
-	"ibm-plex-mono": "IBM Plex Mono",
-	"": "", // needed for enum completeness, otherwise fails the build
-};
-
-export const DEFAULT_TERMINAL_FONT = "ibm-plex-mono";