@warmio/design 1.6.0 → 1.8.0

package/LICENSES/fluid-functionalism.txt

@@ -0,0 +1,24 @@
+Fluid Functionalism
+https://github.com/mickadesign/fluid-functionalism
+
+MIT License
+
+Copyright (c) 2026 Micka Touillaud
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/LICENSES/{geist-mono-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.git) GeistMono-Italic[wght].ttf: Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font.git)
+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/{source-serif-4-OFL-1.1.txt → merriweather-OFL-1.1.txt}

@@ -1,4 +1,4 @@
-Google Inc.
+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,18 +14,22 @@ import { Button, ButtonLink } from '@warmio/design/button';
 import { Logo, WarmLogoIcon } from '@warmio/design/logo';
 ```
 
-The product typefaces are Geist Mono for default UI and Source Serif 4 for
+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
 
+The next version, `1.8.0`, adds Fluid-derived surface-only Button press feedback.
+The label, hit target, and layout stay fixed. Reduced motion removes surface travel.
+The implementation uses native CSS and adds no JavaScript dependency.
+Upstream attribution is in `LICENSES/fluid-functionalism.txt`.
+
 Bump this `package.json` version for additive tokens (incl. motion/surface), fonts,
 spacing, or primitive changes. Follow the exact sequence in
 [docs/reference/DESIGN_PACKAGE.md](../../docs/reference/DESIGN_PACKAGE.md)

package/components.css

@@ -1,11 +1,13 @@
-/* @warmio/design components.css - token-only, parity with prior Button/Logo contract.
- * 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.
+/* @warmio/design components.css - Warm Button/Logo recipes.
+ * Colors, typography, geometry, and edges remain Warm-owned.
+ * Surface-only press feedback adapted from Fluid Functionalism (MIT):
+ * https://www.fluidfunctionalism.com/r/base/button.json
+ * Native CSS keeps the published primitive free of a motion runtime.
  */
 
 [data-warm-button] {
+  position: relative;
+  isolation: isolate;
   /* Strip native button chrome when this stylesheet is used without preflight.
    * `appearance` is deliberately left at its UA default (matches the
    * pre-migration PrimitiveButton/buttonVariants recipe, which never applied
@@ -41,6 +43,27 @@
   /* border handled by variant shadows/tokens; no default regression border */
 }
 
+/* Move only the painted surface, never the label or the hit target. Fluid's
+ * fixed 1px-per-edge collapse avoids width-dependent scaling of wide buttons.
+ * Warm gradients and edge shadows stay on this layer at their original bounds. */
+[data-warm-button]::before {
+  content: '';
+  position: absolute;
+  z-index: -1;
+  inset: 0;
+  border-radius: inherit;
+  background-color: transparent;
+  background-image: none;
+  background-clip: inherit;
+  box-shadow: none;
+  pointer-events: none;
+  transition-property: var(--button-surface-transition-property);
+  transition-duration:
+    calc(var(--motion-duration-fast) * 1.8), calc(var(--motion-duration-fast) * 0.8),
+    calc(var(--motion-duration-fast) * 1.8);
+  transition-timing-function: var(--button-press-easing);
+}
+
 [data-warm-button]:focus-visible {
   box-shadow: 0 0 0 var(--button-focus-ring)
     color-mix(in oklab, var(--ring) var(--button-mix-50), transparent);
@@ -50,89 +73,102 @@
   width: var(--button-width-full);
 }
 
-/* Active scale + full motion reduce (legacy: active:not-aria-[haspopup]:scale-[0.97] motion-reduce:transition-none motion-reduce:active:scale-100) */
-[data-warm-button]:active:not([aria-haspopup]) {
-  transform: scale(0.97);
+[data-warm-button]:not(:disabled):not([aria-disabled='true']):not(
+  [data-variant='arrow']
+):active::before {
+  inset: var(--button-press-inset);
+  transition-duration: calc(var(--motion-duration-fast) * 0.8);
 }
 
 @media (prefers-reduced-motion: reduce) {
-  [data-warm-button] {
+  [data-warm-button],
+  [data-warm-button]::before {
     transition: none;
   }
-  [data-warm-button]:active:not([aria-haspopup]) {
-    transform: none;
+  [data-warm-button]:not(:disabled):not([aria-disabled='true']):not(
+    [data-variant='arrow']
+  ):active::before {
+    inset: 0;
   }
 }
 
 /* Variants (from cva + overrides + edge; tokens for color/shadow/radius) */
 [data-warm-button][data-variant='default'] {
+  color: var(--button-primary-foreground);
+}
+[data-warm-button][data-variant='default']::before {
   background-color: var(--button-primary-bg);
   background-image: var(--button-primary-gradient);
-  color: var(--button-primary-foreground);
   box-shadow: var(--button-primary-shadow);
   /* no explicit border to avoid regression; shadow provides chrome */
 }
-[data-warm-button][data-variant='default']:hover {
+[data-warm-button][data-variant='default']:hover::before {
   background-color: var(--button-primary-hover);
   background-image: var(--button-primary-gradient-hover);
 }
-[data-warm-button][data-variant='default']:active {
+[data-warm-button][data-variant='default']:active::before {
   background-color: var(--button-primary-active);
 }
 
 [data-warm-button][data-variant='outline'] {
+  border-style: none;
+}
+[data-warm-button][data-variant='outline']::before {
   background-color: var(--background);
   box-shadow: var(--button-outline-shadow);
-  border-style: none;
 }
 [data-warm-button][data-variant='outline']:hover {
-  background-color: var(--muted);
   color: var(--foreground);
 }
-.dark [data-warm-button][data-variant='outline'] {
+[data-warm-button][data-variant='outline']:hover::before {
+  background-color: var(--muted);
+}
+.dark [data-warm-button][data-variant='outline']::before {
   background-color: var(--warm-surface-raised-dark, var(--input));
   box-shadow: var(--button-outline-shadow-inset);
 }
-.dark [data-warm-button][data-variant='outline']:hover {
+.dark [data-warm-button][data-variant='outline']:hover::before {
   background-color: var(--warm-surface-raised-hover-dark, var(--muted));
 }
 [data-warm-button][data-variant='outline']:disabled {
   opacity: 1;
-  background-color: var(--muted);
   color: var(--muted-foreground);
+}
+[data-warm-button][data-variant='outline']:disabled::before {
+  background-color: var(--muted);
   box-shadow: var(--button-outline-shadow);
 }
-.dark [data-warm-button][data-variant='outline']:disabled {
+.dark [data-warm-button][data-variant='outline']:disabled::before {
   background-color: color-mix(in oklab, var(--input) var(--button-mix-20), transparent);
   box-shadow: var(--button-outline-shadow-inset);
 }
 
-[data-warm-button][data-variant='ghost'] {
-  /* `background-color` (not the `background` shorthand): the shorthand
-     implicitly resets `background-clip` to its initial `border-box`,
-     diverging from the base recipe's `padding-box` (origin: `bg-clip-padding`
-     with no resting-state Tailwind `bg-*` utility on ghost). */
+[data-warm-button][data-variant='ghost']::before {
   background-color: transparent;
 }
 [data-warm-button][data-variant='ghost']:hover {
-  background-color: var(--muted);
   color: var(--foreground);
 }
-.dark [data-warm-button][data-variant='ghost']:hover {
+[data-warm-button][data-variant='ghost']:hover::before {
+  background-color: var(--muted);
+}
+.dark [data-warm-button][data-variant='ghost']:hover::before {
   background-color: color-mix(in oklab, var(--muted) var(--button-mix-50), transparent);
 }
 
 [data-warm-button][data-variant='destructive'] {
-  background-color: color-mix(in oklab, var(--destructive) var(--button-mix-10), transparent);
   color: var(--destructive);
 }
-[data-warm-button][data-variant='destructive']:hover {
+[data-warm-button][data-variant='destructive']::before {
+  background-color: color-mix(in oklab, var(--destructive) var(--button-mix-10), transparent);
+}
+[data-warm-button][data-variant='destructive']:hover::before {
   background-color: color-mix(in oklab, var(--destructive) var(--button-mix-20), transparent);
 }
-.dark [data-warm-button][data-variant='destructive'] {
+.dark [data-warm-button][data-variant='destructive']::before {
   background-color: color-mix(in oklab, var(--destructive) var(--button-mix-20), transparent);
 }
-.dark [data-warm-button][data-variant='destructive']:hover {
+.dark [data-warm-button][data-variant='destructive']:hover::before {
   background-color: color-mix(in oklab, var(--destructive) var(--button-mix-30), transparent);
 }
 
@@ -148,8 +184,10 @@
      shadow is deliberately NOT `!important`: promptCategory's own
      `shadow-xs` legitimately overrides apple's outline-style shadow (see
      the promptCategory rules above), matching origin exactly. */
-  background-color: var(--apple-button-background) !important;
   color: var(--apple-button-foreground) !important;
+}
+[data-warm-button][data-variant='apple']::before {
+  background-color: var(--apple-button-background) !important;
   box-shadow: var(--button-outline-shadow);
 }
 button[data-warm-button][data-variant='apple'] {
@@ -157,12 +195,14 @@ button[data-warm-button][data-variant='apple'] {
   background-clip: padding-box;
 }
 [data-warm-button][data-variant='apple']:hover {
+  color: var(--apple-button-foreground);
+}
+[data-warm-button][data-variant='apple']:hover::before {
   background-color: color-mix(
     in oklab,
     var(--apple-button-hover) var(--button-mix-90),
     transparent
   );
-  color: var(--apple-button-foreground);
 }
 [data-warm-button][data-variant='arrow'] {
   border-width: 0;
@@ -188,6 +228,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);
@@ -223,18 +269,6 @@ button[data-warm-button][data-variant='apple'] {
   height: var(--button-size-xs);
   padding: var(--button-padding-y-md);
 }
-[data-warm-button][data-presentation='assistantIcon']:not([data-explicit-size]):active:not(
-  [aria-haspopup]
-) {
-  transform: scale(0.9);
-}
-@media (prefers-reduced-motion: reduce) {
-  [data-warm-button][data-presentation='assistantIcon']:not([data-explicit-size]):active:not(
-    [aria-haspopup]
-  ) {
-    transform: none;
-  }
-}
 [data-warm-button][data-presentation='assistantRoundIcon']:not([data-explicit-size]) {
   /* old icon-round 36px */
   width: var(--button-height-icon);
@@ -265,7 +299,6 @@ button[data-warm-button][data-variant='apple'] {
 [data-warm-button][data-presentation='promptCategory']:not([data-explicit-size]) {
   height: var(--button-height-default);
   gap: var(--button-gap);
-  background-color: var(--background);
   padding-left: var(--button-padding-x);
   padding-right: var(--button-padding-x);
   font-size: var(--button-font-size);
@@ -273,11 +306,14 @@ button[data-warm-button][data-variant='apple'] {
   color: var(--foreground);
   transition-property: var(--button-transition-property-colors);
 }
+[data-warm-button][data-presentation='promptCategory']:not([data-explicit-size])::before {
+  background-color: var(--background);
+}
 /* legacy's `getButtonEdgeClassName` applies `shadow-xs!` (Tailwind's `!`
    important modifier) to every `default`-variant promptCategory button
    regardless of explicit/implicit sizing, overriding the default variant's
    own gradient shadow unconditionally; mirror that with `!important` here. */
-[data-warm-button][data-presentation='promptCategory'][data-variant='default'] {
+[data-warm-button][data-presentation='promptCategory'][data-variant='default']::before {
   box-shadow: var(--shadow-xs) !important;
 }
 /* buttonPresentationClasses.promptCategory's own (non-!important) `shadow-xs`
@@ -287,10 +323,10 @@ button[data-warm-button][data-variant='apple'] {
    default is already covered, unconditionally, by the rule above. */
 [data-warm-button][data-presentation='promptCategory']:not([data-explicit-size]):not(
   [data-variant='arrow']
-) {
+)::before {
   box-shadow: var(--shadow-xs) !important;
 }
-[data-warm-button][data-presentation='promptCategory']:hover {
+[data-warm-button][data-presentation='promptCategory']:hover::before {
   background-color: var(--muted);
 }
 [data-warm-button][data-presentation='promptOption']:not([data-explicit-size]) {
@@ -307,9 +343,11 @@ button[data-warm-button][data-variant='apple'] {
   background-clip: border-box;
 }
 [data-warm-button][data-presentation='sidebarIcon']:hover {
-  background-color: var(--sidebar-accent);
   color: var(--sidebar-accent-foreground);
 }
+[data-warm-button][data-presentation='sidebarIcon']:hover::before {
+  background-color: var(--sidebar-accent);
+}
 [data-warm-button][data-presentation='tableHeader']:not([data-explicit-size]) {
   height: auto;
   min-height: 0;
@@ -326,9 +364,11 @@ button[data-warm-button][data-variant='apple'] {
   color: var(--muted-foreground);
 }
 [data-warm-button][data-presentation='tableHeader']:hover {
-  background-color: transparent;
   color: var(--foreground);
 }
+[data-warm-button][data-presentation='tableHeader']:hover::before {
+  background-color: transparent;
+}
 [data-warm-button][data-presentation='touch']:not([data-explicit-size]) {
   min-height: var(--button-min-height-touch);
 }
@@ -346,13 +386,13 @@ button[data-warm-button][data-variant='apple'] {
   font-size: var(--button-font-size);
   font-weight: 400;
 }
-[data-warm-button][data-presentation='threadNew']:hover {
+[data-warm-button][data-presentation='threadNew']:hover::before {
   background-color: var(--muted);
 }
 [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`
