diff --git a/tests/ui/app.spec.js b/tests/ui/app.spec.js index e2d1ea7..6b2e50f 100644 --- a/tests/ui/app.spec.js +++ b/tests/ui/app.spec.js @@ -140,7 +140,7 @@ test('each browser keeps its own theme, in a cookie, not on the account', async }); test('a font chosen in Settings is kept in this browser, over any theme\'s own', async ({ page }) => { - // Theme's own is the default and leaves each theme's face as it was (#359). + // The default leaves each theme's face as it was (#359). const face = () => page.evaluate(() => getComputedStyle(document.body).fontFamily); await page.locator('#prefs').click(); await page.locator('#stheme').selectOption('classic'); diff --git a/web/CHANGELOG.md b/web/CHANGELOG.md index b234d2c..987e851 100644 --- a/web/CHANGELOG.md +++ b/web/CHANGELOG.md @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- A font of your choosing in Settings, beside the theme: Inter, your system's, serif or monospace, kept by each browser as the theme is. Theme's own, the default, keeps each theme's face as it was (#359). +- A font of your choosing in Settings, beside the theme: Inter, your system's, serif or monospace, kept by each browser as the theme is. The default keeps each theme's face as it was (#359). ## [1.3.0] - 2026-10-23 diff --git a/web/app.css b/web/app.css index 9d88813..56f1d17 100644 --- a/web/app.css +++ b/web/app.css @@ -1644,7 +1644,7 @@ body:has(#player.on) #status{padding-bottom:3px} /* ---------- A font chosen in Settings (#359) ---------- */ /* Last in the file: each rule ties with a theme's own body font, and the later one wins. No rule - for Theme's own, which leaves each theme as it is. */ + for the default, which leaves each theme as it is. */ :root[data-font="inter"] body{font-family:Inter,system-ui,-apple-system,"Segoe UI",Roboto,sans-serif} :root[data-font="system"] body{font-family:-apple-system,BlinkMacSystemFont,system-ui,"Segoe UI",Roboto,"Noto Sans",sans-serif} :root[data-font="serif"] body{font-family:Charter,"Iowan Old Style","Bitstream Charter",Georgia,Cambria,"Noto Serif",serif} diff --git a/web/src/theme.ts b/web/src/theme.ts index 9c20ff3..75a2865 100644 --- a/web/src/theme.ts +++ b/web/src/theme.ts @@ -52,10 +52,10 @@ function setTheme(name = theme.name, mode = theme.mode, save = false){ function saveTheme(){ document.cookie = `ipx_theme=${theme.name}.${theme.mode}; Path=/; Max-Age=31536000; SameSite=Lax`; } -// A font chosen in Settings, kept as the theme is, each browser its own (#359). Theme's own is +// A font chosen in Settings, kept as the theme is, each browser its own (#359). The default is // what each theme sets, Lucida Grande for Classic and the system's for Glass; the rest are on the // device already or served by ipx, so choosing one downloads nothing. -const FONTS: Record = {theme: "Theme's own", inter: 'Inter', system: 'System', serif: 'Serif', mono: 'Monospace'}; +const FONTS: Record = {theme: 'Default (set by the theme)', inter: 'Inter', system: 'System', serif: 'Serif', mono: 'Monospace'}; let font = 'theme'; function setFont(name = font, save = false){