diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsx
index a1cac03..22358ae 100644
--- a/app/(auth)/login/page.tsx
+++ b/app/(auth)/login/page.tsx
@@ -14,7 +14,7 @@ export default async function LoginPage({ searchParams }: Props) {
Password updated — sign in with your new password.
)}
-
+
diff --git a/app/globals.css b/app/globals.css
index b0c9f16..012b0cc 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -1,50 +1,65 @@
@import "tailwindcss";
-/* Modernist tokens. Source of truth: the Modernist styles.css under design-system/_ds.
+/* IMS Admin refresh tokens. Source of truth: design-system/design.md section 2.
Static emits every variable so plain CSS can use var(--color-*) too. */
@theme static {
- --color-bg: #f3f2f2;
- --color-surface: #eae9e9;
- --color-text: #201e1d;
- --color-accent: #ec3013;
- --color-accent-2: #e15b47;
- --color-divider: color-mix(in srgb, #201e1d 40%, transparent);
+ --color-ink: #1f1f1f;
+ --color-ink-2: #303030;
+ --color-ink-3: #4a4a4a;
+ --color-muted: #616161;
+ --color-faint: #8a8a8a;
+ --color-rule: #ebebeb;
+ --color-rule-2: #e3e3e3;
+ --color-ring: #d4d4d4;
+ --color-surface: #ffffff;
+ --color-surface-2: #f7f7f7;
+ --color-ground: #f1f1f1;
+ --color-accent: #0f766e;
+ --color-accent-tint: #f2f7f6;
+ --color-accent-tint-2: #e6f4f1;
+ --color-danger: #b3261e;
+ --color-topbar: #1a1a1a;
- /* Utility-friendly aliases: bg-ground, text-ink */
- --color-ground: var(--color-bg);
- --color-ink: var(--color-text);
+ /* Status pills: a dark step on a light tint, one pair per hue. */
+ --color-st-amber-bg: #fff1c2;
+ --color-st-amber-fg: #6b4a00;
+ --color-st-blue-bg: #e0efff;
+ --color-st-blue-fg: #00527c;
+ --color-st-violet-bg: #ede7ff;
+ --color-st-violet-fg: #4b2e99;
+ --color-st-orange-bg: #ffe6cf;
+ --color-st-orange-fg: #7a3a00;
+ --color-st-indigo-bg: #e3e8ff;
+ --color-st-indigo-fg: #2c3e8f;
+ --color-st-green-bg: #d7f4e3;
+ --color-st-green-fg: #0c5132;
+ --color-st-grey-bg: #ebebeb;
+ --color-st-grey-fg: #4a4a4a;
+ --color-st-red-bg: #fee3e0;
+ --color-st-red-fg: #8e1f0b;
- --color-neutral-100: #f8f4f4;
- --color-neutral-200: #eae7e7;
- --color-neutral-300: #d7d3d3;
- --color-neutral-400: #bab6b6;
- --color-neutral-500: #9b9797;
- --color-neutral-600: #7d7979;
- --color-neutral-700: #605d5d;
- --color-neutral-800: #444141;
- --color-neutral-900: #2d2b2b;
+ /* Legacy names kept, re-valued, until every page is migrated. */
+ --color-divider: #e3e3e3;
+ --color-neutral-100: #f7f7f7;
+ --color-neutral-200: #ebebeb;
+ --color-neutral-300: #d4d4d4;
+ --color-neutral-400: #c4c4c4;
+ --color-neutral-500: #8a8a8a;
+ --color-neutral-600: #616161;
+ --color-neutral-700: #4a4a4a;
+ --color-neutral-800: #303030;
+ --color-neutral-900: #1f1f1f;
- --color-accent-100: #fff2ef;
- --color-accent-200: #ffe0d9;
- --color-accent-300: #ffc4b8;
- --color-accent-400: #ff9783;
- --color-accent-500: #ff563c;
- --color-accent-600: #dd2b0f;
- --color-accent-700: #ae1800;
- --color-accent-800: #7c1405;
- --color-accent-900: #4d170e;
+ --color-accent-100: #e6f4f1;
+ --color-accent-200: #c5e8e0;
+ --color-accent-300: #9fd3c7;
+ --color-accent-400: #5fb3a5;
+ --color-accent-500: #2b9488;
+ --color-accent-600: #0c615a;
+ --color-accent-700: #0b4f47;
+ --color-accent-800: #083b36;
+ --color-accent-900: #052a26;
- --color-accent-2-100: #fff2ef;
- --color-accent-2-200: #ffe0da;
- --color-accent-2-300: #ffc4b9;
- --color-accent-2-400: #ff9784;
- --color-accent-2-500: #ef6853;
- --color-accent-2-600: #c94b39;
- --color-accent-2-700: #9e3526;
- --color-accent-2-800: #71261b;
- --color-accent-2-900: #471d16;
-
- /* Existing gray-* utilities render on the neutral ramp. */
--color-gray-50: var(--color-neutral-100);
--color-gray-100: var(--color-neutral-200);
--color-gray-200: var(--color-neutral-300);
@@ -54,11 +69,9 @@
--color-gray-600: var(--color-neutral-700);
--color-gray-700: var(--color-neutral-800);
--color-gray-800: var(--color-neutral-900);
- --color-gray-900: var(--color-text);
- --color-gray-950: var(--color-text);
+ --color-gray-900: var(--color-ink);
+ --color-gray-950: var(--color-ink);
- /* Existing blue-* utilities render on the accent ramp. 600 is the canonical
- accent; 700 and darker are safe for body-size text. */
--color-blue-50: var(--color-accent-100);
--color-blue-100: var(--color-accent-100);
--color-blue-200: var(--color-accent-200);
@@ -71,59 +84,63 @@
--color-blue-900: var(--color-accent-900);
--color-blue-950: var(--color-accent-900);
- /* Existing red-* utilities (errors, destructive) render on the accent ramp;
- 600 and 700 map to accent-700 so body-size text clears contrast. */
- --color-red-50: var(--color-accent-100);
- --color-red-100: var(--color-accent-100);
- --color-red-200: var(--color-accent-200);
- --color-red-300: var(--color-accent-300);
- --color-red-400: var(--color-accent-400);
- --color-red-500: var(--color-accent-600);
- --color-red-600: var(--color-accent-700);
- --color-red-700: var(--color-accent-700);
- --color-red-800: var(--color-accent-800);
- --color-red-900: var(--color-accent-900);
+ --color-red-50: #fee3e0;
+ --color-red-100: #fee3e0;
+ --color-red-200: #f9c4bd;
+ --color-red-300: #f2a198;
+ --color-red-400: #e06a5a;
+ --color-red-500: #c9382a;
+ --color-red-600: var(--color-danger);
+ --color-red-700: #8e1f0b;
+ --color-red-800: #6b1708;
+ --color-red-900: #4a1005;
- /* Zero corner radius, everywhere. */
- --radius: 0px;
- --radius-xs: 0px;
- --radius-sm: 0px;
- --radius-md: 0px;
- --radius-lg: 0px;
- --radius-xl: 0px;
- --radius-2xl: 0px;
- --radius-3xl: 0px;
- --radius-4xl: 0px;
+ /* Radius scale: 8 buttons, chips, inputs, pills; 12 cards; 14 drawer. */
+ --radius: 8px;
+ --radius-xs: 4px;
+ --radius-sm: 6px;
+ --radius-md: 8px;
+ --radius-lg: 8px;
+ --radius-xl: 12px;
+ --radius-2xl: 14px;
+ --radius-3xl: 14px;
+ --radius-4xl: 14px;
- /* Elevation, tuned to the ground. */
- --shadow-sm: 0 1px 2px color-mix(in srgb, #2d2b2b 14%, transparent);
- --shadow-md: 0 3px 10px color-mix(in srgb, #2d2b2b 16%, transparent);
- --shadow-lg: 0 12px 32px color-mix(in srgb, #2d2b2b 22%, transparent);
- --shadow-xl: var(--shadow-lg);
- --shadow-2xl: var(--shadow-lg);
+ --shadow-card: 0 0 0 1px rgba(0,0,0,.08), 0 1px 2px rgba(0,0,0,.06);
+ --shadow-float: 0 0 0 1px rgba(0,0,0,.1), 0 12px 32px rgba(0,0,0,.18);
+ --shadow-drawer: 0 0 0 1px rgba(0,0,0,.1), 0 24px 60px rgba(0,0,0,.24);
+ --shadow-primary: inset 0 -1px 0 #000, inset 0 1px 0 rgba(255,255,255,.18), 0 1px 2px rgba(0,0,0,.2);
+ --shadow-secondary: inset 0 0 0 1px var(--color-ring), 0 1px 0 rgba(0,0,0,.05);
+ --shadow-input: inset 0 0 0 1px var(--color-faint);
+ --shadow-chip: inset 0 0 0 1px var(--color-ring);
+ --shadow-chip-set: inset 0 0 0 1px var(--color-accent-300);
+ --shadow-sm: 0 1px 2px rgba(0,0,0,.06);
+ --shadow-md: 0 3px 10px rgba(0,0,0,.12);
+ --shadow-lg: var(--shadow-float);
+ --shadow-xl: var(--shadow-float);
+ --shadow-2xl: var(--shadow-float);
- --font-sans: var(--font-archivo), system-ui, sans-serif;
- --font-heading: var(--font-archivo), system-ui, sans-serif;
+ --font-sans: var(--font-geist), system-ui, sans-serif;
+ --font-mono: var(--font-geist-mono), ui-monospace, SFMono-Regular, Menlo, monospace;
}
@layer base {
html {
- background: var(--color-bg);
+ background: var(--color-ground);
}
body {
- background: var(--color-bg);
- color: var(--color-text);
+ background: var(--color-ground);
+ color: var(--color-ink);
font-family: var(--font-sans);
- font-size: 15px;
- line-height: 1.55;
+ font-size: 13px;
+ line-height: 1.5;
}
h1, h2, h3, h4, h5, h6 {
- font-family: var(--font-heading);
- font-weight: 800;
- line-height: 1.12;
- letter-spacing: -0.015em;
+ font-weight: 650;
+ line-height: 1.25;
+ letter-spacing: -0.01em;
}
:focus {
@@ -136,18 +153,18 @@
}
::selection {
- background: color-mix(in srgb, var(--color-accent) 30%, transparent);
+ background: color-mix(in srgb, var(--color-accent) 25%, transparent);
}
input,
textarea,
select {
- color: var(--color-text);
+ color: var(--color-ink);
}
input::placeholder,
textarea::placeholder {
- color: color-mix(in srgb, var(--color-text) 55%, transparent);
+ color: var(--color-faint);
}
button:disabled,
@@ -158,7 +175,3 @@
cursor: not-allowed;
}
}
-
-.grayscale {
- filter: grayscale(1) contrast(1.08);
-}
diff --git a/app/layout.tsx b/app/layout.tsx
index c7b9887..dc20de1 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,11 +1,16 @@
import type { Metadata } from 'next'
-import { Archivo } from 'next/font/google'
+import { Geist, Geist_Mono } from 'next/font/google'
import './globals.css'
import { I18nProvider } from '@/lib/i18n/context'
import { getLocale, loadMessages } from '@/lib/i18n/server'
-const archivo = Archivo({
- variable: '--font-archivo',
+const geist = Geist({
+ variable: '--font-geist',
+ subsets: ['latin'],
+})
+
+const geistMono = Geist_Mono({
+ variable: '--font-geist-mono',
subsets: ['latin'],
})
@@ -25,7 +30,7 @@ export default async function RootLayout({
return (
diff --git a/components/admin/admin-panel.tsx b/components/admin/admin-panel.tsx
index 06554c9..6aa4747 100644
--- a/components/admin/admin-panel.tsx
+++ b/components/admin/admin-panel.tsx
@@ -30,7 +30,7 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {