@bearmenu/ui 0.8.36 → 0.8.38

package/dist/{chunk-TVEIUTBQ.js → chunk-IQIJCMG2.js}

@@ -61,7 +61,7 @@ var DialogContent = React.forwardRef(
         }, props), {
           children: [
             children,
-            showCloseButton && /* @__PURE__ */ jsxs(DialogPrimitive.Close, { className: "absolute right-4 top-4 inline-flex size-8 items-center justify-center rounded-lg text-muted-foreground opacity-70 transition-opacity hover:bg-accent hover:text-accent-foreground hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent", children: [
+            showCloseButton && /* @__PURE__ */ jsxs(DialogPrimitive.Close, { className: "absolute right-4 top-4 inline-flex size-8 items-center justify-center rounded-lg text-muted-foreground opacity-70 transition-opacity hover:bg-accent-subtle hover:text-foreground hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none", children: [
               /* @__PURE__ */ jsx(X, { className: "size-4" }),
               /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Close" })
             ] })

package/dist/{chunk-VCRXL7H5.js → chunk-PGQXVJXW.js}

@@ -1,4 +1,4 @@
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from './chunk-TVEIUTBQ.js';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from './chunk-IQIJCMG2.js';
 import { cn } from './chunk-FEK5XGZW.js';
 import { __objRest, __spreadValues, __spreadProps } from './chunk-MMUBH76A.js';
 import * as React from 'react';
@@ -122,7 +122,7 @@ var CommandItem = React.forwardRef((_a, ref) => {
       ref,
       className: cn(
         "relative flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm outline-none transition-colors",
-        "data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground",
+        "data-[selected=true]:bg-accent-subtle data-[selected=true]:text-foreground",
         "data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
         className
       )

package/dist/{chunk-F3XK34DV.js → chunk-TB2K5JN3.js}

@@ -5,12 +5,12 @@ import { cva } from 'class-variance-authority';
 import { jsx } from 'react/jsx-runtime';
 
 var toggleVariants = cva(
-  "inline-flex items-center justify-center gap-2 rounded-md text-sm font-semibold hover:bg-accent/50 hover:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors aria-invalid:ring-2 aria-invalid:ring-destructive/40 whitespace-nowrap",
+  "inline-flex items-center justify-center gap-2 rounded-md text-sm font-semibold hover:bg-accent-subtle hover:text-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors aria-invalid:ring-2 aria-invalid:ring-destructive/40 whitespace-nowrap",
   {
     variants: {
       variant: {
         default: "bg-transparent",
-        outline: "border border-border bg-transparent hover:bg-accent/50 hover:text-accent-foreground data-[state=on]:border-primary",
+        outline: "border border-border bg-transparent hover:bg-accent-subtle hover:text-foreground data-[state=on]:border-primary",
         /**
          * One cell of a segmented control: a raised card on the group's
          * muted capsule when on, quiet type when off. The group

package/dist/components/calendar.js

@@ -211,7 +211,7 @@ function CalendarDayButton(_a) {
       "data-range-end": modifiers.range_end,
       "data-range-middle": modifiers.range_middle,
       className: cn(
-        "group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground dark:hover:text-accent-foreground flex aspect-square h-(--cell-size) w-(--cell-size) size-auto min-w-0 flex-col items-center justify-center gap-1 rounded-md p-0 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md [&>span]:text-xs [&>span]:opacity-70",
+        "group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground flex aspect-square h-(--cell-size) w-(--cell-size) size-auto min-w-0 flex-col items-center justify-center gap-1 rounded-md p-0 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md [&>span]:text-xs [&>span]:opacity-70",
         defaultClassNames.day,
         className
       )

package/dist/components/combobox.js

@@ -1,6 +1,6 @@
 import { Popover, PopoverTrigger, PopoverContent } from '../chunk-2ADCZXZJ.js';
-import { Command, CommandInput, CommandList, CommandLoading, CommandEmpty, CommandGroup, CommandItem } from '../chunk-VCRXL7H5.js';
-import '../chunk-TVEIUTBQ.js';
+import { Command, CommandInput, CommandList, CommandLoading, CommandEmpty, CommandGroup, CommandItem } from '../chunk-PGQXVJXW.js';
+import '../chunk-IQIJCMG2.js';
 import { Button } from '../chunk-5SGKGFMN.js';
 import '../chunk-RIH2IS7X.js';
 import '../chunk-5YNIQ2BL.js';
@@ -93,7 +93,7 @@ function Combobox({
           e.stopPropagation();
           onValueChange(void 0);
         },
-        className: "absolute right-9 top-1/2 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1",
+        className: "absolute right-9 top-1/2 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1",
         children: /* @__PURE__ */ jsx(X, { className: "size-3.5" })
       }
     )

package/dist/components/command.js

@@ -1,4 +1,4 @@
-export { Command, CommandDialog, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList, CommandLoading, CommandSeparator, CommandShortcut } from '../chunk-VCRXL7H5.js';
-import '../chunk-TVEIUTBQ.js';
+export { Command, CommandDialog, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList, CommandLoading, CommandSeparator, CommandShortcut } from '../chunk-PGQXVJXW.js';
+import '../chunk-IQIJCMG2.js';
 import '../chunk-FEK5XGZW.js';
 import '../chunk-MMUBH76A.js';

package/dist/components/dialog.js

@@ -1,3 +1,3 @@
-export { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogOverlay, DialogPortal, DialogTitle, DialogTrigger, dialogContentVariants } from '../chunk-TVEIUTBQ.js';
+export { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogOverlay, DialogPortal, DialogTitle, DialogTrigger, dialogContentVariants } from '../chunk-IQIJCMG2.js';
 import '../chunk-FEK5XGZW.js';
 import '../chunk-MMUBH76A.js';

package/dist/components/dropdown-menu.js

@@ -62,7 +62,7 @@ function DropdownMenuItem(_a) {
       "data-inset": inset,
       "data-variant": variant,
       className: cn(
-        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "focus:bg-accent-subtle focus:text-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       )
     }, props)
@@ -85,7 +85,7 @@ function DropdownMenuCheckboxItem(_a) {
     __spreadProps(__spreadValues({
       "data-slot": "dropdown-menu-checkbox-item",
       className: cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "focus:bg-accent-subtle focus:text-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       ),
       checked
@@ -100,7 +100,7 @@ function DropdownMenuCheckboxItem(_a) {
             ),
             children: /* @__PURE__ */ jsx(DropdownMenuPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(CheckIcon, { className: "size-3" }) })
           }
-        ) : /* @__PURE__ */ jsx(DropdownMenuPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(CheckIcon, { className: "size-4" }) }) }),
+        ) : /* @__PURE__ */ jsx(DropdownMenuPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(CheckIcon, { className: "size-4 text-accent" }) }) }),
         children
       ]
     })
@@ -123,12 +123,12 @@ function DropdownMenuRadioItem(_a) {
     __spreadProps(__spreadValues({
       "data-slot": "dropdown-menu-radio-item",
       className: cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "focus:bg-accent-subtle focus:text-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       )
     }, props), {
       children: [
-        /* @__PURE__ */ jsx("span", { className: "pointer-events-none absolute left-2 flex size-3.5 items-center justify-center", children: /* @__PURE__ */ jsx(DropdownMenuPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(CircleIcon, { className: "size-2 fill-current" }) }) }),
+        /* @__PURE__ */ jsx("span", { className: "pointer-events-none absolute left-2 flex size-3.5 items-center justify-center", children: /* @__PURE__ */ jsx(DropdownMenuPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(CircleIcon, { className: "size-2 fill-current text-accent" }) }) }),
         children
       ]
     })
