@warmio/design 1.5.2 → 1.7.0

package/LICENSES/{geist-OFL-1.1.txt → jetbrains-mono-OFL-1.1.txt}

@@ -1,4 +1,4 @@
-Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font) Geist-Italic[wght].ttf: Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font)
+Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) JetBrainsMono-Italic[wght].ttf: Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:

package/LICENSES/{geist-mono-OFL-1.1.txt → merriweather-OFL-1.1.txt}

@@ -1,4 +1,4 @@
-Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font.git) GeistMono-Italic[wght].ttf: Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font.git)
+Copyright 2024 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather4) with Reserved Font Name "Merriweather". Merriweather-Italic[opsz,wdth,wght].ttf: Copyright 2024 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather4) with Reserved Font Name "Merriweather".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:

package/README.md

@@ -14,14 +14,13 @@ import { Button, ButtonLink } from '@warmio/design/button';
 import { Logo, WarmLogoIcon } from '@warmio/design/logo';
 ```
 
-The default product typefaces are Geist and Geist Mono. The `font-editorial`
-utility uses Inter and should be reserved for deliberate editorial accents.
+The product typefaces are JetBrains Mono for default UI and Merriweather for
+headings (`h1`–`h6`). Do not add a third family.
 
 `--accent-solid` / `--accent-solid-text` are the chromatic accent for links,
 badges, and highlights. They derive from `--brand-accent-solid` in `themes.css`.
 
-Package ships `components.css` (token-only styles for the primitives), `assets/`,
-and `dist/` (ESM + .d.ts). `dependencies` and `devDependencies` are empty.
+Package ships `components.css` (token-only styles for the primitives) and `dist/` (ESM + .d.ts). `dependencies` and `devDependencies` are empty.
 `peerDependencies.react` is `^19.0.0`. No root JS export.
 
 ## Releases

package/components.css

@@ -2,7 +2,7 @@
  * Rebuilt from exact UIWarm primitive/button.variants + presentation maps + variant overrides + button-edge recipes.
  * Uses only design tokens + data attrs. No literals where tokens exist.
  * Motion via --motion-* (aliased); reduced-motion zeros non-essentials.
- * All 16 presentations, 6 variants, 3 sizes + full + states produce matching computed geometry/styles.
+ * All 16 presentations, 6 variants, 4 sizes + full + states produce matching computed geometry/styles.
  */
 
 [data-warm-button] {
@@ -188,6 +188,12 @@ button[data-warm-button][data-variant='apple'] {
 }
 
 /* Sizes (public only; presentation overrides suppressed by explicit size via data attr, matches old resolveButton) */
+[data-warm-button][data-size='compact'] {
+  height: var(--button-size-md);
+  padding-left: var(--button-padding-x-md);
+  padding-right: var(--button-padding-x-md);
+  gap: var(--button-gap);
+}
 [data-warm-button][data-size='default'] {
   height: var(--button-height-default);
   padding-left: var(--button-padding-x);
@@ -351,8 +357,8 @@ button[data-warm-button][data-variant='apple'] {
 }
 [data-warm-button][data-presentation='compact']:not([data-explicit-size]) {
   height: var(--button-size-md);
-  padding-left: var(--button-padding-x-sm);
-  padding-right: var(--button-padding-x-sm);
+  padding-left: var(--button-padding-x-md);
+  padding-right: var(--button-padding-x-md);
 }
 /* 'default' and 'controlPeer' both resolve to private size 'default' with no
    own `buttonPresentationClasses` entry, so origin's `resolveLegacyButton`

package/dist/button.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 export type ButtonPresentation = 'assistantIcon' | 'assistantRoundIcon' | 'default' | 'composerIcon' | 'compact' | 'controlPeer' | 'editPill' | 'hero' | 'menuOption' | 'promptCategory' | 'promptOption' | 'sidebarIcon' | 'tableHeader' | 'threadMore' | 'threadNew' | 'touch';
 export type ButtonVariant = 'default' | 'outline' | 'ghost' | 'destructive' | 'apple' | 'arrow';
-export type ButtonSize = 'default' | 'jumbo' | 'icon';
+export type ButtonSize = 'compact' | 'default' | 'jumbo' | 'icon';
 export type ButtonProps = Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'style'> & {
     asChild?: never;
     className?: never;

package/dist/button.js

@@ -18,17 +18,27 @@ const presentationToPrivateSize = {
     threadNew: 'sm',
     touch: 'default',
 };
+const presentationAliases = {
+    controlPeer: 'default',
+    menuOption: 'promptOption',
+    touch: 'default',
+};
+function resolvePresentation(presentation) {
+    return presentationAliases[presentation] ?? presentation;
+}
 function resolveButton(presentation, size) {
     const privateSize = presentationToPrivateSize[presentation];
     const resolvedSize = size ??
         (privateSize === 'lg'
             ? 'jumbo'
-            : privateSize === 'icon' ||
-                privateSize === 'icon-round' ||
-                privateSize === 'icon-sm' ||
-                privateSize === 'icon-xs'
-                ? 'icon'
-                : 'default');
+            : privateSize === 'sm'
+                ? 'compact'
+                : privateSize === 'icon' ||
+                    privateSize === 'icon-round' ||
+                    privateSize === 'icon-sm' ||
+                    privateSize === 'icon-xs'
+                    ? 'icon'
+                    : 'default');
     return { resolvedSize, explicitSize: size ? resolvedSize : undefined };
 }
 function withArrow(variant, children) {
@@ -38,12 +48,12 @@ function withArrow(variant, children) {
 }
 const Button = React.forwardRef(function Button({ children, className: _className, presentation = 'default', render: _render, size, style: _style, type, variant = 'default', width, asChild: _asChild, ...props }, ref) {
     const { resolvedSize, explicitSize } = resolveButton(presentation, size);
-    return (_jsx("button", { ...props, ref: ref, type: type ?? 'button', "data-warm-button": "", "data-slot": "button", "data-presentation": presentation, "data-variant": variant, "data-size": resolvedSize, "data-explicit-size": explicitSize, "data-width": width, children: withArrow(variant, children) }));
+    return (_jsx("button", { ...props, ref: ref, type: type ?? 'button', "data-warm-button": "", "data-slot": "button", "data-presentation": resolvePresentation(presentation), "data-variant": variant, "data-size": resolvedSize, "data-explicit-size": explicitSize, "data-width": width, children: withArrow(variant, children) }));
 });
 Button.displayName = 'WarmButton';
 const ButtonLink = React.forwardRef(function ButtonLink({ children, className: _className, disabled: _disabled, presentation = 'default', render: _render, size, style: _style, variant = 'default', width, asChild: _asChild, ...props }, ref) {
     const { resolvedSize, explicitSize } = resolveButton(presentation, size);
-    return (_jsx("a", { ...props, ref: ref, "data-warm-button": "", "data-slot": "button", "data-presentation": presentation, "data-variant": variant, "data-size": resolvedSize, "data-explicit-size": explicitSize, "data-width": width, children: withArrow(variant, children) }));
+    return (_jsx("a", { ...props, ref: ref, "data-warm-button": "", "data-slot": "button", "data-presentation": resolvePresentation(presentation), "data-variant": variant, "data-size": resolvedSize, "data-explicit-size": explicitSize, "data-width": width, children: withArrow(variant, children) }));
 });
 ButtonLink.displayName = 'WarmButtonLink';
 export { Button, ButtonLink };

package/fonts.css

@@ -1,414 +1,142 @@
 /*
- * Self-hosted variable fonts vendored from these exact OFL-1.1 releases:
- * @fontsource-variable/geist@5.2.9,
- * @fontsource-variable/geist-mono@5.2.8, and
- * @fontsource-variable/inter@5.2.8.
+ * Self-hosted fonts vendored from these exact OFL-1.1 releases:
+ * @fontsource-variable/jetbrains-mono@5.2.8 and
+ * @fontsource/merriweather@5.2.11.
  */
 
-/* geist-cyrillic-ext-wght-normal */
+/* jetbrains-mono-latin-ext-wght-normal */
 @font-face {
-  font-family: 'Geist';
+  font-family: 'JetBrains Mono';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-cyrillic-ext-wght-normal.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* geist-cyrillic-wght-normal */
-@font-face {
-  font-family: 'Geist';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-cyrillic-wght-normal.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* geist-vietnamese-wght-normal */
-@font-face {
-  font-family: 'Geist';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-vietnamese-wght-normal.woff2') format('woff2');
-  unicode-range:
-    U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301,
-    U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
-}
-
-/* geist-latin-ext-wght-normal */
-@font-face {
-  font-family: 'Geist';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-latin-ext-wght-normal.woff2') format('woff2');
+  font-weight: 100 800;
+  src: url('./fonts/jetbrains-mono-latin-ext-wght-normal.woff2') format('woff2-variations');
   unicode-range:
     U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
     U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
     U+A720-A7FF;
 }
 
-/* geist-latin-wght-normal */
+/* jetbrains-mono-latin-wght-normal */
 @font-face {
-  font-family: 'Geist';
+  font-family: 'JetBrains Mono';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-latin-wght-normal.woff2') format('woff2');
+  font-weight: 100 800;
+  src: url('./fonts/jetbrains-mono-latin-wght-normal.woff2') format('woff2-variations');
   unicode-range:
     U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
     U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-} /* geist-cyrillic-ext-wght-italic */
-@font-face {
-  font-family: 'Geist';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-cyrillic-ext-wght-italic.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 
-/* geist-cyrillic-wght-italic */
+/* jetbrains-mono-latin-ext-wght-italic */
 @font-face {
-  font-family: 'Geist';
+  font-family: 'JetBrains Mono';
   font-style: italic;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-cyrillic-wght-italic.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* geist-vietnamese-wght-italic */
-@font-face {
-  font-family: 'Geist';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-vietnamese-wght-italic.woff2') format('woff2');
-  unicode-range:
-    U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301,
-    U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
-}
-
-/* geist-latin-ext-wght-italic */
-@font-face {
-  font-family: 'Geist';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-latin-ext-wght-italic.woff2') format('woff2');
+  font-weight: 100 800;
+  src: url('./fonts/jetbrains-mono-latin-ext-wght-italic.woff2') format('woff2-variations');
   unicode-range:
     U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
     U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
     U+A720-A7FF;
 }
 
-/* geist-latin-wght-italic */
+/* jetbrains-mono-latin-wght-italic */
 @font-face {
-  font-family: 'Geist';
+  font-family: 'JetBrains Mono';
   font-style: italic;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-latin-wght-italic.woff2') format('woff2');
+  font-weight: 100 800;
+  src: url('./fonts/jetbrains-mono-latin-wght-italic.woff2') format('woff2-variations');
   unicode-range:
     U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
     U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-} /* geist-mono-cyrillic-ext-wght-normal */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-cyrillic-ext-wght-normal.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* geist-mono-cyrillic-wght-normal */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-cyrillic-wght-normal.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* geist-mono-symbols2-wght-normal */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-symbols2-wght-normal.woff2') format('woff2');
-  unicode-range: U+2000-2001, U+2004-2008, U+200A, U+23B8-23BD, U+2500-259F;
 }
 
-/* geist-mono-vietnamese-wght-normal */
+/* merriweather-latin-ext-400-normal */
 @font-face {
-  font-family: 'Geist Mono';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-vietnamese-wght-normal.woff2') format('woff2');
-  unicode-range:
-    U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301,
-    U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
-}
-
-/* geist-mono-latin-ext-wght-normal */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-latin-ext-wght-normal.woff2') format('woff2');
+  font-weight: 400;
+  src: url('./fonts/merriweather-latin-ext-400-normal.woff2') format('woff2');
   unicode-range:
     U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
     U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
     U+A720-A7FF;
 }
 
-/* geist-mono-latin-wght-normal */
+/* merriweather-latin-400-normal */
 @font-face {
-  font-family: 'Geist Mono';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-latin-wght-normal.woff2') format('woff2');
+  font-weight: 400;
+  src: url('./fonts/merriweather-latin-400-normal.woff2') format('woff2');
   unicode-range:
     U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
     U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-} /* geist-mono-cyrillic-ext-wght-italic */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-cyrillic-ext-wght-italic.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* geist-mono-cyrillic-wght-italic */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-cyrillic-wght-italic.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* geist-mono-symbols2-wght-italic */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-symbols2-wght-italic.woff2') format('woff2');
-  unicode-range: U+2000-2001, U+2004-2008, U+200A, U+23B8-23BD, U+2500-259F;
-}
-
-/* geist-mono-vietnamese-wght-italic */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-vietnamese-wght-italic.woff2') format('woff2');
-  unicode-range:
-    U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301,
-    U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 
-/* geist-mono-latin-ext-wght-italic */
+/* merriweather-latin-ext-700-normal */
 @font-face {
-  font-family: 'Geist Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-latin-ext-wght-italic.woff2') format('woff2');
-  unicode-range:
-    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
-    U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
-    U+A720-A7FF;
-}
-
-/* geist-mono-latin-wght-italic */
-@font-face {
-  font-family: 'Geist Mono';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-latin-wght-italic.woff2') format('woff2');
-  unicode-range:
-    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
-    U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-} /* inter-cyrillic-ext-wght-normal */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-cyrillic-ext-wght-normal.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* inter-cyrillic-wght-normal */
-@font-face {
-  font-family: 'Inter';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-cyrillic-wght-normal.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* inter-greek-ext-wght-normal */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-greek-ext-wght-normal.woff2') format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* inter-greek-wght-normal */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-greek-wght-normal.woff2') format('woff2');
-  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
-}
-
-/* inter-vietnamese-wght-normal */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-vietnamese-wght-normal.woff2') format('woff2');
-  unicode-range:
-    U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301,
-    U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
-}
-
-/* inter-latin-ext-wght-normal */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-latin-ext-wght-normal.woff2') format('woff2');
+  font-weight: 700;
+  src: url('./fonts/merriweather-latin-ext-700-normal.woff2') format('woff2');
   unicode-range:
     U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
     U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
     U+A720-A7FF;
 }
 
-/* inter-latin-wght-normal */
+/* merriweather-latin-700-normal */
 @font-face {
-  font-family: 'Inter';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-latin-wght-normal.woff2') format('woff2');
+  font-weight: 700;
+  src: url('./fonts/merriweather-latin-700-normal.woff2') format('woff2');
   unicode-range:
     U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
     U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-} /* inter-cyrillic-ext-wght-italic */
-@font-face {
-  font-family: 'Inter';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-cyrillic-ext-wght-italic.woff2') format('woff2');
-  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-
-/* inter-cyrillic-wght-italic */
-@font-face {
-  font-family: 'Inter';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-cyrillic-wght-italic.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 
-/* inter-greek-ext-wght-italic */
+/* merriweather-latin-ext-400-italic */
 @font-face {
-  font-family: 'Inter';
+  font-family: 'Merriweather';
   font-style: italic;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-greek-ext-wght-italic.woff2') format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-
-/* inter-greek-wght-italic */
-@font-face {
-  font-family: 'Inter';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-greek-wght-italic.woff2') format('woff2');
-  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
-}
-
-/* inter-vietnamese-wght-italic */
-@font-face {
-  font-family: 'Inter';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-vietnamese-wght-italic.woff2') format('woff2');
-  unicode-range:
-    U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301,
-    U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
-}
-
-/* inter-latin-ext-wght-italic */
-@font-face {
-  font-family: 'Inter';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-latin-ext-wght-italic.woff2') format('woff2');
+  font-weight: 400;
+  src: url('./fonts/merriweather-latin-ext-400-italic.woff2') format('woff2');
   unicode-range:
     U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329,
     U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F,
     U+A720-A7FF;
 }
 
-/* inter-latin-wght-italic */
+/* merriweather-latin-400-italic */
 @font-face {
-  font-family: 'Inter';
+  font-family: 'Merriweather';
   font-style: italic;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/inter-latin-wght-italic.woff2') format('woff2');
+  font-weight: 400;
+  src: url('./fonts/merriweather-latin-400-italic.woff2') format('woff2');
   unicode-range:
     U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
     U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 :root {
-  --font-geist: 'Geist', ui-sans-serif, system-ui, sans-serif;
-  --font-heading: var(--font-geist);
-  --font-sans: var(--font-geist);
-  --font-serif: var(--font-geist);
-  --font-display: var(--font-geist);
-  --font-mono: 'Geist Mono', ui-monospace, monospace;
-  --font-editorial-sans: 'Inter', ui-sans-serif, system-ui, sans-serif;
-  --font-marketing-sans: var(--font-editorial-sans);
-}
-
-/* The only shared Inter entry point. Product use is checked against an allowlist. */
-@utility font-editorial {
-  font-family: var(--font-editorial-sans);
+  --font-mono: 'JetBrains Mono', ui-monospace, monospace;
+  --font-sans: var(--font-mono);
+  --font-geist: var(--font-mono);
+  --font-display: var(--font-mono);
+  --font-editorial-sans: var(--font-mono);
+  --font-default: var(--font-mono);
+  --font-serif: 'Merriweather', ui-serif, Georgia, 'Times New Roman', serif;
+  --font-marketing-sans: var(--font-serif);
+  --font-heading: var(--font-serif);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warmio/design",
-  "version": "1.5.2",
+  "version": "1.7.0",
   "description": "Warm's public design contract: CSS tokens and Button/Logo primitives.",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,6 @@
     "themes.css",
     "components.css",
     "fonts",
-    "assets",
     "dist",
     "LICENSES"
   ],

package/theme.css

@@ -75,8 +75,17 @@
 
   /* Marketing surface and dot patterns (owned by design) */
   --marketing-surface: #f7f7f7;
-  --marketing-pattern-dots: url('./assets/subtle-dots.png');
-  --marketing-pattern-dots-dark: url('./assets/subtle-dots-dark.svg');
+  --marketing-pattern-dots-size: 5px 5px;
+  --marketing-pattern-dots: radial-gradient(
+    circle at 0.5px 0.5px,
+    oklch(0 0 0 / 0.08) 0.5px,
+    transparent 0.5px
+  );
+  --marketing-pattern-dots-dark: radial-gradient(
+    circle at 0.5px 0.5px,
+    oklch(1 0 0 / 0.08) 0.5px,
+    transparent 0.5px
+  );
 
   /* Charts */
   --chart-1: oklch(0.32 0 none);
@@ -194,11 +203,11 @@
      NON-COLOR TOKENS (shared across all themes)
      ══════════════════════════════════════════════════════════════════════════ */
 
-  /* Typography — CSS variables (--font-sans, --font-serif, --font-mono, --font-display)
-     are defined in the shared font styles and consumed across the app runtime. */
+  /* Typography — two families in fonts.css: JetBrains Mono default, Merriweather headings.
+     Role aliases (--font-sans, --font-display, --font-editorial-sans) resolve to mono; marketing/headings use serif. */
   --tracking-normal: 0em;
 
-  /* Spacing Scale */
+  /* Spacing Scale — --spacing is the Tailwind seed (0.25rem). Product surfaces use 0 / 8px / 16px only; xs/md/xl/2xl below are leftover advertised names, not product steps. */
   --spacing: 0.25rem;
   --spacing-xs: 0.25rem;
   --spacing-sm: 0.5rem;

package/LICENSES/inter-OFL-1.1.txt

@@ -1,93 +0,0 @@
-Copyright 2016 The Inter Project Authors (https://github.com/rsms/inter) Inter-Italic[opsz,wght].ttf: Copyright 2016 The Inter Project Authors (https://github.com/rsms/inter)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

package/assets/subtle-dots-dark.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="27" height="15" viewBox="0 0 27 15">
-  <defs>
-    <pattern id="dots" width="3" height="3" patternUnits="userSpaceOnUse">
-      <rect width="1" height="1" fill="#fff" fill-opacity=".14" />
-    </pattern>
-  </defs>
-  <rect width="27" height="15" fill="url(#dots)" />
-</svg>