Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

feat(ui): set page headlines in Hedvig Letters Serif (#1736)

Brad Barbin2fffd20eab86
diff --git a/apps/academy/app/routes/_auth+/callback.tsx b/apps/academy/app/routes/_auth+/callback.tsx
index 66862c2d49..e290020aa4 100644
--- a/apps/academy/app/routes/_auth+/callback.tsx
+++ b/apps/academy/app/routes/_auth+/callback.tsx
@@ -20,7 +20,7 @@ import {
AlertDescription,
AlertTitle,
Button,
- LoadingBars,
+ CarbonPulse,
VStack
} from "@carbon/react";
import { useEffect, useRef, useState } from "react";
@@ -141,33 +141,39 @@ export default function AuthCallback() {
}, [fetcher]);
return (
- <div className="flex flex-col items-center justify-center">
- <div className="flex justify-center mb-8">
- <img src="/carbon-mark-light.svg" alt="Carbon Logo" className="w-24" />
- </div>
+ <div className="fixed inset-0 z-50 flex flex-col items-center justify-center bg-background">
{error ? (
- <div className="rounded-lg p-8 mt-8 w-[380px]">
- <VStack spacing={4}>
- <Alert variant="destructive">
- <LuTriangleAlert className="h-4 w-4" />
- <AlertTitle>Error</AlertTitle>
- <AlertDescription>{error}</AlertDescription>
- </Alert>
- {error.includes("expired") && (
- <>
- <p className="text-sm text-muted-foreground">
- But don't worry. You can use the forgot password flow to
- request a new magic link.
- </p>
- <Button size="lg" asChild className="w-full">
- <Link to={path.to.login}>Login</Link>
- </Button>
- </>
- )}
- </VStack>
- </div>
+ <>
+ <div className="flex justify-center mb-8">
+ <img
+ src="/carbon-mark-light.svg"
+ alt="Carbon Logo"
+ className="w-24"
+ />
+ </div>
+ <div className="rounded-lg p-8 mt-8 w-[380px]">
+ <VStack spacing={4}>
+ <Alert variant="destructive">
+ <LuTriangleAlert className="h-4 w-4" />
+ <AlertTitle>Error</AlertTitle>
+ <AlertDescription>{error}</AlertDescription>
+ </Alert>
+ {error.includes("expired") && (
+ <>
+ <p className="text-sm text-muted-foreground">
+ But don't worry. You can use the forgot password flow to
+ request a new magic link.
+ </p>
+ <Button size="lg" asChild className="w-full">
+ <Link to={path.to.login}>Login</Link>
+ </Button>
+ </>
+ )}
+ </VStack>
+ </div>
+ </>
) : (
- <LoadingBars />
+ <CarbonPulse />
)}
</div>
);
diff --git a/apps/academy/app/styles/tailwind.css b/apps/academy/app/styles/tailwind.css
index c239c81dd8..531675c8f6 100644
--- a/apps/academy/app/styles/tailwind.css
+++ b/apps/academy/app/styles/tailwind.css
@@ -9,6 +9,7 @@
@theme {
--font-sans: "DM Sans", ui-sans-serif, system-ui, sans-serif;
--font-mono: "Fira Code", ui-monospace, monospace;
+ --font-headline: "DM Sans", ui-sans-serif, system-ui, sans-serif;
}
@layer base {
diff --git a/apps/erp/app/components/DocumentHeader.tsx b/apps/erp/app/components/DocumentHeader.tsx
index f605f0d251..86b2f4cb98 100644
--- a/apps/erp/app/components/DocumentHeader.tsx
+++ b/apps/erp/app/components/DocumentHeader.tsx
@@ -30,7 +30,7 @@ const DocumentHeader = ({
<CardHeader className="flex-row items-center justify-between">
<div>
<HStack>
- <Heading as="h1" size="h3">
+ <Heading as="h1" size="h3" className="font-sans">
{title}
</Heading>
<Copy text={title} />
diff --git a/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx b/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx
index 5d81c00992..04f1d4a961 100644
--- a/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx
+++ b/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx
@@ -4,6 +4,7 @@ import type { TermId } from "@carbon/glossary";
import {
Badge,
Button,
+ Heading,
HStack,
IconButton,
LabelWithHelp
@@ -583,9 +584,9 @@ const AccountDefaultsForm = ({
<div className="rounded-lg border border-border bg-card">
<div className="flex items-center justify-between border-b border-border p-6">
<div>
- <h1 className="text-xl font-semibold text-foreground">
+ <Heading as="h1" size="h3">
<Trans>Default Accounts</Trans>
- </h1>
+ </Heading>
<p className="text-sm text-muted-foreground">
<Trans>
Configure the default accounts used for various transaction
diff --git a/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx b/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx
index 55ad7845f0..0008656446 100644
--- a/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx
+++ b/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx
@@ -1,6 +1,6 @@
import { ValidatedForm } from "@carbon/form";
import type { TermId } from "@carbon/glossary";
-import { Button, HStack, LabelWithHelp } from "@carbon/react";
+import { Button, Heading, HStack, LabelWithHelp } from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import { useMemo } from "react";
import { useNavigate } from "react-router";
@@ -67,9 +67,9 @@ const FiscalYearSettingsForm = ({
<div className="rounded-lg border border-border bg-card">
<div className="flex items-center justify-between border-b border-border p-6">
<div>
- <h1 className="text-xl font-semibold text-foreground">
+ <Heading as="h1" size="h3">
<Trans>Fiscal Year Settings</Trans>
- </h1>
+ </Heading>
<p className="text-sm text-muted-foreground">
<Trans>
Configure the start months for your fiscal and tax years
diff --git a/apps/erp/app/modules/accounting/ui/JournalEntries/JournalEntryForm.tsx b/apps/erp/app/modules/accounting/ui/JournalEntries/JournalEntryForm.tsx
index df240675db..964b9056f7 100644
--- a/apps/erp/app/modules/accounting/ui/JournalEntries/JournalEntryForm.tsx
+++ b/apps/erp/app/modules/accounting/ui/JournalEntries/JournalEntryForm.tsx
@@ -183,7 +183,7 @@ const JournalEntryForm = ({
>
<CardHeader className="flex-row items-center justify-between">
<HStack>
- <Heading as="h1" size="h3">
+ <Heading as="h1" size="h3" className="font-sans">
{displayId}
</Heading>
<Copy text={displayId} />
diff --git a/apps/erp/app/modules/inventory/ui/Kanbans/KanbanForm.tsx b/apps/erp/app/modules/inventory/ui/Kanbans/KanbanForm.tsx
index a89323c01b..99e60f6ab4 100644
--- a/apps/erp/app/modules/inventory/ui/Kanbans/KanbanForm.tsx
+++ b/apps/erp/app/modules/inventory/ui/Kanbans/KanbanForm.tsx
@@ -316,6 +316,7 @@ const KanbanForm = ({ initialValues, onClose }: KanbanFormProps) => {
name="autoRelease"
label={t`Auto Release`}
termId="kanban-auto-release"
+ bordered
value={autoRelease}
onChange={(value) => {
setAutoRelease(value);
@@ -329,6 +330,7 @@ const KanbanForm = ({ initialValues, onClose }: KanbanFormProps) => {
name="autoStartJob"
label={t`Auto Start Job`}
termId="kanban-auto-start-job"
+ bordered
value={autoStartJob}
onChange={setAutoStartJob}
isDisabled={!autoRelease}
diff --git a/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferForm.tsx b/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferForm.tsx
index 33e9dd2d09..9fa6c4e92d 100644
--- a/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferForm.tsx
+++ b/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferForm.tsx
@@ -331,7 +331,7 @@ const WarehouseTransferForm = ({
/>
) : (
<CardHeader>
- <Heading as="h1" size="h3">
+ <Heading as="h1" size="h3" className="font-sans">
<Trans>New Warehouse Transfer</Trans>
</Heading>
</CardHeader>
diff --git a/apps/erp/app/modules/people/ui/Person/PersonPreview.tsx b/apps/erp/app/modules/people/ui/Person/PersonPreview.tsx
index b65fd1a9c3..c8df5ed3bc 100644
--- a/apps/erp/app/modules/people/ui/Person/PersonPreview.tsx
+++ b/apps/erp/app/modules/people/ui/Person/PersonPreview.tsx
@@ -36,7 +36,7 @@ const PersonHeader = () => {
<Card>
<HStack className="justify-between items-center p-6 pl-0">
<CardHeader className="pt-0">
- <CardTitle className="text-2xl">
+ <CardTitle className="font-headline text-2xl">
{routeData?.employeeSummary?.name}
</CardTitle>
<CardDescription>
diff --git a/apps/erp/app/routes/_public+/callback.tsx b/apps/erp/app/routes/_public+/callback.tsx
index 67d7537de3..2274379ea3 100644
--- a/apps/erp/app/routes/_public+/callback.tsx
+++ b/apps/erp/app/routes/_public+/callback.tsx
@@ -40,7 +40,7 @@ import {
Alert,
AlertDescription,
AlertTitle,
- LoadingBars,
+ CarbonPulse,
VStack
} from "@carbon/react";
import { Trans } from "@lingui/react/macro";
@@ -531,7 +531,7 @@ export default function AuthCallback() {
}, [fetcher, redirectTo]);
return (
- <div className="flex flex-col items-center justify-center">
+ <div className="fixed inset-0 z-50 flex flex-col items-center justify-center bg-background">
{error ? (
<div className="rounded-lg p-8 mt-8 w-[380px]">
<VStack spacing={4}>
@@ -552,7 +552,7 @@ export default function AuthCallback() {
</VStack>
</div>
) : (
- <LoadingBars />
+ <CarbonPulse />
)}
</div>
);
diff --git a/apps/erp/app/routes/x+/accounting+/reports.tsx b/apps/erp/app/routes/x+/accounting+/reports.tsx
index 5417c0412f..7c47fccab5 100644
--- a/apps/erp/app/routes/x+/accounting+/reports.tsx
+++ b/apps/erp/app/routes/x+/accounting+/reports.tsx
@@ -5,6 +5,7 @@ import { validationError, validator } from "@carbon/form";
import {
Badge,
cn,
+ Heading,
IconButton,
Input,
InputGroup,
@@ -322,9 +323,9 @@ export default function ReportsIndexRoute() {
<div className="h-[calc(100dvh-var(--header-height))] w-full overflow-y-auto bg-card">
<div className="mx-auto flex w-full max-w-6xl flex-col gap-8 p-8">
<div className="flex items-center justify-between gap-4">
- <h1 className="text-2xl font-semibold tracking-tight">
+ <Heading as="h1" size="h1">
<Trans>Reporting</Trans>
- </h1>
+ </Heading>
<InputGroup size="sm" className="w-64">
<InputLeftElement>
<LuSearch className="h-4 w-4 text-muted-foreground" />
diff --git a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx
index 8da12e7e40..7bdc3c6a4e 100644
--- a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx
+++ b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx
@@ -1,7 +1,7 @@
import { error, notFound, useCarbon } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import { Button } from "@carbon/react";
+import { Button, Heading } from "@carbon/react";
import { Trans } from "@lingui/react/macro";
import { useCallback, useMemo, useRef, useState } from "react";
import { LuChevronUp } from "react-icons/lu";
@@ -235,9 +235,9 @@ export default function ItemInventoryActivityRoute() {
return (
<div className="w-full space-y-4 pt-6 px-4">
- <h2 className="text-2xl font-semibold mb-4">
+ <Heading size="h2" className="mb-4">
<Trans>Activity</Trans>
- </h2>
+ </Heading>
{hasNewer && (
<div className="flex justify-center">
diff --git a/apps/erp/app/styles/tailwind.css b/apps/erp/app/styles/tailwind.css
index d783304c33..61192395f0 100644
--- a/apps/erp/app/styles/tailwind.css
+++ b/apps/erp/app/styles/tailwind.css
@@ -1,6 +1,7 @@
@import "tailwindcss";
@import "non.geist";
@import "non.geist/mono";
+@import "@fontsource-variable/hedvig-letters-serif";
@import "../../../../packages/config/tailwind/theme.css";
::view-transition-old(root),
diff --git a/apps/erp/package.json b/apps/erp/package.json
index c4136d8e66..d2d87e24c2 100644
--- a/apps/erp/package.json
+++ b/apps/erp/package.json
@@ -41,6 +41,7 @@
"@emoji-mart/data": "catalog:",
"@emoji-mart/react": "catalog:",
"@epic-web/remember": "1.1.0",
+ "@fontsource-variable/hedvig-letters-serif": "catalog:",
"@internationalized/date": "catalog:",
"@lingui/core": "catalog:",
"@lingui/react": "catalog:",
diff --git a/apps/mes/app/components/JobOperation/JobOperation.tsx b/apps/mes/app/components/JobOperation/JobOperation.tsx
index 2c80935336..d177afeb3b 100644
--- a/apps/mes/app/components/JobOperation/JobOperation.tsx
+++ b/apps/mes/app/components/JobOperation/JobOperation.tsx
@@ -1224,7 +1224,7 @@ export const JobOperation = ({
</div>
</HStack>
<div className="flex flex-col shrink-0 items-end">
- <Heading size="h2">
+ <Heading size="h2" className="font-sans">
{formatDurationMilliseconds(
((progress.setup ?? 0) +
(progress.labor ?? 0) +
@@ -1264,7 +1264,7 @@ export const JobOperation = ({
</CardHeader>
<CardContent>
- <Heading size="h1">
+ <Heading size="h1" className="font-sans">
<Trans>
{operation.quantityComplete} of{" "}
{operation.targetQuantity}
@@ -1280,7 +1280,7 @@ export const JobOperation = ({
<FaTrash className="h-3 w-3 text-muted-foreground" />
</CardHeader>
<CardContent>
- <Heading size="h1">
+ <Heading size="h1" className="font-sans">
{operation.quantityScrapped}
</Heading>
</CardContent>
@@ -1300,7 +1300,7 @@ export const JobOperation = ({
<Heading
size="h3"
className={cn(
- "w-full truncate",
+ "w-full truncate font-sans",
isOverdue ? "text-red-500" : ""
)}
>
@@ -1514,7 +1514,10 @@ export const JobOperation = ({
</Button>
)}
{parentIsSerial && (
- <Heading size="h2">
+ <Heading
+ size="h2"
+ className="font-sans"
+ >
<Trans>
{serialIndex + 1} of{" "}
{
@@ -2731,7 +2734,10 @@ export const JobOperation = ({
</Button>
)}
{parentIsSerial && (
- <Heading size="h2">
+ <Heading
+ size="h2"
+ className="font-sans"
+ >
<Trans>
{serialIndex + 1} of{" "}
{operation.operationQuantity}
diff --git a/apps/mes/app/routes/_public+/callback.tsx b/apps/mes/app/routes/_public+/callback.tsx
index 4fc71118e4..c4a07e09cc 100644
--- a/apps/mes/app/routes/_public+/callback.tsx
+++ b/apps/mes/app/routes/_public+/callback.tsx
@@ -34,7 +34,7 @@ import {
AlertDescription,
AlertTitle,
Button,
- LoadingBars,
+ CarbonPulse,
VStack
} from "@carbon/react";
import { Trans } from "@lingui/react/macro";
@@ -325,7 +325,7 @@ export default function AuthCallback() {
}, [fetcher]);
return (
- <div className="flex flex-col items-center justify-center">
+ <div className="fixed inset-0 z-50 flex flex-col items-center justify-center bg-background">
{error ? (
<div className="rounded-lg p-8 mt-8 w-[380px]">
<VStack spacing={4}>
@@ -354,7 +354,7 @@ export default function AuthCallback() {
</VStack>
</div>
) : (
- <LoadingBars />
+ <CarbonPulse />
)}
</div>
);
diff --git a/apps/mes/app/routes/x+/assigned.tsx b/apps/mes/app/routes/x+/assigned.tsx
index 5e3578b2a8..f833e3ec91 100644
--- a/apps/mes/app/routes/x+/assigned.tsx
+++ b/apps/mes/app/routes/x+/assigned.tsx
@@ -3,10 +3,10 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";
import { getLogger } from "@carbon/logger";
import {
Button,
+ CarbonPulse,
ClientOnly,
Heading,
Input,
- LoadingBars,
Popover,
PopoverContent,
PopoverTrigger,
@@ -351,7 +351,7 @@ export default function AssignedRoute() {
<ClientOnly
fallback={
<div className="flex w-full h-[calc(100%-var(--header-height))] items-center justify-center">
- <LoadingBars />
+ <CarbonPulse />
</div>
}
>
diff --git a/apps/mes/app/routes/x+/operations.tsx b/apps/mes/app/routes/x+/operations.tsx
index 2f1a65f3cf..0fffcedc9a 100644
--- a/apps/mes/app/routes/x+/operations.tsx
+++ b/apps/mes/app/routes/x+/operations.tsx
@@ -5,11 +5,11 @@ import { getLocationTimeZone } from "@carbon/database";
import { getLogger } from "@carbon/logger";
import {
Button,
+ CarbonPulse,
ClientOnly,
Heading,
HStack,
IconButton,
- LoadingBars,
Popover,
PopoverContent,
PopoverTrigger,
@@ -424,7 +424,7 @@ export default function ScheduleRoute() {
<ClientOnly
fallback={
<div className="flex h-screen w-[calc(100dvw-var(--sidebar-width-icon))] items-center justify-center">
- <LoadingBars />
+ <CarbonPulse />
</div>
}
>
diff --git a/apps/mes/app/styles/tailwind.css b/apps/mes/app/styles/tailwind.css
index 2e63a80394..5955ed4c08 100644
--- a/apps/mes/app/styles/tailwind.css
+++ b/apps/mes/app/styles/tailwind.css
@@ -1,6 +1,7 @@
@import "tailwindcss";
@import "non.geist";
@import "non.geist/mono";
+@import "@fontsource-variable/hedvig-letters-serif";
@import "../../../../packages/config/tailwind/theme.css";
@layer base {
diff --git a/apps/mes/package.json b/apps/mes/package.json
index 2be5db2117..b3a1bbd4f7 100644
--- a/apps/mes/package.json
+++ b/apps/mes/package.json
@@ -25,6 +25,7 @@
"@dnd-kit/utilities": "catalog:",
"@emoji-mart/data": "catalog:",
"@emoji-mart/react": "catalog:",
+ "@fontsource-variable/hedvig-letters-serif": "catalog:",
"@internationalized/date": "catalog:",
"@lingui/core": "catalog:",
"@lingui/macro": "catalog:",
diff --git a/apps/starter/app/routes/_public+/callback.tsx b/apps/starter/app/routes/_public+/callback.tsx
index aa3dc68678..c05d9b8e77 100644
--- a/apps/starter/app/routes/_public+/callback.tsx
+++ b/apps/starter/app/routes/_public+/callback.tsx
@@ -20,7 +20,7 @@ import {
AlertDescription,
AlertTitle,
Button,
- LoadingBars,
+ CarbonPulse,
VStack
} from "@carbon/react";
import { useEffect, useRef, useState } from "react";
@@ -141,47 +141,44 @@ export default function AuthCallback() {
}, [fetcher]);
return (
- <div className="flex flex-col items-center justify-center">
- <div className="flex justify-center mb-8">
- <img
- src="/carbon-mark-light.svg"
- alt="Carbon Logo"
- className="w-24 dark:hidden"
- />
- <img
- src="/carbon-mark-dark.svg"
- alt="Carbon Logo"
- className="w-24 hidden dark:block"
- />
- <img
- src="/carbon-mark-dark.svg"
- alt="Carbon Logo"
- className="w-24 hidden dark:block"
- />
- </div>
+ <div className="fixed inset-0 z-50 flex flex-col items-center justify-center bg-background">
{error ? (
- <div className="rounded-lg p-8 mt-8 w-[380px]">
- <VStack spacing={4}>
- <Alert variant="destructive">
- <LuTriangleAlert className="h-4 w-4" />
- <AlertTitle>Error</AlertTitle>
- <AlertDescription>{error}</AlertDescription>
- </Alert>
- {error.includes("expired") && (
- <>
- <p className="text-sm text-muted-foreground">
- But don't worry. You can use the forgot password flow to
- request a new magic link.
- </p>
- <Button size="lg" asChild className="w-full">
- <Link to={path.to.login}>Login</Link>
- </Button>
- </>
- )}
- </VStack>
- </div>
+ <>
+ <div className="flex justify-center mb-8">
+ <img
+ src="/carbon-mark-light.svg"
+ alt="Carbon Logo"
+ className="w-24 dark:hidden"
+ />
+ <img
+ src="/carbon-mark-dark.svg"
+ alt="Carbon Logo"
+ className="w-24 hidden dark:block"
+ />
+ </div>
+ <div className="rounded-lg p-8 mt-8 w-[380px]">
+ <VStack spacing={4}>
+ <Alert variant="destructive">
+ <LuTriangleAlert className="h-4 w-4" />
+ <AlertTitle>Error</AlertTitle>
+ <AlertDescription>{error}</AlertDescription>
+ </Alert>
+ {error.includes("expired") && (
+ <>
+ <p className="text-sm text-muted-foreground">
+ But don't worry. You can use the forgot password flow to
+ request a new magic link.
+ </p>
+ <Button size="lg" asChild className="w-full">
+ <Link to={path.to.login}>Login</Link>
+ </Button>
+ </>
+ )}
+ </VStack>
+ </div>
+ </>
) : (
- <LoadingBars />
+ <CarbonPulse />
)}
</div>
);
diff --git a/apps/starter/app/styles/tailwind.css b/apps/starter/app/styles/tailwind.css
index b76f8664de..77e2dfa987 100644
--- a/apps/starter/app/styles/tailwind.css
+++ b/apps/starter/app/styles/tailwind.css
@@ -1,6 +1,7 @@
@import "tailwindcss";
@import "non.geist";
@import "non.geist/mono";
+@import "@fontsource-variable/hedvig-letters-serif";
@import "../../../../packages/config/tailwind/theme.css";
@layer base {
diff --git a/apps/starter/package.json b/apps/starter/package.json
index 7209b878bc..8c60aa7e89 100644
--- a/apps/starter/package.json
+++ b/apps/starter/package.json
@@ -10,6 +10,7 @@
"@carbon/logger": "workspace:*",
"@carbon/react": "workspace:*",
"@carbon/utils": "workspace:*",
+ "@fontsource-variable/hedvig-letters-serif": "catalog:",
"@internationalized/date": "catalog:",
"@react-aria/i18n": "catalog:",
"@react-router/dev": "catalog:",
diff --git a/packages/config/tailwind/theme.css b/packages/config/tailwind/theme.css
index 555d2e6eb1..65864d026a 100644
--- a/packages/config/tailwind/theme.css
+++ b/packages/config/tailwind/theme.css
@@ -250,7 +250,7 @@
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-mono: "Geist Mono Variable", ui-monospace, SFMono-Regular, Menlo,
Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
- --font-headline: "Geist Variable", ui-sans-serif, system-ui, sans-serif,
+ --font-headline: "Hedvig Letters Serif Variable", ui-serif, Georgia, serif,
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--tracking-normal: -0.02em;
@@ -262,6 +262,10 @@
--animate-scan: scan 6s linear infinite;
--animate-flicker: flicker 1.6s steps(1, end) infinite;
+ /* CarbonPulse loader: a band of light sweeps the mark bottom-left to top-right */
+ --animate-carbon-sweep: carbon-sweep var(--carbon-pulse-duration, 2400ms)
+ cubic-bezier(0.65, 0, 0.35, 1) infinite;
+
--container-2xl: 1400px;
}
@@ -293,6 +297,22 @@
}
}
+/* CarbonPulse: the mask band travels from just beyond the bottom-left corner
+ to just beyond the top-right, then rests off the mark before the next pass.
+ 82%/18% puts the band's resting spots just outside a square mark; 100%/0%
+ left it off the mark for half the sweep. */
+@keyframes carbon-sweep {
+ 0% {
+ mask-position: 82% 18%;
+ -webkit-mask-position: 82% 18%;
+ }
+ 75%,
+ 100% {
+ mask-position: 18% 82%;
+ -webkit-mask-position: 18% 82%;
+ }
+}
+
/* ErrorBoundary (VOID//SYS) effects */
@keyframes scan {
from {
diff --git a/packages/react/src/CarbonPulse.tsx b/packages/react/src/CarbonPulse.tsx
new file mode 100644
index 0000000000..6d2196d5d6
--- /dev/null
+++ b/packages/react/src/CarbonPulse.tsx
@@ -0,0 +1,110 @@
+import type { CSSProperties } from "react";
+import { cn } from "./utils/cn";
+
+const DEFAULT_SIZE = 72;
+const DEFAULT_DURATION_MS = 2400;
+
+type CarbonPulseProps = {
+ // Relative paths resolve against the current app, which ships both marks in
+ // its public/ folder. The light mark is the one drawn on light backgrounds.
+ lightSrc?: string;
+ darkSrc?: string;
+ size?: number;
+ durationMs?: number;
+ label?: string;
+ paused?: boolean;
+ className?: string;
+};
+
+// A diagonal band, bottom-left to top-right. The mask is three times the
+// element so the band can start and finish fully outside the mark.
+const SWEEP_MASK: CSSProperties = {
+ maskImage:
+ "linear-gradient(45deg, transparent 42%, black 50%, transparent 58%)",
+ WebkitMaskImage:
+ "linear-gradient(45deg, transparent 42%, black 50%, transparent 58%)",
+ maskSize: "300% 300%",
+ WebkitMaskSize: "300% 300%",
+ maskRepeat: "no-repeat",
+ WebkitMaskRepeat: "no-repeat"
+};
+
+function Mark({
+ lightSrc,
+ darkSrc,
+ className,
+ style
+}: {
+ lightSrc: string;
+ darkSrc: string;
+ className?: string;
+ style?: CSSProperties;
+}) {
+ return (
+ <span className={cn("block size-full", className)} style={style}>
+ <img
+ src={lightSrc}
+ alt=""
+ draggable={false}
+ className="size-full object-contain dark:hidden"
+ />
+ <img
+ src={darkSrc}
+ alt=""
+ draggable={false}
+ className="hidden size-full object-contain dark:block"
+ />
+ </span>
+ );
+}
+
+// The Carbon mark sits dimmed while a band of light sweeps across it from the
+// bottom-left to the top-right. The sweep reveals a full-strength copy of the
+// mark through a moving mask, so the light only ever falls inside the logo.
+// Keyframes live in packages/config/tailwind/theme.css.
+export function CarbonPulse({
+ lightSrc = "/carbon-mark-light.svg",
+ darkSrc = "/carbon-mark-dark.svg",
+ size = DEFAULT_SIZE,
+ durationMs = DEFAULT_DURATION_MS,
+ label = "Loading",
+ paused = false,
+ className
+}: CarbonPulseProps) {
+ const safeSize = Number.isFinite(size) && size > 0 ? size : DEFAULT_SIZE;
+ const safeDuration =
+ Number.isFinite(durationMs) && durationMs > 0
+ ? durationMs
+ : DEFAULT_DURATION_MS;
+
+ const style = {
+ width: safeSize,
+ height: safeSize,
+ "--carbon-pulse-duration": `${safeDuration}ms`
+ } as CSSProperties;
+
+ return (
+ <span
+ role="status"
+ aria-live="polite"
+ className={cn("relative inline-flex shrink-0 select-none", className)}
+ style={style}
+ >
+ <Mark
+ lightSrc={lightSrc}
+ darkSrc={darkSrc}
+ className="opacity-25 motion-reduce:opacity-100"
+ />
+ <Mark
+ lightSrc={lightSrc}
+ darkSrc={darkSrc}
+ className="absolute inset-0 animate-carbon-sweep motion-reduce:hidden"
+ style={{
+ ...SWEEP_MASK,
+ animationPlayState: paused ? "paused" : "running"
+ }}
+ />
+ <span className="sr-only">{label}</span>
+ </span>
+ );
+}
diff --git a/packages/react/src/Card.tsx b/packages/react/src/Card.tsx
index fbbbe07614..711193f41f 100644
--- a/packages/react/src/Card.tsx
+++ b/packages/react/src/Card.tsx
@@ -168,7 +168,7 @@ const CardTitle = forwardRef<
<h3
ref={ref}
className={cn(
- "text-base font-medium font-headline leading-none tracking-tight text-foreground/90 text-pretty line-clamp-2",
+ "text-base font-medium leading-none tracking-tight text-foreground/90 text-pretty line-clamp-2",
className
)}
{...props}
diff --git a/packages/react/src/Drawer.tsx b/packages/react/src/Drawer.tsx
index f86c3e031b..8d08566a36 100644
--- a/packages/react/src/Drawer.tsx
+++ b/packages/react/src/Drawer.tsx
@@ -243,7 +243,7 @@ const DrawerTitle = forwardRef<
<DialogPrimitive.Title
ref={ref}
className={cn(
- "text-base font-medium font-headline leading-none tracking-tight text-foreground/90 text-balance line-clamp-1",
+ "text-base font-medium leading-none tracking-tight text-foreground/90 text-balance line-clamp-1",
className
)}
{...props}
diff --git a/packages/react/src/Heading.tsx b/packages/react/src/Heading.tsx
index 9e459ea172..09bdae0a49 100644
--- a/packages/react/src/Heading.tsx
+++ b/packages/react/src/Heading.tsx
@@ -5,15 +5,18 @@ import { forwardRef } from "react";
import { cn } from "./utils/cn";
+// The serif headline face is for page-level titles only. h4 is the compact size
+// record headers (job, picking list, orders) and in-app cards use, so it stays
+// in the body sans alongside the UI chrome around it.
const headingVariants = cva(
- "font-medium font-headline leading-[1.1] tracking-tight text-foreground text-balance",
+ "font-medium leading-[1.1] tracking-tight text-foreground text-balance",
{
variants: {
size: {
- display: "md:text-[44px] text-[36px]",
- h1: "md:text-3xl text-2xl",
- h2: "md:text-2xl text-xl",
- h3: "md:text-xl text-base",
+ display: "font-headline md:text-[44px] text-[36px]",
+ h1: "font-headline md:text-3xl text-2xl",
+ h2: "font-headline md:text-2xl text-xl",
+ h3: "font-headline md:text-xl text-base",
h4: "md:text-base text-sm"
},
noOfLines: {
diff --git a/packages/react/src/LoadingBars.tsx b/packages/react/src/LoadingBars.tsx
deleted file mode 100644
index 0cbf1e8d69..0000000000
--- a/packages/react/src/LoadingBars.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { CSSProperties } from "react";
-
-// Bar heights trace a hexagon silhouette: short at the ends, tallest in the
-// middle. Each bar shimmers between `min` and `peak`, with a staggered delay so
-// a wave travels across while the hexagon stays visible the whole time.
-const BARS = [
- { peak: 24, min: 11 },
- { peak: 47, min: 21 },
- { peak: 70, min: 32 },
- { peak: 80, min: 36 },
- { peak: 70, min: 32 },
- { peak: 47, min: 21 },
- { peak: 24, min: 11 }
-];
-
-export function LoadingBars() {
- return (
- <div className="flex items-center justify-center gap-[3px] h-20">
- {BARS.map((bar, i) => (
- <div
- key={i}
- className="w-[9px] rounded-[2px] bg-primary"
- style={
- {
- height: bar.min,
- animationName: "loading-bars",
- animationDuration: "1.2s",
- animationTimingFunction: "ease-in-out",
- animationIterationCount: "infinite",
- animationDelay: `${i * 0.1}s`,
- "--peak": `${bar.peak}px`,
- "--min": `${bar.min}px`
- } as CSSProperties
- }
- />
- ))}
- <style>
- {`@keyframes loading-bars {
- 0%, 100% { height: var(--min); opacity: 0.4; }
- 50% { height: var(--peak); opacity: 1; }
- }`}
- </style>
- </div>
- );
-}
diff --git a/packages/react/src/Modal.tsx b/packages/react/src/Modal.tsx
index 89421118f4..c983053309 100644
--- a/packages/react/src/Modal.tsx
+++ b/packages/react/src/Modal.tsx
@@ -145,7 +145,7 @@ const ModalTitle = forwardRef<
<DialogPrimitive.Title
ref={ref}
className={cn(
- "text-base font-medium font-headline leading-none tracking-tight text-foreground text-balance",
+ "text-base font-medium leading-none tracking-tight text-foreground text-balance",
className
)}
{...props}
diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx
index 75378e0c4a..f71cee0016 100644
--- a/packages/react/src/index.tsx
+++ b/packages/react/src/index.tsx
@@ -40,6 +40,7 @@ import {
} from "./BottomSheet";
import type { ButtonProps } from "./Button";
import { Button, buttonVariants } from "./Button";
+import { CarbonPulse } from "./CarbonPulse";
import {
Card,
CardAction,
@@ -181,7 +182,6 @@ import { Kbd } from "./Kbd";
import { Label } from "./Label";
import { LabelWithHelp } from "./LabelWithHelp";
import { Loading } from "./Loading";
-import { LoadingBars } from "./LoadingBars";
import {
Menu,
MenuCheckboxItem,
@@ -495,7 +495,7 @@ export {
Label,
LabelWithHelp,
Loading,
- LoadingBars,
+ CarbonPulse,
Menu,
MenuCheckboxItem,
MenuGroup,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd7641bf45..bf6a266e8e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,6 +24,9 @@ catalogs:
'@emoji-mart/react':
specifier: 1.1.1
version: 1.1.1
+ '@fontsource-variable/hedvig-letters-serif':
+ specifier: 5.3.0
+ version: 5.3.0
'@internationalized/date':
specifier: 3.12.0
version: 3.12.0
@@ -741,6 +744,9 @@ importers:
'@epic-web/remember':
specifier: 1.1.0
version: 1.1.0
+ '@fontsource-variable/hedvig-letters-serif':
+ specifier: 'catalog:'
+ version: 5.3.0
'@internationalized/date':
specifier: 'catalog:'
version: 3.12.0
@@ -1204,6 +1210,9 @@ importers:
'@emoji-mart/react':
specifier: 'catalog:'
+ '@fontsource-variable/hedvig-letters-serif':
+ specifier: 'catalog:'
+ version: 5.3.0
'@internationalized/date':
specifier: 'catalog:'
version: 3.12.0
@@ -1469,6 +1478,9 @@ importers:
'@carbon/utils':
specifier: workspace:*
version: link:../../packages/utils
+ '@fontsource-variable/hedvig-letters-serif':
+ specifier: 'catalog:'
+ version: 5.3.0
'@internationalized/date':
specifier: 'catalog:'
version: 3.12.0
@@ -5204,6 +5216,9 @@ packages:
'@floating-ui/[email protected]':
resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-MN6cYKUUb3o1tEECg02+IY6HK9fGHpZOnG+YhJaqU9TEp2FVo2dw8bFrwnxBVJCvnrC0F3xYF2OlXEZMWXZ0Jw==}
+
'@fontsource/[email protected]':
resolution: {integrity: sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg==}
@@ -18224,6 +18239,8 @@ snapshots:
'@floating-ui/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
'@fontsource/[email protected]': {}
'@fontsource/[email protected]': {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 251d5bc697..20d700ff1e 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -59,6 +59,7 @@ catalog:
'@dnd-kit/utilities': 3.2.2
'@emoji-mart/data': 1.2.1
'@emoji-mart/react': 1.1.1
+ '@fontsource-variable/hedvig-letters-serif': 5.3.0
'@internationalized/date': 3.12.0
'@lingui/cli': 5.9.4
'@lingui/core': 5.9.4