From e0ff4270b457048cbd14c40e1e0c048d437b453f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 13:38:53 +0300
Subject: [PATCH] fix generic fonts not being set

---
 src/stores/interface.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/stores/interface.js b/src/stores/interface.js
index da0e6d4f5..eb129567b 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -17,6 +17,16 @@ import {
 } from 'src/services/theme_data/theme_data.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
 
+const GENERIC_FONT_NAMES = new Set([
+  'serif',
+  'sans-serif',
+  'system-ui',
+  'cursive',
+  'fantasy',
+  'math',
+  'monospace',
+])
+
 export const useInterfaceStore = defineStore('interface', {
   state: () => ({
     localFonts: null,
@@ -706,11 +716,12 @@ export const useInterfaceStore = defineStore('interface', {
         Object.entries(fontMap).forEach(([font, component]) => {
           const family = mergedConfig[`font${font}`]
           const variable = font === 'Monospace' ? '--monoFont' : '--font'
-          if (family) {
+          if (typeof family === 'string') {
+            const familyString = GENERIC_FONT_NAMES.has(family) ? family : `"${family}"`
             hacks.push({
               component,
               directives: {
-                [variable]: `generic | "${family}"`,
+                [variable]: `generic | ${familyString}`,
               },
             })
           }