Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve Admin UI styling

Damian Legawiece100aa92a0cb
diff --git a/packages/admin/src/components/spree/drag-handle.tsx b/packages/admin/src/components/spree/drag-handle.tsx
index 46717eb78c..a8a6bf6761 100644
--- a/packages/admin/src/components/spree/drag-handle.tsx
+++ b/packages/admin/src/components/spree/drag-handle.tsx
@@ -36,7 +36,7 @@ export function DragHandle({ attributes, listeners, className, ...props }: DragH
type="button"
aria-label="Drag to reorder"
className={cn(
- 'flex h-full w-full items-center justify-center rounded-lg p-3 text-muted-foreground cursor-grab active:cursor-grabbing hover:bg-accent',
+ 'flex h-full w-full items-center justify-center rounded-lg p-2 text-muted-foreground cursor-grab active:cursor-grabbing hover:bg-accent',
className,
)}
{...attributes}
diff --git a/packages/admin/src/components/spree/export-button.tsx b/packages/admin/src/components/spree/export-button.tsx
index 7b798e3375..5e3eaa686e 100644
--- a/packages/admin/src/components/spree/export-button.tsx
+++ b/packages/admin/src/components/spree/export-button.tsx
@@ -135,8 +135,10 @@ function RadioOption({
aria-pressed={selected}
className={cn(
'flex items-start gap-3 rounded-lg border p-3 text-left transition-colors',
- 'hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
- selected ? 'border-primary bg-muted/30' : 'border-border',
+ 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+ selected
+ ? 'border-blue-300 bg-blue-50 dark:border-blue-500/60 dark:bg-blue-500/10'
+ : 'border-border hover:bg-muted/50',
)}
>
<span className="mt-0.5 text-muted-foreground">{icon}</span>
@@ -147,7 +149,7 @@ function RadioOption({
<span
className={cn(
'mt-1 size-4 shrink-0 rounded-full border',
- selected ? 'border-primary bg-primary' : 'border-border',
+ selected ? 'border-blue-600 bg-blue-600' : 'border-border',
)}
>
{selected && (
diff --git a/packages/admin/src/components/spree/promotion-editors/match-policy-picker.tsx b/packages/admin/src/components/spree/promotion-editors/match-policy-picker.tsx
index cd6befc45a..07b8b29928 100644
--- a/packages/admin/src/components/spree/promotion-editors/match-policy-picker.tsx
+++ b/packages/admin/src/components/spree/promotion-editors/match-policy-picker.tsx
@@ -38,7 +38,7 @@ export function MatchPolicyPicker<TValue extends string>({
className={cn(
'flex flex-col items-start gap-0.5 rounded-lg border p-3 text-left transition-colors',
active
- ? 'border-blue-500 bg-blue-50 dark:border-blue-500/60 dark:bg-blue-500/10'
+ ? 'border-blue-300 bg-blue-50 dark:border-blue-500/60 dark:bg-blue-500/10'
: 'hover:bg-muted',
)}
aria-pressed={active}
diff --git a/packages/admin/src/components/spree/resource-table.tsx b/packages/admin/src/components/spree/resource-table.tsx
index 61d1a9380f..1f87ef05eb 100644
--- a/packages/admin/src/components/spree/resource-table.tsx
+++ b/packages/admin/src/components/spree/resource-table.tsx
@@ -321,7 +321,7 @@ export function ResourceTable<T extends Record<string, any>>({
: actions
return (
- <Card className="rounded-2xl">
+ <Card className="rounded-xl">
<TableToolbar
columns={displayableColumns}
visibleColumns={visibleColumnKeys}
@@ -468,7 +468,7 @@ function SortableRow<T extends Record<string, any>>({
isDragging && 'relative z-10 opacity-70',
)}
>
- <TableCell className="w-8 touch-none p-0">
+ <TableCell className="w-8 touch-none">
<DragHandle attributes={attributes} listeners={listeners} />
</TableCell>
{columns.map((col) => (
diff --git a/packages/admin/src/components/spree/secret-input.tsx b/packages/admin/src/components/spree/secret-input.tsx
index f85a7bd0ba..21ab61bc3a 100644
--- a/packages/admin/src/components/spree/secret-input.tsx
+++ b/packages/admin/src/components/spree/secret-input.tsx
@@ -57,7 +57,7 @@ export function SecretInput({
<Field>
<FieldLabel htmlFor={id}>{label}</FieldLabel>
<div className="flex items-center gap-2">
- <div className="flex min-h-9 w-full min-w-0 items-center rounded-lg border border-border bg-muted/40 px-2.5 py-1.5 shadow-xs">
+ <div className="flex min-h-8 w-full min-w-0 items-center rounded-lg border border-border bg-muted/40 px-2.5 py-1.5 shadow-xs">
<span className="font-mono text-sm tabular-nums text-muted-foreground" id={id}>
{storedMask}
</span>
diff --git a/packages/admin/src/components/spree/settings-sidebar.tsx b/packages/admin/src/components/spree/settings-sidebar.tsx
index 90337bdd80..534a08e2b9 100644
--- a/packages/admin/src/components/spree/settings-sidebar.tsx
+++ b/packages/admin/src/components/spree/settings-sidebar.tsx
@@ -52,7 +52,7 @@ export function SettingsSidebar({ open }: { open: boolean }) {
className={cn(
'sticky top-0 z-30 hidden h-svh shrink-0 self-start overflow-hidden bg-sidebar text-sidebar-foreground transition-[width,border-color] duration-200 ease-out lg:block',
open
- ? 'lg:w-(--spacing-sidebar-width) border-r border-sidebar-border'
+ ? 'lg:w-(--spacing-sidebar-width) border-r border-border/50'
: 'lg:w-0 border-r-0 border-transparent',
)}
>
diff --git a/packages/admin/src/components/spree/top-bar.tsx b/packages/admin/src/components/spree/top-bar.tsx
index 2abc7f2f42..6c26809a96 100644
--- a/packages/admin/src/components/spree/top-bar.tsx
+++ b/packages/admin/src/components/spree/top-bar.tsx
@@ -34,7 +34,7 @@ const IS_MAC = typeof navigator !== 'undefined' && /Mac|iPhone|iPad/.test(naviga
*/
export function TopBar() {
return (
- <header className="sticky top-0 z-40 flex h-header-height shrink-0 items-center gap-3 bg-background/90 px-4 shadow-[inset_0_-1px_0_var(--color-border)] backdrop-blur supports-[backdrop-filter]:bg-background/75">
+ <header className="sticky top-0 z-40 flex h-header-height shrink-0 items-center gap-3 bg-background/90 px-4 border-b border-border/50 backdrop-blur supports-[backdrop-filter]:bg-background/75">
<SidebarTrigger className="-ml-1 h-8 w-8" />
<div className="flex flex-1 justify-center">
@@ -60,7 +60,7 @@ function SearchTrigger() {
<button
type="button"
onClick={() => setOpen(true)}
- className="flex w-full max-w-md items-center gap-2 rounded-lg border border-border bg-muted/40 px-3 py-1.5 text-sm text-muted-foreground transition-colors hover:bg-muted"
+ className="flex w-full max-w-md items-center gap-2 rounded-lg border border-border bg-muted/40 px-2 py-1.5 text-sm text-muted-foreground transition-colors hover:bg-muted"
>
<SearchIcon className="size-4" />
<span className="flex-1 text-left">Search products, orders, customers…</span>
diff --git a/packages/admin/src/components/ui/badge.tsx b/packages/admin/src/components/ui/badge.tsx
index ee2c000d24..6cdfbdd57d 100644
--- a/packages/admin/src/components/ui/badge.tsx
+++ b/packages/admin/src/components/ui/badge.tsx
@@ -18,7 +18,8 @@ const badgeVariants = cva(
// mode bumps text to `green-400` so it stays legible on dark fills.
success:
'bg-green-500/15 text-green-700 dark:bg-green-500/15 dark:text-green-400 [a]:hover:bg-green-500/25',
- outline: 'border-border text-foreground [a]:hover:bg-muted [a]:hover:text-muted-foreground',
+ outline:
+ 'border-border text-foreground/75 [a]:hover:bg-muted [a]:hover:text-muted-foreground',
ghost: 'hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50',
link: 'text-primary underline-offset-4 hover:underline',
},
@@ -124,7 +125,7 @@ function ActiveBadge({
}) {
if (active) {
return (
- <Badge variant="outline" className={className}>
+ <Badge variant="success" className={className}>
<CheckIcon />
{activeLabel}
</Badge>
@@ -133,11 +134,7 @@ function ActiveBadge({
if (dashWhenInactive) {
return <span className={cn('text-muted-foreground', className)}>—</span>
}
- return (
- <Badge variant="ghost" className={className}>
- {inactiveLabel}
- </Badge>
- )
+ return <Badge variant="outline">{inactiveLabel}</Badge>
}
export { ActiveBadge, Badge, badgeVariants, StatusBadge }
diff --git a/packages/admin/src/components/ui/data-table.tsx b/packages/admin/src/components/ui/data-table.tsx
index 1429af3569..244f59bc60 100644
--- a/packages/admin/src/components/ui/data-table.tsx
+++ b/packages/admin/src/components/ui/data-table.tsx
@@ -27,7 +27,7 @@ function TableHead({ className, ...props }: React.ComponentProps<'th'>) {
return (
<th
className={cn(
- 'text-left text-sm font-medium text-muted-foreground bg-muted py-2 px-3 border-b border-border whitespace-nowrap first:pl-4 last:pr-4',
+ 'text-left text-sm font-medium text-muted-foreground bg-muted p-2 border-b border-border whitespace-nowrap first:pl-4 last:pr-4',
className,
)}
{...props}
@@ -39,7 +39,7 @@ function TableCell({ className, ...props }: React.ComponentProps<'td'>) {
return (
<td
className={cn(
- 'py-4 px-3 border-b border-border align-middle first:pl-4 last:pr-4 group-last/row:first:rounded-bl-xl group-last/row:last:rounded-br-xl',
+ 'py-3 px-2 border-b border-border align-middle first:pl-4 last:pr-4 group-last/row:first:rounded-bl-xl group-last/row:last:rounded-br-xl',
className,
)}
{...props}
diff --git a/packages/admin/src/components/ui/dialog.tsx b/packages/admin/src/components/ui/dialog.tsx
index 09ba772318..1abfe91e19 100644
--- a/packages/admin/src/components/ui/dialog.tsx
+++ b/packages/admin/src/components/ui/dialog.tsx
@@ -104,7 +104,7 @@ function DialogContent({
<DialogPrimitive.Popup
data-slot="dialog-content"
className={cn(
- 'fixed top-1/2 left-1/2 z-50 flex w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-xl border border-border bg-background text-foreground text-sm shadow-sm duration-100 outline-none sm:max-w-[500px] data-[starting-style]:opacity-0 data-[starting-style]:scale-95 data-[ending-style]:opacity-0 data-[ending-style]:scale-95 transition-[opacity,transform]',
+ 'fixed top-1/2 left-1/2 z-50 flex w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-xl border border-border bg-card text-foreground text-sm shadow-sm duration-100 outline-none sm:max-w-[500px] data-[starting-style]:opacity-0 data-[starting-style]:scale-95 data-[ending-style]:opacity-0 data-[ending-style]:scale-95 transition-[opacity,transform]',
className,
)}
style={{ maxHeight: '90vh' }}
diff --git a/packages/admin/src/components/ui/input.tsx b/packages/admin/src/components/ui/input.tsx
index 42d912c6c5..79245ca682 100644
--- a/packages/admin/src/components/ui/input.tsx
+++ b/packages/admin/src/components/ui/input.tsx
@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
type={type}
data-slot="input"
className={cn(
- 'block w-full min-w-0 min-h-9 rounded-lg border border-border bg-card py-1.5 px-2.5 text-base font-normal leading-normal text-foreground shadow-xs transition-all duration-100 ease-in-out outline-none placeholder:text-muted-foreground focus:border-blue-500 focus:shadow-[0_0_0_3px_rgba(59,130,246,0.15)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive file:inline-flex file:h-6 file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground',
+ 'block w-full min-w-0 min-h-8 rounded-lg border border-border bg-card py-1.5 px-2.5 text-base font-normal leading-normal text-foreground shadow-xs transition-all duration-100 ease-in-out outline-none placeholder:text-muted-foreground focus:border-blue-500 focus:shadow-[0_0_0_3px_rgba(59,130,246,0.15)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive file:inline-flex file:h-6 file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground',
className,
)}
{...props}
diff --git a/packages/admin/src/components/ui/select.tsx b/packages/admin/src/components/ui/select.tsx
index 0c4c7391df..0f7d34cc53 100644
--- a/packages/admin/src/components/ui/select.tsx
+++ b/packages/admin/src/components/ui/select.tsx
@@ -59,7 +59,7 @@ function SelectTrigger({
// doesn't collapse to chevron-height when the SelectValue render-prop
// returns an empty string (e.g., when value is unset and the
// placeholder isn't surfaced through the render-prop).
- "flex w-full min-h-9 items-center justify-between gap-1.5 rounded-lg border border-border bg-card py-1.5 pr-2 pl-2.5 text-base font-normal leading-normal text-foreground shadow-xs transition-all duration-100 ease-in-out outline-none select-none focus:border-blue-500 focus:shadow-[0_0_0_3px_rgba(59,130,246,0.15)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive data-[placeholder]:text-muted-foreground data-[size=sm]:py-1 data-[size=sm]:px-2 data-[size=sm]:text-sm data-[size=sm]:min-h-[1.9375rem] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "flex w-full min-h-8.5 items-center justify-between gap-1.5 rounded-lg border border-border bg-card py-1.5 pr-2 pl-2.5 text-base font-normal leading-normal text-foreground shadow-xs transition-all duration-100 ease-in-out outline-none select-none focus:border-blue-500 focus:shadow-[0_0_0_3px_rgba(59,130,246,0.15)] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:border-border disabled:text-muted-foreground disabled:shadow-none aria-invalid:border-destructive data-[placeholder]:text-muted-foreground data-[size=sm]:py-1 data-[size=sm]:px-2 data-[size=sm]:text-sm data-[size=sm]:min-h-[1.9375rem] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
diff --git a/packages/admin/src/components/ui/sheet.tsx b/packages/admin/src/components/ui/sheet.tsx
index aff1189ca3..8a5fdffe72 100644
--- a/packages/admin/src/components/ui/sheet.tsx
+++ b/packages/admin/src/components/ui/sheet.tsx
@@ -121,7 +121,7 @@ function SheetContent({
data-side={side}
dir={dir}
className={cn(
- 'fixed z-50 flex flex-col border border-border bg-background text-foreground text-sm shadow-sm transition duration-250 ease-out',
+ 'fixed z-50 flex flex-col border border-border bg-card text-foreground text-sm shadow-sm transition duration-250 ease-out',
'data-[side=right]:inset-y-0 data-[side=right]:right-0 data-[side=right]:h-[calc(100dvh-1rem)] data-[side=right]:max-h-[calc(100dvh-1rem)] data-[side=right]:w-[calc(100vw-1rem)] data-[side=right]:max-w-[600px] data-[side=right]:min-w-[320px] data-[side=right]:m-2 data-[side=right]:rounded-xl',
'data-[side=left]:inset-y-0 data-[side=left]:left-0 data-[side=left]:h-full data-[side=left]:w-3/4 data-[side=left]:border-r data-[side=left]:sm:max-w-sm',
'data-[side=bottom]:inset-x-0 data-[side=bottom]:bottom-0 data-[side=bottom]:h-auto data-[side=bottom]:border-t',
diff --git a/packages/admin/src/components/ui/sidebar.tsx b/packages/admin/src/components/ui/sidebar.tsx
index 2d5569184d..906b633fb6 100644
--- a/packages/admin/src/components/ui/sidebar.tsx
+++ b/packages/admin/src/components/ui/sidebar.tsx
@@ -235,7 +235,7 @@ function Sidebar({
<div
data-sidebar="sidebar"
data-slot="sidebar-inner"
- className="flex size-full flex-col bg-sidebar shadow-[inset_-1px_0_0_var(--color-sidebar-border)] group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:shadow-sm group-data-[variant=floating]:ring-1 group-data-[variant=floating]:ring-sidebar-border"
+ className="flex size-full flex-col bg-sidebar border-r border-border/50 group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:shadow-sm group-data-[variant=floating]:ring-1 group-data-[variant=floating]:ring-sidebar-border"
>
{children}
</div>
@@ -335,7 +335,7 @@ function SidebarFooter({ className, ...props }: React.ComponentProps<'div'>) {
data-slot="sidebar-footer"
data-sidebar="footer"
className={cn(
- 'flex flex-col gap-0 p-2 mt-auto border-t border-sidebar-border group-data-[collapsible=icon]:px-0 group-data-[collapsible=icon]:items-center',
+ 'flex flex-col gap-0 p-2 mt-auto border-t border-border group-data-[collapsible=icon]:px-0 group-data-[collapsible=icon]:items-center',
className,
)}
{...props}
@@ -648,7 +648,7 @@ function SidebarMenuSubButton({
data-size={size}
data-active={isActive}
className={cn(
- 'relative flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-xl p-1 text-sidebar-foreground/80 ring-sidebar-ring outline-hidden group-data-[collapsible=icon]:hidden hover:bg-sidebar-accent hover:text-sidebar-foreground focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[size=md]:text-base data-[size=sm]:text-xs data-active:font-semibold data-active:text-foreground data-active:bg-transparent data-active:shadow-none data-active:before:absolute data-active:before:-left-4 data-active:before:top-[10%] data-active:before:h-[80%] data-active:before:w-[3px] data-active:before:rounded-sm data-active:before:bg-foreground data-active:hover:bg-background [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',
+ 'relative flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-xl p-1 text-sidebar-foreground/80 ring-sidebar-ring outline-hidden group-data-[collapsible=icon]:hidden hover:bg-sidebar-accent hover:text-sidebar-foreground focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[size=md]:text-base data-[size=sm]:text-xs data-active:font-semibold data-active:text-foreground data-active:bg-transparent data-active:shadow-none data-active:before:absolute data-active:before:-left-4 data-active:before:top-[10%] data-active:before:h-[80%] data-active:before:w-[3px] data-active:before:rounded-sm data-active:before:bg-foreground [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',
className,
)}
{...props}
diff --git a/packages/admin/src/index.css b/packages/admin/src/index.css
index d46dc32587..860386a25f 100644
--- a/packages/admin/src/index.css
+++ b/packages/admin/src/index.css
@@ -32,6 +32,7 @@
--accent: oklch(0.97 0 0); /* #f5f5f5 */
--accent-foreground: oklch(0.205 0 0);
--destructive: oklch(0.58 0.22 27); /* red-600 */
+ --destructive-foreground: oklch(1 0 0); /* #ffffff */
--border: oklch(0.928 0 0); /* #eaeaea — Vercel border */
--input: oklch(0.928 0 0);
--ring: oklch(0.552 0.016 285); /* blue-500 focus ring (UNCHANGED) */
@@ -129,6 +130,7 @@
--color-input: var(--input);
--color-border: var(--border);
--color-destructive: var(--destructive);
+ --color-destructive-foreground: var(--destructive-foreground);
--color-accent-foreground: var(--accent-foreground);
--color-accent: var(--accent);
--color-muted-foreground: var(--muted-foreground);