Squash merge main into feature branch

web/frontend/app/features/theme/themes.ts

@@ -4,6 +4,10 @@ export type ThemeName =
 export interface ThemeOption {
     value: ThemeName;
     label: string;
+    /** Used where the segmented control is narrow, such as the landing page. */
+    shortLabel: string;
+    /** A compact mood descriptor for theme pickers. */
+    shortVibe: string;
     vibe: string;
 }
 
@@ -14,21 +18,29 @@ export const biergartenThemes: ThemeOption[] = [
     {
         value: 'biergarten-lager',
         label: 'Biergarten Lager',
+        shortLabel: 'Lager',
+        shortVibe: 'Muted parchment',
         vibe: 'Muted parchment, mellow amber, daytime beer garden',
     },
     {
         value: 'biergarten-stout',
         label: 'Biergarten Stout',
+        shortLabel: 'Stout',
+        shortVibe: 'Charred barrel',
         vibe: 'Charred barrel, deep roast, cozy evening cellar',
     },
     {
         value: 'biergarten-cassis',
         label: 'Biergarten Cassis',
+        shortLabel: 'Cassis',
+        shortVibe: 'Blackberry barrel',
         vibe: 'Blackberry barrel, sour berry dark, vivid night market',
     },
     {
         value: 'biergarten-weizen',
         label: 'Biergarten Weizen',
+        shortLabel: 'Weizen',
+        shortVibe: 'Bright spring',
         vibe: 'Ultra-light young barley, green undertone, bright spring afternoon',
     },
 ];