@@ -394,9 +434,6 @@ button[data-warm-button][data-variant='apple'] {
   height: auto;
   padding: 0;
   gap: var(--button-gap);
-  background-color: transparent;
-  background-image: none;
-  box-shadow: none;
   border-radius: 0;
   color: var(--foreground);
   font-size: var(--button-font-size-base);
@@ -410,6 +447,11 @@ button[data-warm-button][data-variant='apple'] {
   line-height: var(--button-line-height-base);
   font-weight: 700;
 }
+[data-warm-button][data-variant='arrow'][data-variant='arrow']::before {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+}
 
 /* SVG rules (from cva) */
 [data-warm-button] svg {
@@ -469,9 +511,12 @@ button[data-warm-button][data-variant='apple'] {
 }
 [data-warm-button][data-variant='ghost'][aria-expanded='true'],
 [data-warm-button][data-variant='outline'][aria-expanded='true'] {
-  background-color: var(--muted);
   color: var(--foreground);
 }
+[data-warm-button][data-variant='ghost'][aria-expanded='true']::before,
+[data-warm-button][data-variant='outline'][aria-expanded='true']::before {
+  background-color: var(--muted);
+}
 
 /* Disabled base + variant overrides (keep full shadow/border for some) */
 [data-warm-button]:disabled {

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,284 +1,142 @@
 /*
- * Self-hosted variable fonts vendored from these exact OFL-1.1 releases:
- * @fontsource-variable/geist-mono@5.2.8 and
- * @fontsource-variable/source-serif-4@5.3.0.
+ * 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-mono-cyrillic-ext-wght-normal */
+/* jetbrains-mono-latin-ext-wght-normal */
 @font-face {
-  font-family: 'Geist Mono';
+  font-family: 'JetBrains 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 */
-@font-face {
-  font-family: 'Geist Mono';
-  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: 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-mono-latin-wght-normal */
+/* jetbrains-mono-latin-wght-normal */
 @font-face {
-  font-family: 'Geist Mono';
+  font-family: 'JetBrains Mono';
   font-style: normal;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-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-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 */
+/* jetbrains-mono-latin-ext-wght-italic */
 @font-face {
-  font-family: 'Geist Mono';
+  font-family: 'JetBrains 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 */
-@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');
+  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-mono-latin-wght-italic */
+/* jetbrains-mono-latin-wght-italic */
 @font-face {
-  font-family: 'Geist Mono';
+  font-family: 'JetBrains Mono';
   font-style: italic;
   font-display: swap;
-  font-weight: 100 900;
-  src: url('./fonts/geist-mono-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;
 }
 
-/* source-serif-4-cyrillic-ext-wght-normal */
-@font-face {
-  font-family: 'Source Serif 4';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
-}
-
-/* source-serif-4-cyrillic-wght-normal */
-@font-face {
-  font-family: 'Source Serif 4';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-cyrillic-wght-normal.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* source-serif-4-greek-wght-normal */
+/* merriweather-latin-ext-400-normal */
 @font-face {
-  font-family: 'Source Serif 4';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
+  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;
 }
 
-/* source-serif-4-vietnamese-wght-normal */
+/* merriweather-latin-400-normal */
 @font-face {
-  font-family: 'Source Serif 4';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-vietnamese-wght-normal.woff2') format('woff2');
+  font-weight: 400;
+  src: url('./fonts/merriweather-latin-400-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;
+    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;
 }
 
-/* source-serif-4-latin-ext-wght-normal */
+/* merriweather-latin-ext-700-normal */
 @font-face {
-  font-family: 'Source Serif 4';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
 }
 
-/* source-serif-4-latin-wght-normal */
+/* merriweather-latin-700-normal */
 @font-face {
-  font-family: 'Source Serif 4';
+  font-family: 'Merriweather';
   font-style: normal;
   font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
 }
 
-/* source-serif-4-cyrillic-ext-wght-italic */
-@font-face {
-  font-family: 'Source Serif 4';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
-}
-
-/* source-serif-4-cyrillic-wght-italic */
-@font-face {
-  font-family: 'Source Serif 4';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-cyrillic-wght-italic.woff2') format('woff2');
-  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-
-/* source-serif-4-greek-wght-italic */
-@font-face {
-  font-family: 'Source Serif 4';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
-}
-
-/* source-serif-4-vietnamese-wght-italic */
-@font-face {
-  font-family: 'Source Serif 4';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
-}
-
-/* source-serif-4-latin-ext-wght-italic */
+/* merriweather-latin-ext-400-italic */
 @font-face {
-  font-family: 'Source Serif 4';
+  font-family: 'Merriweather';
   font-style: italic;
   font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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;
 }
 
-/* source-serif-4-latin-wght-italic */
+/* merriweather-latin-400-italic */
 @font-face {
-  font-family: 'Source Serif 4';
+  font-family: 'Merriweather';
   font-style: italic;
   font-display: swap;
-  font-weight: 200 900;
-  src: url('./fonts/source-serif-4-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-mono: 'Geist Mono', ui-monospace, monospace;
+  --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-marketing-sans: var(--font-mono);
-  --font-serif: 'Source Serif 4', ui-serif, Georgia, 'Times New Roman', serif;
+  --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.6.0",
+  "version": "1.8.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

@@ -58,10 +58,10 @@
      SURFACES — From brand-neutral
      Backgrounds, cards, borders - subtle tinted neutrals.
      ══════════════════════════════════════════════════════════════════════════ */
-  --background: oklch(1 0 0);
+  --background: rgba(230, 230, 230, 1);
   --foreground: oklch(0.147 0 0);
-  --card: oklch(1 0 0);
-  --card-gradient-start: oklch(1 0 0);
+  --card: rgba(240, 240, 240, 1);
+  --card-gradient-start: rgba(240, 240, 240, 1);
   --card-foreground: var(--foreground);
   --popover: var(--card);
   --popover-foreground: var(--foreground);
@@ -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);
@@ -91,7 +100,7 @@
   /* ══════════════════════════════════════════════════════════════════════════
      SIDEBAR — Transparent to show body texture
      ══════════════════════════════════════════════════════════════════════════ */
-  --sidebar: oklch(0.986 0 0);
+  --sidebar: rgba(230, 230, 230, 1);
   --sidebar-foreground: var(--foreground);
   --sidebar-primary: var(--primary);
   --sidebar-primary-foreground: var(--primary-foreground);
@@ -194,11 +203,11 @@
      NON-COLOR TOKENS (shared across all themes)
      ══════════════════════════════════════════════════════════════════════════ */
 
-  /* Typography — two families in fonts.css: Geist Mono default, Source Serif 4 headings.
-     Role aliases (--font-sans, --font-display, --font-editorial-sans) resolve to those two. */
+  /* 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;
@@ -218,6 +227,8 @@
   --motion-distance-sm: 0.25rem;
   --motion-distance-md: 0.5rem;
   --motion-distance-lg: 1rem;
+  --button-press-inset: 1px;
+  --button-press-easing: cubic-bezier(0.23, 1, 0.32, 1);
 
   /* Aliases keep one scale; legacy names resolve to motion; chart uses slow (nonessential scale) */
   --transition-fast: var(--motion-duration-fast);
@@ -295,6 +306,7 @@
   --logo-letter-spacing: 0.025em;
   --logo-gap: 0.5rem;
   --button-transition-property: color, background-color, box-shadow, border-color, transform;
+  --button-surface-transition-property: inset, background-color, box-shadow;
   --button-transition-property-colors:
     color, background-color, border-color, outline-color, text-decoration-color, fill, stroke,
     --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
@@ -545,12 +557,12 @@
    ════════════════════════════════════════════════════════════════════════════ */
 .light {
   /* ─── Surfaces (light backgrounds from neutral) ─── */
-  --background: oklch(0.99 0 0);
+  --background: rgba(230, 230, 230, 1);
   --foreground: oklch(0.35 0 0);
-  --card: oklch(0.998 0 0);
-  --card-gradient-start: oklch(1 0 0);
-  --card-foreground: var(--foreground);
+  --card: rgba(240, 240, 240, 1);
+  --card-gradient-start: rgba(240, 240, 240, 1);
   --muted: oklch(0.917 0 0);
+  --sidebar: rgba(230, 230, 230, 1);
   --muted-foreground: oklch(0.532 0 0 / 0.8);
   --border: oklch(0.852 0 0);
 
@@ -787,5 +799,19 @@
   --shadow-lg: var(--shadow-lg);
   --shadow-xl: var(--shadow-xl);
   --shadow-2xl: var(--shadow-2xl);
-  --shadow-card-edge: var(--shadow-border);
+  --shadow-card-edge:
+    var(--shadow-border), inset 0 1px rgba(255, 255, 255, 1), inset 1px 0 rgba(255, 255, 255, 0.5),
+    inset -1px 0 rgba(255, 255, 255, 0.5);
+}
+
+/* Dark cards use an outer highlight instead of the light inset highlight. */
+.dark {
+  --shadow-card-edge:
+    var(--shadow-border), 0 1px rgba(255, 255, 255, 0.2), 1px 0 rgba(255, 255, 255, 0.1),
+    -1px 0 rgba(255, 255, 255, 0.1);
+}
+
+/* Dark cards use one simple outer edge highlight. */
+.dark .shadow-card-edge {
+  --tw-shadow: 0 -1px 0 #333;
 }

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>