@@ -195,7 +195,7 @@ function DropdownMenuSubTrigger(_a) {
       "data-slot": "dropdown-menu-sub-trigger",
       "data-inset": inset,
       className: cn(
-        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8",
+        "focus:bg-accent-subtle focus:text-foreground data-[state=open]:bg-accent-subtle data-[state=open]:text-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8",
         className
       )
     }, props), {

package/dist/components/input-group.js

@@ -85,7 +85,7 @@ var InputGroupButton = React.forwardRef(
         type,
         "data-slot": "input-group-button",
         className: cn(
-          "inline-flex h-7 min-w-7 cursor-pointer items-center justify-center gap-1 rounded-md px-2 text-xs font-semibold text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&:has(svg:only-child)]:w-7 [&:has(svg:only-child)]:px-0 [&_svg]:size-4",
+          "inline-flex h-7 min-w-7 cursor-pointer items-center justify-center gap-1 rounded-md px-2 text-xs font-semibold text-muted-foreground transition-colors hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&:has(svg:only-child)]:w-7 [&:has(svg:only-child)]:px-0 [&_svg]:size-4",
           className
         )
       }, props)

package/dist/components/multi-select-combobox.js

@@ -1,7 +1,7 @@
 import { Checkbox } from '../chunk-L3CDXVEP.js';
 import { Popover, PopoverTrigger, PopoverContent } from '../chunk-2ADCZXZJ.js';
-import { Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from '../chunk-VCRXL7H5.js';
-import '../chunk-TVEIUTBQ.js';
+import { Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from '../chunk-PGQXVJXW.js';
+import '../chunk-IQIJCMG2.js';
 import { Button } from '../chunk-5SGKGFMN.js';
 import '../chunk-RIH2IS7X.js';
 import '../chunk-5YNIQ2BL.js';

package/dist/components/multi-select-menu.js

@@ -54,7 +54,7 @@ function MultiSelectMenu({
                 onCheckedChange: () => handleToggle(option.value),
                 className: cn(
                   "relative flex cursor-pointer select-none items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none",
-                  "data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground",
+                  "data-[highlighted]:bg-accent-subtle data-[highlighted]:text-foreground",
                   "data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
                 ),
                 children: [

package/dist/components/pan-zoom-viewport.d.ts

@@ -23,7 +23,9 @@ import * as React from 'react';
  * - Keyboard, with the viewport focused: arrows pan (Shift for four times the
  *   step); `+` / `-` zoom and `0` fits, from anywhere inside it. Tabbing onto
  *   a table that sits off screen pans it into view.
- * - The + / − / Fit controls, bottom right.
+ * - The + / − / Fit controls: a raised card 12px in from the bottom-right
+ *   corner, 44 × 44 per button. Fit and the pan bounds keep the content clear
+ *   of them.
  *
  * The min-scale floor: `Fit` never shrinks below `minScale`. On a phone the
  * plan would otherwise fit at a size no finger can hit, so below the floor it
@@ -96,8 +98,18 @@ type PanZoomViewportProps = Omit<React.HTMLAttributes<HTMLDivElement>, "children
     zoomStep?: number;
     /** One arrow press, in viewport px. Default 48. */
     panStep?: number;
-    /** The air Fit leaves around the content, and how far past it a pan may go. Default 24. */
+    /**
+     * The air Fit leaves around the content, and how far past it a pan may go.
+     * Default 24. With `controls` on, the side the control stack would cover
+     * (right or bottom, whichever costs the fit less) is widened to clear it.
+     */
     fitPadding?: number;
+    /**
+     * Where fitted content sits vertically when it is shorter than the
+     * viewport: `center` (default), or `top` — pinned under the top padding,
+     * as a phone shows a plan.
+     */
+    fitAlign?: "center" | "top";
     /** Render the + / − / Fit controls. Default true. */
     controls?: boolean;
     /** Called with every transform — gestures included, so keep it cheap. */
@@ -122,8 +134,18 @@ declare const PanZoomViewport: React.ForwardRefExoticComponent<Omit<React.HTMLAt
     zoomStep?: number;
     /** One arrow press, in viewport px. Default 48. */
     panStep?: number;
-    /** The air Fit leaves around the content, and how far past it a pan may go. Default 24. */
+    /**
+     * The air Fit leaves around the content, and how far past it a pan may go.
+     * Default 24. With `controls` on, the side the control stack would cover
+     * (right or bottom, whichever costs the fit less) is widened to clear it.
+     */
     fitPadding?: number;
+    /**
+     * Where fitted content sits vertically when it is shorter than the
+     * viewport: `center` (default), or `top` — pinned under the top padding,
+     * as a phone shows a plan.
+     */
+    fitAlign?: "center" | "top";
     /** Render the + / − / Fit controls. Default true. */
     controls?: boolean;
     /** Called with every transform — gestures included, so keep it cheap. */

package/dist/components/pan-zoom-viewport.js

@@ -12,12 +12,21 @@ var DRAG_THRESHOLD = 4;
 var MAX_WHEEL_ZOOM_DELTA = 25;
 var WHEEL_ZOOM_SPEED = 0.01;
 var EPSILON = 1e-3;
+var CONTROLS_RESERVE_X = 12 + 44 + 8;
+var CONTROLS_RESERVE_Y = 12 + 130 + 8;
 function clamp(value, min, max) {
   return Math.min(max, Math.max(min, value));
 }
-function clampAxis(offset, content, viewport, pad) {
-  if (content + pad * 2 <= viewport) return (viewport - content) / 2;
-  return clamp(offset, viewport - content - pad, pad);
+function clampAxis(offset, content, viewport, start, end, align) {
+  const room = viewport - start - end;
+  if (content <= room) return align === "start" ? start : start + (room - content) / 2;
+  return clamp(offset, viewport - content - end, start);
+}
+function fitScale(viewport, insets, contentWidth, contentHeight) {
+  return Math.min(
+    (viewport.width - insets.left - insets.right) / contentWidth,
+    (viewport.height - insets.top - insets.bottom) / contentHeight
+  );
 }
 function distance(a, b) {
   return Math.hypot(a.x - b.x, a.y - b.y);
@@ -40,6 +49,7 @@ var PanZoomViewport = React.forwardRef(
       zoomStep = 1.25,
       panStep = 48,
       fitPadding = 24,
+      fitAlign = "center",
       controls = true,
       onTransformChange,
       apiRef,
@@ -55,6 +65,7 @@ var PanZoomViewport = React.forwardRef(
       "zoomStep",
       "panStep",
       "fitPadding",
+      "fitAlign",
       "controls",
       "onTransformChange",
       "apiRef",
@@ -79,26 +90,37 @@ var PanZoomViewport = React.forwardRef(
       onTransformChangeRef.current = onTransformChange;
       zoomLevelRef.current = labels.zoomLevel;
     });
+    const insets = React.useMemo(() => {
+      const base = { top: fitPadding, right: fitPadding, bottom: fitPadding, left: fitPadding };
+      if (!controls || !viewport) return base;
+      const right = __spreadProps(__spreadValues({}, base), { right: Math.max(fitPadding, CONTROLS_RESERVE_X) });
+      const bottom = __spreadProps(__spreadValues({}, base), { bottom: Math.max(fitPadding, CONTROLS_RESERVE_Y) });
+      return fitScale(viewport, bottom, contentWidth, contentHeight) > fitScale(viewport, right, contentWidth, contentHeight) ? bottom : right;
+    }, [controls, viewport, fitPadding, contentWidth, contentHeight]);
     const clampTransform = React.useCallback(
       (next) => {
         if (!viewport || viewport.width <= 0 || viewport.height <= 0) return next;
         const scale = clamp(next.scale, minScale, maxScale);
         return {
           scale,
-          x: clampAxis(next.x, contentWidth * scale, viewport.width, fitPadding),
-          y: clampAxis(next.y, contentHeight * scale, viewport.height, fitPadding)
+          x: clampAxis(next.x, contentWidth * scale, viewport.width, insets.left, insets.right, "center"),
+          y: clampAxis(
+            next.y,
+            contentHeight * scale,
+            viewport.height,
+            insets.top,
+            insets.bottom,
+            fitAlign === "top" ? "start" : "center"
+          )
         };
       },
-      [viewport, minScale, maxScale, contentWidth, contentHeight, fitPadding]
+      [viewport, minScale, maxScale, contentWidth, contentHeight, insets, fitAlign]
     );
     const fitted = React.useCallback(() => {
       if (!viewport || viewport.width <= 0 || viewport.height <= 0) return null;
-      const scale = Math.min(
-        (viewport.width - fitPadding * 2) / contentWidth,
-        (viewport.height - fitPadding * 2) / contentHeight
-      );
-      return clampTransform({ scale, x: fitPadding, y: fitPadding });
-    }, [viewport, fitPadding, contentWidth, contentHeight, clampTransform]);
+      const scale = fitScale(viewport, insets, contentWidth, contentHeight);
+      return clampTransform({ scale, x: insets.left, y: insets.top });
+    }, [viewport, insets, contentWidth, contentHeight, clampTransform]);
     const commit = React.useCallback(
       (next, options) => {
         var _a2;
@@ -382,13 +404,13 @@ var PanZoomViewport = React.forwardRef(
       if (pressing.current || event.target === event.currentTarget) return;
       const bounds = event.currentTarget.getBoundingClientRect();
       const rect = event.target.getBoundingClientRect();
-      const margin = fitPadding;
       let dx = 0;
       let dy = 0;
-      if (rect.left < bounds.left + margin) dx = bounds.left + margin - rect.left;
-      else if (rect.right > bounds.right - margin) dx = bounds.right - margin - rect.right;
-      if (rect.top < bounds.top + margin) dy = bounds.top + margin - rect.top;
-      else if (rect.bottom > bounds.bottom - margin) dy = bounds.bottom - margin - rect.bottom;
+      if (rect.left < bounds.left + insets.left) dx = bounds.left + insets.left - rect.left;
+      else if (rect.right > bounds.right - insets.right) dx = bounds.right - insets.right - rect.right;
+      if (rect.top < bounds.top + insets.top) dy = bounds.top + insets.top - rect.top;
+      else if (rect.bottom > bounds.bottom - insets.bottom)
+        dy = bounds.bottom - insets.bottom - rect.bottom;
       if (dx !== 0 || dy !== 0) panBy(dx, dy);
     };
     const scaledWidth = contentWidth * transform.scale;
@@ -479,14 +501,14 @@ var PanZoomViewport = React.forwardRef(
               orientation: "vertical",
               "aria-label": labels.controls,
               "data-slot": "pan-zoom-viewport-controls",
-              className: "absolute bottom-3 right-3 rounded-xl bg-card shadow-sm",
+              className: "absolute bottom-3 right-3 rounded-xl bg-card shadow-[var(--shadow-card)]",
               children: [
                 /* @__PURE__ */ jsx(
                   Button,
                   {
                     type: "button",
                     variant: "outline",
-                    size: "icon-sm",
+                    size: "icon",
                     "aria-label": labels.zoomIn,
                     disabled: atMax,
                     onClick: zoomIn,
@@ -498,7 +520,7 @@ var PanZoomViewport = React.forwardRef(
                   {
                     type: "button",
                     variant: "outline",
-                    size: "icon-sm",
+                    size: "icon",
                     "aria-label": labels.zoomOut,
                     disabled: atMin,
                     onClick: zoomOut,
@@ -510,7 +532,7 @@ var PanZoomViewport = React.forwardRef(
                   {
                     type: "button",
                     variant: "outline",
-                    size: "icon-sm",
+                    size: "icon",
                     className: "text-xs font-semibold",
                     onClick: fit,
                     children: labels.fit

package/dist/components/responsive-overlay.js

@@ -1,7 +1,7 @@
 import { useMediaQuery, DESKTOP_MEDIA_QUERY } from '../chunk-OPVKL4VS.js';
 import { Sheet, SheetContent, SheetTitle, SheetDescription } from '../chunk-LAEVMNJN.js';
 import { Drawer, DrawerContent, DrawerTitle, DrawerDescription } from '../chunk-XLHMF6F5.js';
-import { Dialog, DialogContent, DialogTitle, DialogDescription } from '../chunk-TVEIUTBQ.js';
+import { Dialog, DialogContent, DialogTitle, DialogDescription } from '../chunk-IQIJCMG2.js';
 import { cn } from '../chunk-FEK5XGZW.js';
 import { __spreadProps, __spreadValues } from '../chunk-MMUBH76A.js';
 import * as React from 'react';

package/dist/components/searchable-select.js

@@ -1,6 +1,6 @@
 import { Popover, PopoverTrigger, PopoverContent } from '../chunk-2ADCZXZJ.js';
-import { Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from '../chunk-VCRXL7H5.js';
-import '../chunk-TVEIUTBQ.js';
+import { Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from '../chunk-PGQXVJXW.js';
+import '../chunk-IQIJCMG2.js';
 import { Button } from '../chunk-5SGKGFMN.js';
 import '../chunk-RIH2IS7X.js';
 import '../chunk-5YNIQ2BL.js';
@@ -99,7 +99,7 @@ function SearchableSelect({
           e.stopPropagation();
           onValueChange(void 0);
         },
-        className: "absolute right-9 top-1/2 -translate-y-1/2 inline-flex size-6 items-center justify-center rounded-full text-muted-foreground hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors",
+        className: "absolute right-9 top-1/2 -translate-y-1/2 inline-flex size-6 items-center justify-center rounded-full text-muted-foreground hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors",
         children: /* @__PURE__ */ jsx(X, { className: "size-3.5" })
       }
     )

package/dist/components/select.js

@@ -118,12 +118,12 @@ var SelectItem = React.forwardRef((_a, ref) => {
       ref,
       "data-slot": "select-item",
       className: cn(
-        "relative flex w-full cursor-default select-none items-center rounded-md py-2 pl-8 pr-2 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[state=checked]:font-semibold",
+        "relative flex w-full cursor-default select-none items-center rounded-md py-2 pl-8 pr-2 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[highlighted]:bg-accent-subtle data-[highlighted]:text-foreground data-[state=checked]:font-semibold",
         className
       )
     }, props), {
       children: [
-        /* @__PURE__ */ jsx("span", { className: "absolute left-2 flex size-3.5 items-center justify-center", children: /* @__PURE__ */ jsx(SelectPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(Check, { className: "size-4" }) }) }),
+        /* @__PURE__ */ jsx("span", { className: "absolute left-2 flex size-3.5 items-center justify-center", children: /* @__PURE__ */ jsx(SelectPrimitive.ItemIndicator, { children: /* @__PURE__ */ jsx(Check, { className: "size-4 text-accent" }) }) }),
         /* @__PURE__ */ jsx(SelectPrimitive.ItemText, { children })
       ]
     })

package/dist/components/selection-bar.js

@@ -43,7 +43,7 @@ var SelectionBar = React.forwardRef(
                 type: "button",
                 "aria-label": "Clear selection",
                 onClick: onClear,
-                className: "inline-flex size-6 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+                className: "inline-flex size-6 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
                 children: /* @__PURE__ */ jsx(X, { className: "size-4" })
               }
             ),

package/dist/components/toggle-group.js

@@ -1,4 +1,4 @@
-import { toggleVariants } from '../chunk-F3XK34DV.js';
+import { toggleVariants } from '../chunk-TB2K5JN3.js';
 import { cn } from '../chunk-FEK5XGZW.js';
 import { __objRest, __spreadProps, __spreadValues } from '../chunk-MMUBH76A.js';
 import * as React from 'react';

package/dist/components/toggle.d.ts

@@ -4,6 +4,12 @@ import * as React from 'react';
 import * as TogglePrimitive from '@radix-ui/react-toggle';
 import { VariantProps } from 'class-variance-authority';
 
+/**
+ * Hover is a step of the surface (`--accent-subtle`), as Button's quiet
+ * variants do. The shadcn default, `hover:bg-accent/50 hover:text-accent-foreground`,
+ * put white type on a half-strength terracotta: 2.2:1. The on-state's
+ * `data-[state=on]:` utilities sort after `hover:` and still win while on.
+ */
 declare const toggleVariants: (props?: ({
     variant?: "default" | "tab" | "outline" | "chip" | "segmented" | null | undefined;
     size?: "default" | "sm" | "lg" | null | undefined;

package/dist/components/toggle.js

@@ -1,3 +1,3 @@
-export { Toggle, toggleVariants } from '../chunk-F3XK34DV.js';
+export { Toggle, toggleVariants } from '../chunk-TB2K5JN3.js';
 import '../chunk-FEK5XGZW.js';
 import '../chunk-MMUBH76A.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bearmenu/ui",
-  "version": "0.8.36",
+  "version": "0.8.38",
   "description": "BearMenu design system — shared UI tokens, primitives, and components",
   "license": "UNLICENSED",
   "repository": {

package/src/components/calendar.tsx

@@ -238,7 +238,7 @@ function CalendarDayButton({
       data-range-end={modifiers.range_end}
       data-range-middle={modifiers.range_middle}
       className={cn(
-        "group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground dark:hover:text-accent-foreground flex aspect-square h-(--cell-size) w-(--cell-size) size-auto min-w-0 flex-col items-center justify-center gap-1 rounded-md p-0 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md [&>span]:text-xs [&>span]:opacity-70",
+        "group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground flex aspect-square h-(--cell-size) w-(--cell-size) size-auto min-w-0 flex-col items-center justify-center gap-1 rounded-md p-0 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md [&>span]:text-xs [&>span]:opacity-70",
         defaultClassNames.day,
         className
       )}

package/src/components/combobox.tsx

@@ -124,7 +124,7 @@ function Combobox({
             e.stopPropagation();
             onValueChange(undefined);
           }}
-          className="absolute right-9 top-1/2 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1"
+          className="absolute right-9 top-1/2 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1"
         >
           <X className="size-3.5" />
         </button>

package/src/components/command.test.tsx

@@ -88,4 +88,14 @@ describe("Command", () => {
     await user.keyboard("{ArrowDown}{Enter}");
     expect(onSelect).toHaveBeenCalledWith("banana");
   });
+
+  it("highlights the selected row with the subtle well, not the accent fill", () => {
+    render(<CommandSample />);
+    const row = screen.getByRole("option", { name: "Apple" });
+    expect(row).toHaveClass(
+      "data-[selected=true]:bg-accent-subtle",
+      "data-[selected=true]:text-foreground"
+    );
+    expect(row).not.toHaveClass("data-[selected=true]:bg-accent");
+  });
 });

package/src/components/command.tsx

@@ -138,7 +138,7 @@ const CommandItem = React.forwardRef<
     ref={ref}
     className={cn(
       "relative flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm outline-none transition-colors",
-      "data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground",
+      "data-[selected=true]:bg-accent-subtle data-[selected=true]:text-foreground",
       "data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
       className
     )}

package/src/components/dialog.tsx

@@ -79,7 +79,7 @@ const DialogContent = React.forwardRef<
       >
         {children}
         {showCloseButton && (
-          <DialogPrimitive.Close className="absolute right-4 top-4 inline-flex size-8 items-center justify-center rounded-lg text-muted-foreground opacity-70 transition-opacity hover:bg-accent hover:text-accent-foreground hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent">
+          <DialogPrimitive.Close className="absolute right-4 top-4 inline-flex size-8 items-center justify-center rounded-lg text-muted-foreground opacity-70 transition-opacity hover:bg-accent-subtle hover:text-foreground hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none">
             <X className="size-4" />
             <span className="sr-only">Close</span>
           </DialogPrimitive.Close>

package/src/components/dropdown-menu.test.tsx

@@ -177,4 +177,35 @@ describe("DropdownMenu", () => {
     expect(screen.getByText("Group")).toBeInTheDocument();
     expect(document.querySelector("[data-slot=dropdown-menu-separator]")).not.toBeNull();
   });
+
+  // A highlighted row is a tinted well with ink type; terracotta is kept for
+  // the checked indicators. A solid-accent row read as a second primary.
+  it("highlights rows with the subtle well and marks checked items in the accent", async () => {
+    const user = userEvent.setup();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem>One</DropdownMenuItem>
+          <DropdownMenuCheckboxItem checked>Two</DropdownMenuCheckboxItem>
+          <DropdownMenuRadioGroup value="a">
+            <DropdownMenuRadioItem value="a">Three</DropdownMenuRadioItem>
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    const rows = [
+      screen.getByRole("menuitem", { name: "One" }),
+      screen.getByRole("menuitemcheckbox", { name: "Two" }),
+      screen.getByRole("menuitemradio", { name: "Three" }),
+    ];
+    for (const row of rows) {
+      expect(row).toHaveClass("focus:bg-accent-subtle", "focus:text-foreground");
+      expect(row).not.toHaveClass("focus:bg-accent");
+      expect(row).not.toHaveClass("focus:text-accent-foreground");
+    }
+    expect(rows[1]?.querySelector("svg")).toHaveClass("text-accent");
+    expect(rows[2]?.querySelector("svg")).toHaveClass("text-accent");
+  });
 });

package/src/components/dropdown-menu.tsx

@@ -67,7 +67,7 @@ function DropdownMenuItem({
       data-inset={inset}
       data-variant={variant}
       className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "focus:bg-accent-subtle focus:text-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       )}
       {...props}
@@ -89,7 +89,7 @@ function DropdownMenuCheckboxItem({
     <DropdownMenuPrimitive.CheckboxItem
       data-slot="dropdown-menu-checkbox-item"
       className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "focus:bg-accent-subtle focus:text-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       )}
       checked={checked}
@@ -111,7 +111,7 @@ function DropdownMenuCheckboxItem({
           </span>
         ) : (
           <DropdownMenuPrimitive.ItemIndicator>
-            <CheckIcon className="size-4" />
+            <CheckIcon className="size-4 text-accent" />
           </DropdownMenuPrimitive.ItemIndicator>
         )}
       </span>
@@ -135,14 +135,14 @@ function DropdownMenuRadioItem({
     <DropdownMenuPrimitive.RadioItem
       data-slot="dropdown-menu-radio-item"
       className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "focus:bg-accent-subtle focus:text-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       )}
       {...props}
     >
       <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
         <DropdownMenuPrimitive.ItemIndicator>
-          <CircleIcon className="size-2 fill-current" />
+          <CircleIcon className="size-2 fill-current text-accent" />
         </DropdownMenuPrimitive.ItemIndicator>
       </span>
       {children}
@@ -207,7 +207,7 @@ function DropdownMenuSubTrigger({
       data-slot="dropdown-menu-sub-trigger"
       data-inset={inset}
       className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8",
+        "focus:bg-accent-subtle focus:text-foreground data-[state=open]:bg-accent-subtle data-[state=open]:text-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8",
         className
       )}
       {...props}

package/src/components/input-group.tsx

@@ -92,7 +92,7 @@ const InputGroupButton = React.forwardRef<HTMLButtonElement, React.ButtonHTMLAtt
       type={type}
       data-slot="input-group-button"
       className={cn(
-        "inline-flex h-7 min-w-7 cursor-pointer items-center justify-center gap-1 rounded-md px-2 text-xs font-semibold text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&:has(svg:only-child)]:w-7 [&:has(svg:only-child)]:px-0 [&_svg]:size-4",
+        "inline-flex h-7 min-w-7 cursor-pointer items-center justify-center gap-1 rounded-md px-2 text-xs font-semibold text-muted-foreground transition-colors hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&:has(svg:only-child)]:w-7 [&:has(svg:only-child)]:px-0 [&_svg]:size-4",
         className
       )}
       {...props}

package/src/components/multi-select-menu.tsx

@@ -81,7 +81,7 @@ export function MultiSelectMenu({
                     onCheckedChange={() => handleToggle(option.value)}
                     className={cn(
                       "relative flex cursor-pointer select-none items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none",
-                      "data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground",
+                      "data-[highlighted]:bg-accent-subtle data-[highlighted]:text-foreground",
                       "data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
                     )}
                   >

package/src/components/pan-zoom-viewport.stories.tsx

@@ -60,7 +60,7 @@ const meta: Meta<typeof PanZoomViewport> = {
     docs: {
       description: {
         component:
-          "A window onto a plan that pans and zooms: drag, pinch, trackpad pinch or ctrl-wheel, arrows / + / − / 0 on the focused viewport, and the + / − / Fit controls. Fit never goes below `minScale`; past the floor the plan anchors top-left and the edges it runs past are shaded. Every string is injected through `labels`.",
+          "A window onto a plan that pans and zooms: drag, pinch, trackpad pinch or ctrl-wheel, arrows / + / − / 0 on the focused viewport, and the + / − / Fit controls (44px each, on a raised card inset 12px; Fit keeps the plan clear of them). `fitAlign=\"top\"` pins a short plan to the top. Fit never goes below `minScale`; past the floor the plan anchors top-left and the edges it runs past are shaded. Every string is injected through `labels`.",
       },
     },
   },
@@ -104,6 +104,26 @@ export const PhoneAtTheFloor: Story = {
   ),
 };
 
+/**
+ * floor/07-f0 phone, pinned to the top: `fitAlign="top"` holds a plan shorter
+ * than the viewport under the top padding instead of centring it. The controls
+ * float 12px in on a raised card, 44px per button, and the fit keeps clear of them.
+ */
+export const PhonePinnedTop: Story = {
+  render: () => (
+    <PanZoomViewport
+      contentWidth={1200}
+      contentHeight={800}
+      minScale={0.25}
+      fitAlign="top"
+      labels={labels}
+      className="h-[640px] w-[390px] border-y border-border bg-background"
+    >
+      <DemoPlan />
+    </PanZoomViewport>
+  ),
+};
+
 /** Driving it from outside: a "Show T12" link, a reset. */
 export const Imperative: Story = {
   render: () => {

package/src/components/pan-zoom-viewport.test.tsx

@@ -85,14 +85,34 @@ function renderOnAPhone(props: Partial<PanZoomViewportProps> = {}) {
 describe("PanZoomViewport", () => {
   describe("fit", () => {
     it("fits the content inside its padding and centres it", () => {
-      renderViewport();
+      renderViewport({ controls: false });
       // min((800 - 48) / 400, (600 - 48) / 300) = 1.84 → 736 × 552.
       expect(transformOf()).toEqual({ x: 32, y: 24, scale: 1.84 });
       expect(content()).not.toHaveClass("invisible");
     });
 
+    it("keeps the fitted content clear of the controls, on the side that costs least", () => {
+      renderViewport();
+      // Right side widened to 64: min((800 - 88) / 400, (600 - 48) / 300) = 1.78
+      // → 712 × 534. Widening the bottom to 150 would cost more: 426 / 300 = 1.42.
+      // Its right edge lands at 736, 64 in: past the 12px inset and the 44px stack.
+      expect(transformOf()).toEqual({ x: 24, y: 33, scale: 1.78 });
+    });
+
+    it("widens the bottom instead when that leaves the bigger fit", () => {
+      viewportSize = { width: 400, height: 800 };
+      renderViewport({ contentWidth: 400, contentHeight: 300 });
+      // Bottom: min(352 / 400, 626 / 300) = 0.88. Right: 312 / 400 = 0.78.
+      expect(transformOf()).toEqual({ x: 24, y: 24 + (626 - 264) / 2, scale: 0.88 });
+    });
+
+    it("pins fitted content to the top with fitAlign top", () => {
+      renderViewport({ fitAlign: "top" });
+      expect(transformOf()).toEqual({ x: 24, y: 24, scale: 1.78 });
+    });
+
     it("stops at the floor, anchors top-left and shades the edge that runs on", () => {
-      renderOnAPhone();
+      renderOnAPhone({ controls: false });
       // The fit would be 0.285; the floor holds it at 0.5 → 600 × 400.
       // Too wide: anchored at the padding. Short enough: centred.
       expect(transformOf()).toEqual({ x: 24, y: 50, scale: 0.5 });
@@ -102,6 +122,17 @@ describe("PanZoomViewport", () => {
       expect(edgeVisible("bottom")).toBe(false);
     });
 
+    it("lets a plan under the controls pan clear of them", () => {
+      renderOnAPhone();
+      // Bottom widened to 150 (the smaller loss here): 400 tall no longer fits
+      // the 326 left, so it anchors at the top and may pan up by 74.
+      expect(transformOf()).toEqual({ x: 24, y: 24, scale: 0.5 });
+      expect(edgeVisible("bottom")).toBe(false);
+      surface().focus();
+      fireEvent.keyDown(surface(), { key: "ArrowDown", shiftKey: true });
+      expect(transformOf().y).toBe(500 - 400 - 150);
+    });
+
     it("never fits above the ceiling", () => {
       renderViewport({ contentWidth: 100, contentHeight: 100, maxScale: 2 });
       expect(transformOf().scale).toBe(2);
@@ -112,10 +143,22 @@ describe("PanZoomViewport", () => {
     it("zooms in and out by one step about the centre", async () => {
       renderViewport();
       await userEvent.click(screen.getByRole("button", { name: "Zoom out" }));
-      // 1.84 / 1.25 = 1.472 → 588.8 × 441.6, centred.
-      expect(transformOf()).toEqual({ x: 105.6, y: 79.2, scale: 1.472 });
+      // 1.78 / 1.25 = 1.424 → 569.6 × 427.2, centred between the paddings.
+      expect(transformOf()).toEqual({ x: 95.2, y: 86.4, scale: 1.424 });
       await userEvent.click(screen.getByRole("button", { name: "Zoom in" }));
-      expect(transformOf().scale).toBe(1.84);
+      expect(transformOf().scale).toBe(1.78);
+    });
+
+    it("gives every control a 44px hit area on a raised card", () => {
+      renderViewport();
+      for (const name of ["Zoom in", "Zoom out", "Fit"]) {
+        expect(screen.getByRole("button", { name })).toHaveClass("h-11", "w-11");
+      }
+      expect(screen.getByRole("group", { name: "Zoom" })).toHaveClass(
+        "bottom-3",
+        "right-3",
+        "shadow-[var(--shadow-card)]"
+      );
     });
 
     it("disables zoom out at the floor and zoom in at the ceiling", async () => {
@@ -175,7 +218,7 @@ describe("PanZoomViewport", () => {
     });
 
     it("zooms with + and -, and fits with 0", async () => {
-      renderViewport();
+      renderViewport({ controls: false });
       surface().focus();
       await userEvent.keyboard("+");
       expect(transformOf().scale).toBe(2.3);
@@ -195,7 +238,7 @@ describe("PanZoomViewport", () => {
     });
 
     it("announces the zoom level through the injected formatter", async () => {
-      renderViewport();
+      renderViewport({ controls: false });
       surface().focus();
       await userEvent.keyboard("+");
       expect(screen.getByText("230%")).toBeInTheDocument();
@@ -281,7 +324,7 @@ describe("PanZoomViewport", () => {
     });
 
     it("zooms with a two-finger pinch about the fingers", () => {
-      renderViewport();
+      renderViewport({ controls: false });
       const touch = (id: number, x: number, y: number) => ({
         pointerId: id,
         pointerType: "touch",
@@ -316,7 +359,7 @@ describe("PanZoomViewport", () => {
     });
 
     it("caps one ctrl-wheel notch so a mouse wheel does not jump", () => {
-      renderViewport({ maxScale: 10 });
+      renderViewport({ maxScale: 10, controls: false });
       wheel({ deltaY: -100, ctrlKey: true, clientX: 400, clientY: 300 });
       expect(transformOf().scale).toBeCloseTo(1.84 * Math.exp(0.25), 2);
     });
@@ -339,7 +382,7 @@ describe("PanZoomViewport", () => {
     it("drives the view from outside and reports every transform", () => {
       const api = React.createRef<PanZoomViewportHandle>();
       const onTransformChange = vi.fn();
-      renderOnAPhone({ apiRef: api, onTransformChange });
+      renderOnAPhone({ apiRef: api, onTransformChange, controls: false });
       expect(onTransformChange).toHaveBeenLastCalledWith({ scale: 0.5, x: 24, y: 50 });
 
       act(() => api.current?.centerOn(1000, 400));
@@ -355,9 +398,9 @@ describe("PanZoomViewport", () => {
     });
 
     it("refits when the plan changes size", () => {
-      const view = renderViewport();
+      const view = renderViewport({ controls: false });
       view.rerender(
-        <PanZoomViewport contentWidth={800} contentHeight={600} labels={labels}>
+        <PanZoomViewport contentWidth={800} contentHeight={600} labels={labels} controls={false}>
           <button type="button">T1</button>
         </PanZoomViewport>
       );
@@ -366,11 +409,17 @@ describe("PanZoomViewport", () => {
     });
 
     it("keeps a panned view, pulled inside the bounds, when the plan changes", async () => {
-      const view = renderOnAPhone();
+      const view = renderOnAPhone({ controls: false });
       surface().focus();
       await userEvent.keyboard("{Shift>}{ArrowRight}{/Shift}");
       view.rerender(
-        <PanZoomViewport contentWidth={700} contentHeight={800} minScale={0.5} labels={labels}>
+        <PanZoomViewport
+          contentWidth={700}
+          contentHeight={800}
+          minScale={0.5}
+          labels={labels}
+          controls={false}
+        >
           <button type="button">T1</button>
         </PanZoomViewport>
       );

package/src/components/pan-zoom-viewport.tsx

@@ -29,7 +29,9 @@ import { ButtonGroup } from "./button-group";
  * - Keyboard, with the viewport focused: arrows pan (Shift for four times the
  *   step); `+` / `-` zoom and `0` fits, from anywhere inside it. Tabbing onto
  *   a table that sits off screen pans it into view.
- * - The + / − / Fit controls, bottom right.
+ * - The + / − / Fit controls: a raised card 12px in from the bottom-right
+ *   corner, 44 × 44 per button. Fit and the pan bounds keep the content clear
+ *   of them.
  *
  * The min-scale floor: `Fit` never shrinks below `minScale`. On a phone the
  * plan would otherwise fit at a size no finger can hit, so below the floor it
@@ -106,8 +108,18 @@ export type PanZoomViewportProps = Omit<React.HTMLAttributes<HTMLDivElement>, "c
   zoomStep?: number;
   /** One arrow press, in viewport px. Default 48. */
   panStep?: number;
-  /** The air Fit leaves around the content, and how far past it a pan may go. Default 24. */
+  /**
+   * The air Fit leaves around the content, and how far past it a pan may go.
+   * Default 24. With `controls` on, the side the control stack would cover
+   * (right or bottom, whichever costs the fit less) is widened to clear it.
+   */
   fitPadding?: number;
+  /**
+   * Where fitted content sits vertically when it is shorter than the
+   * viewport: `center` (default), or `top` — pinned under the top padding,
+   * as a phone shows a plan.
+   */
+  fitAlign?: "center" | "top";
   /** Render the + / − / Fit controls. Default true. */
   controls?: boolean;
   /** Called with every transform — gestures included, so keep it cheap. */
@@ -120,6 +132,7 @@ export type PanZoomViewportProps = Omit<React.HTMLAttributes<HTMLDivElement>, "c
 
 type Size = { width: number; height: number };
 type Point = { x: number; y: number };
+type Insets = { top: number; right: number; bottom: number; left: number };
 
 type Gesture =
   | { kind: "idle" }
@@ -136,19 +149,40 @@ const DRAG_THRESHOLD = 4;
 const MAX_WHEEL_ZOOM_DELTA = 25;
 const WHEEL_ZOOM_SPEED = 0.01;
 const EPSILON = 0.001;
+/**
+ * The control stack's footprint plus air: `bottom-3 right-3` (12px), three
+ * 44px buttons sharing borders (44 × 130), and 8px before the content.
+ */
+const CONTROLS_RESERVE_X = 12 + 44 + 8;
+const CONTROLS_RESERVE_Y = 12 + 130 + 8;
 
 function clamp(value: number, min: number, max: number) {
   return Math.min(max, Math.max(min, value));
 }
 
 /**
- * One axis. Content that fits (with its padding) is centred and cannot move;
- * content that does not may pan until its far edge is `pad` inside the
- * viewport's, and no further.
+ * One axis. Content that fits between its paddings is centred between them
+ * (or held at the start one) and cannot move; content that does not may pan
+ * until its far edge is `end` inside the viewport's, and no further.
  */
-function clampAxis(offset: number, content: number, viewport: number, pad: number) {
-  if (content + pad * 2 <= viewport) return (viewport - content) / 2;
-  return clamp(offset, viewport - content - pad, pad);
+function clampAxis(
+  offset: number,
+  content: number,
+  viewport: number,
+  start: number,
+  end: number,
+  align: "center" | "start"
+) {
+  const room = viewport - start - end;
+  if (content <= room) return align === "start" ? start : start + (room - content) / 2;
+  return clamp(offset, viewport - content - end, start);
+}
+
+function fitScale(viewport: Size, insets: Insets, contentWidth: number, contentHeight: number) {
+  return Math.min(
+    (viewport.width - insets.left - insets.right) / contentWidth,
+    (viewport.height - insets.top - insets.bottom) / contentHeight
+  );
 }
 
 function distance(a: Point, b: Point) {
@@ -178,6 +212,7 @@ const PanZoomViewport = React.forwardRef<HTMLDivElement, PanZoomViewportProps>(
       zoomStep = 1.25,
       panStep = 48,
       fitPadding = 24,
+      fitAlign = "center",
       controls = true,
       onTransformChange,
       apiRef,
@@ -211,29 +246,47 @@ const PanZoomViewport = React.forwardRef<HTMLDivElement, PanZoomViewportProps>(
       zoomLevelRef.current = labels.zoomLevel;
     });
 
+    // The padding on each side. The control stack covers the bottom-right
+    // corner: keep the content clear of it by widening the right side or the
+    // bottom one — whichever leaves the bigger fit.
+    const insets = React.useMemo((): Insets => {
+      const base = { top: fitPadding, right: fitPadding, bottom: fitPadding, left: fitPadding };
+      if (!controls || !viewport) return base;
+      const right = { ...base, right: Math.max(fitPadding, CONTROLS_RESERVE_X) };
+      const bottom = { ...base, bottom: Math.max(fitPadding, CONTROLS_RESERVE_Y) };
+      return fitScale(viewport, bottom, contentWidth, contentHeight) >
+        fitScale(viewport, right, contentWidth, contentHeight)
+        ? bottom
+        : right;
+    }, [controls, viewport, fitPadding, contentWidth, contentHeight]);
+
     const clampTransform = React.useCallback(
       (next: PanZoomTransform): PanZoomTransform => {
         if (!viewport || viewport.width <= 0 || viewport.height <= 0) return next;
         const scale = clamp(next.scale, minScale, maxScale);
         return {
           scale,
-          x: clampAxis(next.x, contentWidth * scale, viewport.width, fitPadding),
-          y: clampAxis(next.y, contentHeight * scale, viewport.height, fitPadding),
+          x: clampAxis(next.x, contentWidth * scale, viewport.width, insets.left, insets.right, "center"),
+          y: clampAxis(
+            next.y,
+            contentHeight * scale,
+            viewport.height,
+            insets.top,
+            insets.bottom,
+            fitAlign === "top" ? "start" : "center"
+          ),
         };
       },
-      [viewport, minScale, maxScale, contentWidth, contentHeight, fitPadding]
+      [viewport, minScale, maxScale, contentWidth, contentHeight, insets, fitAlign]
     );
 
     const fitted = React.useCallback((): PanZoomTransform | null => {
       if (!viewport || viewport.width <= 0 || viewport.height <= 0) return null;
-      const scale = Math.min(
-        (viewport.width - fitPadding * 2) / contentWidth,
-        (viewport.height - fitPadding * 2) / contentHeight
-      );
+      const scale = fitScale(viewport, insets, contentWidth, contentHeight);
       // Start from the padded top-left: content under the floor overflows and
-      // stays anchored there; content that fits is centred by the clamp.
-      return clampTransform({ scale, x: fitPadding, y: fitPadding });
-    }, [viewport, fitPadding, contentWidth, contentHeight, clampTransform]);
+      // stays anchored there; content that fits is placed by the clamp.
+      return clampTransform({ scale, x: insets.left, y: insets.top });
+    }, [viewport, insets, contentWidth, contentHeight, clampTransform]);
 
     const commit = React.useCallback(
       (
@@ -574,13 +627,13 @@ const PanZoomViewport = React.forwardRef<HTMLDivElement, PanZoomViewportProps>(
       if (pressing.current || event.target === event.currentTarget) return;
       const bounds = event.currentTarget.getBoundingClientRect();
       const rect = event.target.getBoundingClientRect();
-      const margin = fitPadding;
       let dx = 0;
       let dy = 0;
-      if (rect.left < bounds.left + margin) dx = bounds.left + margin - rect.left;
-      else if (rect.right > bounds.right - margin) dx = bounds.right - margin - rect.right;
-      if (rect.top < bounds.top + margin) dy = bounds.top + margin - rect.top;
-      else if (rect.bottom > bounds.bottom - margin) dy = bounds.bottom - margin - rect.bottom;
+      if (rect.left < bounds.left + insets.left) dx = bounds.left + insets.left - rect.left;
+      else if (rect.right > bounds.right - insets.right) dx = bounds.right - insets.right - rect.right;
+      if (rect.top < bounds.top + insets.top) dy = bounds.top + insets.top - rect.top;
+      else if (rect.bottom > bounds.bottom - insets.bottom)
+        dy = bounds.bottom - insets.bottom - rect.bottom;
       if (dx !== 0 || dy !== 0) panBy(dx, dy);
     };
 
@@ -674,12 +727,14 @@ const PanZoomViewport = React.forwardRef<HTMLDivElement, PanZoomViewportProps>(
             orientation="vertical"
             aria-label={labels.controls}
             data-slot="pan-zoom-viewport-controls"
-            className="absolute bottom-3 right-3 rounded-xl bg-card shadow-sm"
+            // A raised card floating 12px in. The DS's default icon size, so
+            // every hit area is 44 × 44 at any width.
+            className="absolute bottom-3 right-3 rounded-xl bg-card shadow-[var(--shadow-card)]"
           >
             <Button
               type="button"
               variant="outline"
-              size="icon-sm"
+              size="icon"
               aria-label={labels.zoomIn}
               disabled={atMax}
               onClick={zoomIn}
@@ -689,7 +744,7 @@ const PanZoomViewport = React.forwardRef<HTMLDivElement, PanZoomViewportProps>(
             <Button
               type="button"
               variant="outline"
-              size="icon-sm"
+              size="icon"
               aria-label={labels.zoomOut}
               disabled={atMin}
               onClick={zoomOut}
@@ -699,7 +754,7 @@ const PanZoomViewport = React.forwardRef<HTMLDivElement, PanZoomViewportProps>(
             <Button
               type="button"
               variant="outline"
-              size="icon-sm"
+              size="icon"
               className="text-xs font-semibold"
               onClick={fit}
             >

package/src/components/searchable-select.tsx

@@ -120,7 +120,7 @@ export function SearchableSelect({
             e.stopPropagation();
             onValueChange(undefined);
           }}
-          className="absolute right-9 top-1/2 -translate-y-1/2 inline-flex size-6 items-center justify-center rounded-full text-muted-foreground hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors"
+          className="absolute right-9 top-1/2 -translate-y-1/2 inline-flex size-6 items-center justify-center rounded-full text-muted-foreground hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors"
         >
           <X className="size-3.5" />
         </button>

package/src/components/select.tsx

@@ -126,14 +126,14 @@ const SelectItem = React.forwardRef<
     ref={ref}
     data-slot="select-item"
     className={cn(
-      "relative flex w-full cursor-default select-none items-center rounded-md py-2 pl-8 pr-2 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[state=checked]:font-semibold",
+      "relative flex w-full cursor-default select-none items-center rounded-md py-2 pl-8 pr-2 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[highlighted]:bg-accent-subtle data-[highlighted]:text-foreground data-[state=checked]:font-semibold",
       className
     )}
     {...props}
   >
     <span className="absolute left-2 flex size-3.5 items-center justify-center">
       <SelectPrimitive.ItemIndicator>
-        <Check className="size-4" />
+        <Check className="size-4 text-accent" />
       </SelectPrimitive.ItemIndicator>
     </span>
     <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>

package/src/components/selection-bar.tsx

@@ -46,7 +46,7 @@ const SelectionBar = React.forwardRef<HTMLDivElement, SelectionBarProps>(
               type="button"
               aria-label="Clear selection"
               onClick={onClear}
-              className="inline-flex size-6 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              className="inline-flex size-6 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-accent-subtle hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
             >
               <X className="size-4" />
             </button>

package/src/components/toggle.test.tsx

@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+
+import { toggleVariants } from "./toggle";
+
+describe("toggleVariants", () => {
+  // White on a half-strength terracotta measured 2.2:1. Hover steps the
+  // surface instead, as Button's quiet variants do; the on-state keeps the fill.
+  it("default and outline tint on hover and keep the accent fill for the on-state", () => {
+    for (const variant of ["default", "outline"] as const) {
+      const classes = toggleVariants({ variant });
+      expect(classes).toContain("hover:bg-accent-subtle");
+      expect(classes).toContain("hover:text-foreground");
+      expect(classes).not.toContain("hover:bg-accent/50");
+      expect(classes).not.toContain("hover:text-accent-foreground");
+      expect(classes).toContain("data-[state=on]:bg-accent");
+      expect(classes).toContain("data-[state=on]:text-accent-foreground");
+    }
+  });
+});

package/src/components/toggle.tsx

@@ -6,14 +6,20 @@ import { cva, type VariantProps } from "class-variance-authority";
 
 import { cn } from "../lib/utils";
 
+/**
+ * Hover is a step of the surface (`--accent-subtle`), as Button's quiet
+ * variants do. The shadcn default, `hover:bg-accent/50 hover:text-accent-foreground`,
+ * put white type on a half-strength terracotta: 2.2:1. The on-state's
+ * `data-[state=on]:` utilities sort after `hover:` and still win while on.
+ */
 const toggleVariants = cva(
-  "inline-flex items-center justify-center gap-2 rounded-md text-sm font-semibold hover:bg-accent/50 hover:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors aria-invalid:ring-2 aria-invalid:ring-destructive/40 whitespace-nowrap",
+  "inline-flex items-center justify-center gap-2 rounded-md text-sm font-semibold hover:bg-accent-subtle hover:text-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 transition-colors aria-invalid:ring-2 aria-invalid:ring-destructive/40 whitespace-nowrap",
   {
     variants: {
       variant: {
         default: "bg-transparent",
         outline:
-          "border border-border bg-transparent hover:bg-accent/50 hover:text-accent-foreground data-[state=on]:border-primary",
+          "border border-border bg-transparent hover:bg-accent-subtle hover:text-foreground data-[state=on]:border-primary",
         /**
          * One cell of a segmented control: a raised card on the group's
          * muted capsule when on, quiet type when off. The group

package/src/globals.css

@@ -130,14 +130,19 @@ h6 {
   --ink-secondary: oklch(0.45 0 0);
   --ink-tertiary: oklch(0.52 0 0);
   --radius: 0.625rem;
-  --sidebar: oklch(0.985 0 0);
-  --sidebar-foreground: oklch(0.145 0 0);
-  --sidebar-primary: oklch(0.205 0 0);
-  --sidebar-primary-foreground: oklch(0.985 0 0);
-  --sidebar-accent: oklch(0.97 0 0);
-  --sidebar-accent-foreground: oklch(0.205 0 0);
-  --sidebar-border: oklch(0.922 0 0);
-  --sidebar-ring: oklch(0.708 0 0);
+  /* Chrome is the card surface — no third tone. The sidebar aliases the card
+     and the shared roles instead of carrying shadcn's factory greys (and, in
+     dark, a stray blue primary). `.dark` restates the same aliases: a custom
+     property resolves where it is declared, so a `.dark` placed below :root
+     would otherwise inherit the light values. */
+  --sidebar: var(--card);
+  --sidebar-foreground: var(--card-foreground);
+  --sidebar-primary: var(--primary);
+  --sidebar-primary-foreground: var(--primary-foreground);
+  --sidebar-accent: var(--accent-subtle);
+  --sidebar-accent-foreground: var(--foreground);
+  --sidebar-border: var(--border);
+  --sidebar-ring: var(--ring);
   --success: oklch(0.48 0.17 150);
   --success-foreground: oklch(0.985 0 0);
   --warning: oklch(0.72 0.18 68);
@@ -330,8 +335,9 @@ h6 {
   --accent: oklch(0.66 0.09 45);
   --accent-foreground: oklch(0.155 0.01 45);
   --accent-subtle: oklch(0.255 0.022 45);
-  /* AA-compliant on dark surfaces but dialed back from 0.68 to soften eye strain */
-  --destructive: oklch(0.58 0.17 25.7);
+  /* Dialed back from 0.68 to soften eye strain; 0.575 rather than 0.58 so
+     white on it clears AA (4.56:1, was 4.46:1). */
+  --destructive: oklch(0.575 0.17 25.7);
   --destructive-foreground: oklch(0.985 0 0);
   /** Lifted for text on `--card`, where the solid token measures ~3.8:1. */
   --destructive-ink: oklch(0.72 0.15 25);
@@ -368,16 +374,19 @@ h6 {
      in dark, elevation is carried by the scrim and by lightness, not by a
      shadow nobody can see. */
   --scrim-overlay: oklch(0.05 0.01 55 / 0.78);
-  --sidebar: oklch(0.205 0 0);
-  --sidebar-foreground: oklch(0.985 0 0);
-  --sidebar-primary: oklch(0.488 0.243 264.376);
-  --sidebar-primary-foreground: oklch(0.985 0 0);
-  --sidebar-accent: oklch(0.269 0 0);
-  --sidebar-accent-foreground: oklch(0.985 0 0);
-  --sidebar-border: oklch(0.269 0 0);
-  --sidebar-ring: oklch(0.439 0 0);
+  --sidebar: var(--card);
+  --sidebar-foreground: var(--card-foreground);
+  --sidebar-primary: var(--primary);
+  --sidebar-primary-foreground: var(--primary-foreground);
+  --sidebar-accent: var(--accent-subtle);
+  --sidebar-accent-foreground: var(--foreground);
+  --sidebar-border: var(--border);
+  --sidebar-ring: var(--ring);
   --success: oklch(0.63 0.17 150);
-  --success-foreground: oklch(0.985 0 0);
+  /* Dark type on the fill, as --primary and --accent do in dark: white on
+     this green measured 3.12:1, and darkening the fill to reach 4.5:1 would
+     cost it a tenth of lightness and its presence on the card. 6.01:1. */
+  --success-foreground: oklch(0.155 0.01 45);
   --warning: oklch(0.76 0.15 68);
   --warning-foreground: oklch(0.18 0.04 45);