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(account): Appearance tab with mode toggle and theme color (#1893)

Brad Barbinbb7bce87ecf6
diff --git a/apps/erp/app/hooks/useTheme.tsx b/apps/erp/app/hooks/useTheme.tsx
index 8d11aee37c..f2a4ef9c78 100644
--- a/apps/erp/app/hooks/useTheme.tsx
+++ b/apps/erp/app/hooks/useTheme.tsx
@@ -9,7 +9,12 @@ import { path } from "~/utils/path";
export function useOptimisticTheme() {
const fetchers = useFetchers();
- const themeFetcher = fetchers.find((f) => f.formAction === path.to.theme);
+ // The account settings Appearance pane posts to the root action instead.
+ const themeFetcher = fetchers.find(
+ (f) =>
+ f.formAction === path.to.theme ||
+ (f.formAction === path.to.root && f.formData?.has("theme"))
+ );
if (themeFetcher && themeFetcher.formData) {
const theme = { theme: themeFetcher.formData.get("theme") };
diff --git a/apps/erp/app/modules/account/ui/AccountSettings.tsx b/apps/erp/app/modules/account/ui/AccountSettings.tsx
index 7efc2b8f47..b87dc7df6d 100644
--- a/apps/erp/app/modules/account/ui/AccountSettings.tsx
+++ b/apps/erp/app/modules/account/ui/AccountSettings.tsx
@@ -12,13 +12,14 @@ import { useUser } from "~/hooks";
import { usePlanGate } from "~/hooks/usePlanGate";
import { usePushSubscription } from "~/hooks/usePushSubscription";
import { TwoFactorUpgradeDialog } from "~/modules/settings";
+import { startModeTransition } from "~/utils/dom";
import { path } from "~/utils/path";
import { dismissBrowserNotificationsPrompt } from "~/utils/push";
/**
- * The shared account settings modal, with the two pieces only the ERP has:
- * browser push (its service worker lives on this origin) and the two-factor
- * plan gate.
+ * The shared account settings modal, with the pieces only the ERP has:
+ * browser push (its service worker lives on this origin), the two-factor
+ * plan gate, and the animated mode change.
*/
export default function AccountSettings() {
const user = useUser();
@@ -29,6 +30,7 @@ export default function AccountSettings() {
api={path.to.api.root}
user={user}
companyId={user.company.id}
+ transitionMode={startModeTransition}
renderBrowserNotifications={(publicKey) => (
<BrowserNotificationsSection publicKey={publicKey} />
)}
diff --git a/apps/erp/app/root.tsx b/apps/erp/app/root.tsx
index bea5e7cc0f..87485d0c8e 100644
--- a/apps/erp/app/root.tsx
+++ b/apps/erp/app/root.tsx
@@ -33,6 +33,7 @@ import {
isSearchParamOnlyNavigation,
modeValidator,
prefetchCacheMiddleware,
+ themeColorValidator,
themes
} from "@carbon/utils";
import { faviconLinks } from "@carbon/utils/favicon";
@@ -69,7 +70,7 @@ import { path } from "~/utils/path";
import "@carbon/lib/shims";
import { MotionConfig } from "motion/react";
import type { Route } from "./+types/root";
-import { getTheme } from "./services/theme.server";
+import { getTheme, setTheme } from "./services/theme.server";
export const middleware = timedMiddleware({
// First: the request scope (context, request id, access log).
@@ -190,9 +191,26 @@ export async function action({ request }: ActionFunctionArgs) {
return data({ error: "Invalid content type" }, { status: 400 });
}
- const validation = await validator(modeValidator).validate(
- await request.formData()
- );
+ const formData = await request.formData();
+
+ // The account settings Appearance pane posts its theme color here too.
+ if (formData.has("theme")) {
+ const themeValidation =
+ await validator(themeColorValidator).validate(formData);
+ if (themeValidation.error) {
+ return data(error(themeValidation.error, "Invalid theme"), {
+ status: 400
+ });
+ }
+ return data(
+ {},
+ {
+ headers: { "Set-Cookie": setTheme(themeValidation.data.theme) }
+ }
+ );
+ }
+
+ const validation = await validator(modeValidator).validate(formData);
if (validation.error) {
return data(error(validation.error, "Invalid mode"), {
diff --git a/apps/mes/app/root.tsx b/apps/mes/app/root.tsx
index 849f115309..b817a5bbf4 100644
--- a/apps/mes/app/root.tsx
+++ b/apps/mes/app/root.tsx
@@ -33,6 +33,7 @@ import {
isSearchParamOnlyNavigation,
modeValidator,
prefetchCacheMiddleware,
+ themeColorValidator,
themes
} from "@carbon/utils";
import { faviconLinks } from "@carbon/utils/favicon";
@@ -68,7 +69,7 @@ import { path } from "~/utils/path";
import "@carbon/lib/shims";
import { MotionConfig } from "motion/react";
import type { Route } from "./+types/root";
-import { getTheme } from "./services/theme.server";
+import { getTheme, setTheme } from "./services/theme.server";
export const middleware = timedMiddleware({
// First: the request scope (context, request id, access log).
@@ -171,9 +172,26 @@ export async function action({ request }: ActionFunctionArgs) {
return data({ error: "Invalid content type" }, { status: 400 });
}
- const validation = await validator(modeValidator).validate(
- await request.formData()
- );
+ const formData = await request.formData();
+
+ // The account settings Appearance pane posts its theme color here too.
+ if (formData.has("theme")) {
+ const themeValidation =
+ await validator(themeColorValidator).validate(formData);
+ if (themeValidation.error) {
+ return data(error(themeValidation.error, "Invalid theme"), {
+ status: 400
+ });
+ }
+ return data(
+ {},
+ {
+ headers: { "Set-Cookie": setTheme(themeValidation.data.theme) }
+ }
+ );
+ }
+
+ const validation = await validator(modeValidator).validate(formData);
if (validation.error) {
return data(error(validation.error, "Invalid mode"), {
diff --git a/apps/starter/app/entry.client.tsx b/apps/starter/app/entry.client.tsx
index 959cae1ae3..b0edc4c796 100644
--- a/apps/starter/app/entry.client.tsx
+++ b/apps/starter/app/entry.client.tsx
@@ -8,7 +8,6 @@ import {
VERCEL_URL
} from "@carbon/auth";
import { ensureLoggingConfigured } from "@carbon/logger/config.client";
-import { OperatingSystemContextProvider } from "@carbon/react";
import posthog from "posthog-js";
import { startTransition, useEffect } from "react";
import { hydrateRoot } from "react-dom/client";
@@ -36,14 +35,10 @@ preloadCatalog(document.documentElement.lang).then(() => {
startTransition(() => {
hydrateRoot(
document,
- <OperatingSystemContextProvider
- platform={
- window.navigator.userAgent.includes("Mac") ? "mac" : "windows"
- }
- >
+ <>
<HydratedRouter />
<PosthogInit />
- </OperatingSystemContextProvider>
+ </>
);
});
});
diff --git a/apps/starter/app/root.tsx b/apps/starter/app/root.tsx
index c37db3c952..ce6f66fd14 100644
--- a/apps/starter/app/root.tsx
+++ b/apps/starter/app/root.tsx
@@ -16,13 +16,20 @@ import { validator } from "@carbon/form";
import { LocaleProvider, resolveLanguage } from "@carbon/locale";
import { requestIdMiddleware } from "@carbon/logger/middleware.server";
import { createInvalidationMiddleware } from "@carbon/query/cache";
-import { Button, Heading, Toaster, useMode } from "@carbon/react";
+import {
+ Button,
+ Heading,
+ OperatingSystemContextProvider,
+ Toaster,
+ useMode
+} from "@carbon/react";
import type { Theme } from "@carbon/utils";
import {
colorSchemeHintScript,
getPreferenceHeaders,
modeValidator,
prefetchCacheMiddleware,
+ themeColorValidator,
themes
} from "@carbon/utils";
import { faviconLinks } from "@carbon/utils/favicon";
@@ -46,14 +53,15 @@ import {
Scripts,
ScrollRestoration,
UNSAFE_FrameworkContext,
- useLoaderData
+ useLoaderData,
+ useRouteLoaderData
} from "react-router";
import { preloadCatalog, useCatalog } from "~/services/lingui";
import { getMode, setMode } from "~/services/mode.server";
import Background from "~/styles/background.css?url";
import NProgress from "~/styles/nprogress.css?url";
import Tailwind from "~/styles/tailwind.css?url";
-import { getTheme } from "./services/theme.server";
+import { getTheme, setTheme } from "./services/theme.server";
export const middleware = [
requestIdMiddleware,
@@ -96,7 +104,7 @@ export async function loader({ request, context }: LoaderFunctionArgs) {
// The starter shares the ERP's catalog: the account settings modal and the
// @carbon/react components it renders are extracted into it.
- const { locale } = getPreferenceHeaders(request);
+ const { locale, platform } = getPreferenceHeaders(request);
const appLanguage = resolveLanguage(locale);
await preloadCatalog(appLanguage);
@@ -114,6 +122,8 @@ export async function loader({ request, context }: LoaderFunctionArgs) {
appLanguage,
// React Aria formats dates and numbers in the full locale (en-GB).
locale,
+ // Shortcut hints (every Button) read it, on the server render too.
+ platform,
...getMode(request),
theme: getTheme(request),
result: context.get(flashResultContext)
@@ -133,9 +143,26 @@ export async function action({ request }: ActionFunctionArgs) {
return data({ error: "Invalid content type" }, { status: 400 });
}
- const validation = await validator(modeValidator).validate(
- await request.formData()
- );
+ const formData = await request.formData();
+
+ // The account settings Appearance pane posts its theme color here too.
+ if (formData.has("theme")) {
+ const themeValidation =
+ await validator(themeColorValidator).validate(formData);
+ if (themeValidation.error) {
+ return data(error(themeValidation.error, "Invalid theme"), {
+ status: 400
+ });
+ }
+ return data(
+ {},
+ {
+ headers: { "Set-Cookie": setTheme(themeValidation.data.theme) }
+ }
+ );
+ }
+
+ const validation = await validator(modeValidator).validate(formData);
if (validation.error) {
return data(error(validation.error, "Invalid mode"), {
@@ -213,7 +240,7 @@ function Document({
<title>{title}</title>
<Links />
</head>
- <body className="h-full bg-background antialiased selection:bg-primary/10 selection:text-primary">
+ <body className="h-full bg-card antialiased selection:bg-primary/10 selection:text-primary">
{children}
<Toaster position="bottom-right" visibleToasts={5} />
<ScrollRestoration />
@@ -253,23 +280,27 @@ export default function App() {
return (
<QueryClientProvider client={queryClient}>
- <LocaleProvider locale={appLanguage} catalog={catalog}>
- {/* Inside the root, so a language change re-renders it with the
- new locale, as in the ERP and MES. */}
- <I18nProvider locale={locale}>
- <Document mode={mode} theme={theme} lang={appLanguage}>
- <Outlet />
- <script
- // Server render only: on the client the nonce is undefined (and browsers hide it).
- nonce={nonce}
- suppressHydrationWarning
- dangerouslySetInnerHTML={{
- __html: `window.env = ${JSON.stringify(env)}`
- }}
- />
- </Document>
- </I18nProvider>
- </LocaleProvider>
+ <OperatingSystemContextProvider
+ platform={loaderData?.platform ?? "windows"}
+ >
+ <LocaleProvider locale={appLanguage} catalog={catalog}>
+ {/* Inside the root, so a language change re-renders it with the
+ new locale, as in the ERP and MES. */}
+ <I18nProvider locale={locale}>
+ <Document mode={mode} theme={theme} lang={appLanguage}>
+ <Outlet />
+ <script
+ // Server render only: on the client the nonce is undefined (and browsers hide it).
+ nonce={nonce}
+ suppressHydrationWarning
+ dangerouslySetInnerHTML={{
+ __html: `window.env = ${JSON.stringify(env)}`
+ }}
+ />
+ </Document>
+ </I18nProvider>
+ </LocaleProvider>
+ </OperatingSystemContextProvider>
</QueryClientProvider>
);
}
@@ -280,28 +311,33 @@ export function ErrorBoundary({ error }: { error: unknown }) {
: error instanceof Error
? error.message
: String(error);
+ // Undefined when the root loader itself failed or no route matched.
+ const platform =
+ useRouteLoaderData<typeof loader>("root")?.platform ?? "windows";
return (
- <Document title="Error!">
- <div className="light">
- <div className="flex flex-col w-full h-screen items-center justify-center space-y-4 ">
- <img
- src="/carbon-mark-light.svg"
- alt="Carbon Logo"
- className="block max-w-[60px] dark:hidden"
- />
- <img
- src="/carbon-mark-dark.svg"
- alt="Carbon Logo"
- className="max-w-[60px] hidden dark:block"
- />
- <Heading size="h1">Something went wrong</Heading>
- <p className="text-muted-foreground max-w-2xl">{message}</p>
- <Button onClick={() => (window.location.href = "/")}>
- Back Home
- </Button>
+ <OperatingSystemContextProvider platform={platform}>
+ <Document title="Error!">
+ <div className="light">
+ <div className="flex flex-col w-full h-screen items-center justify-center space-y-4 ">
+ <img
+ src="/carbon-mark-light.svg"
+ alt="Carbon Logo"
+ className="block max-w-[60px] dark:hidden"
+ />
+ <img
+ src="/carbon-mark-dark.svg"
+ alt="Carbon Logo"
+ className="max-w-[60px] hidden dark:block"
+ />
+ <Heading size="h1">Something went wrong</Heading>
+ <p className="text-muted-foreground max-w-2xl">{message}</p>
+ <Button onClick={() => (window.location.href = "/")}>
+ Back Home
+ </Button>
+ </div>
</div>
- </div>
- </Document>
+ </Document>
+ </OperatingSystemContextProvider>
);
}
diff --git a/apps/starter/app/routes/_public+/callback.tsx b/apps/starter/app/routes/_public+/callback.tsx
index cf8a3ff300..5c2455f63f 100644
--- a/apps/starter/app/routes/_public+/callback.tsx
+++ b/apps/starter/app/routes/_public+/callback.tsx
@@ -155,7 +155,7 @@ export default function AuthCallback() {
}, [fetcher, redirectTo]);
return (
- <div className="fixed inset-0 z-50 flex flex-col items-center justify-center bg-background">
+ <div className="fixed inset-0 z-50 flex flex-col items-center justify-center bg-card">
{error ? (
<>
<div className="flex justify-center mb-8">
diff --git a/apps/starter/app/routes/_public+/login.tsx b/apps/starter/app/routes/_public+/login.tsx
index 10c6c1ada2..33929a906e 100644
--- a/apps/starter/app/routes/_public+/login.tsx
+++ b/apps/starter/app/routes/_public+/login.tsx
@@ -86,7 +86,7 @@ export async function action({ request }: ActionFunctionArgs) {
return error(validation.error, "Invalid email address");
}
- const { email, botToken } = validation.data;
+ const { email, botToken, redirectTo } = validation.data;
const botError = await verifyBotProtection({
token: botToken,
@@ -103,7 +103,13 @@ export async function action({ request }: ActionFunctionArgs) {
const user = await getUserByEmail(email);
if (user.data && user.data.active) {
- const magicLink = await sendMagicLink(email);
+ // Back to this app, not VERCEL_URL: outside `crbn up` that is the ERP's
+ // URL, so the link signed the user in to the ERP instead.
+ const magicLink = await sendMagicLink(
+ email,
+ new URL(request.url).origin,
+ redirectTo
+ );
if (magicLink.error) {
const message = getMagicLinkErrorMessage(magicLink.error);
diff --git a/apps/starter/app/routes/x+/_index.tsx b/apps/starter/app/routes/x+/_index.tsx
index 585988ff1a..119690ca65 100644
--- a/apps/starter/app/routes/x+/_index.tsx
+++ b/apps/starter/app/routes/x+/_index.tsx
@@ -24,7 +24,7 @@ export default function AppIndexRoute() {
);
return (
- <div className="p-8 w-full h-full bg-muted">
+ <div className="p-8 w-full h-full bg-card">
<Heading size="h3">Hello, {user.firstName}</Heading>
<Subheading>{formatter.format(date)}</Subheading>
<Hr />
diff --git a/apps/starter/app/styles/tailwind.css b/apps/starter/app/styles/tailwind.css
index b76f8664de..c6e1770ffd 100644
--- a/apps/starter/app/styles/tailwind.css
+++ b/apps/starter/app/styles/tailwind.css
@@ -116,7 +116,7 @@
@apply border-border;
}
body {
- @apply bg-background text-foreground;
+ @apply bg-card text-foreground;
font-feature-settings: "rlig" 1, "calt" 1;
font-synthesis-weight: none;
text-rendering: optimizeLegibility;
diff --git a/packages/account/AGENTS.md b/packages/account/AGENTS.md
index 6cc8ee5f9c..85aec876a4 100644
--- a/packages/account/AGENTS.md
+++ b/packages/account/AGENTS.md
@@ -1,6 +1,6 @@
# @carbon/account
-The account settings modal — Profile, Notifications, Security — shared by the ERP, the MES
+The account settings modal — Profile, Appearance, Notifications, Security — shared by the ERP, the MES
and the starter. Each app mounts it once in its shell; it opens over any page.
## Always
@@ -21,7 +21,13 @@ and the starter. Each app mounts it once in its shell; it opens over any page.
- **Mount with the app's config** (`AccountSettingsConfig`, `src/ui/context.tsx`): `api`
(`/api` in the ERP, `/x/proxy/api` elsewhere), `user`, `companyId`. Only the ERP passes
`renderBrowserNotifications` (the push service worker is on its origin) and `twoFactor`
- (the plan gate + upgrade dialog) — see `apps/erp/app/modules/account/ui/AccountSettings.tsx`.
+ (the plan gate + upgrade dialog) and `transitionMode` (the view-transition mode wipe, whose
+ CSS is in the ERP's stylesheet) — see `apps/erp/app/modules/account/ui/AccountSettings.tsx`.
+- **Appearance is the one pane that does not call the ERP.** Mode and theme color are
+ per-browser cookies on the HOST app, so the pane posts `mode` / `theme` to the host's own
+ root action (`/`), which every app's `root.tsx` handles (`modeValidator` /
+ `themeColorValidator` from `@carbon/utils`). `useOptimisticMode` only counts a `/`
+ submission carrying `mode`, so the two never read each other's in-flight value.
- Panes read with `useLoaderQuery` (`@carbon/query`), so the host app needs a
`QueryClientProvider`, `window.clientCache` and `createInvalidationMiddleware` in its root.
Strings use Lingui macros, so it also needs a `LocaleProvider`; the package is in the erp
diff --git a/packages/account/src/models.ts b/packages/account/src/models.ts
index 136509c5c5..66094683a6 100644
--- a/packages/account/src/models.ts
+++ b/packages/account/src/models.ts
@@ -9,6 +9,7 @@ import { zfd } from "zod-form-data";
// app that mounts the modal opens it there.
export const accountSettingsTabs = [
"profile",
+ "appearance",
"notifications",
"security"
] as const;
diff --git a/packages/account/src/ui/AccountSettings.tsx b/packages/account/src/ui/AccountSettings.tsx
index fe5a861e1a..e92115b3bc 100644
--- a/packages/account/src/ui/AccountSettings.tsx
+++ b/packages/account/src/ui/AccountSettings.tsx
@@ -14,12 +14,13 @@ import { Trans, useLingui } from "@lingui/react/macro";
import type { ReactElement } from "react";
import { useEffect } from "react";
import { CgProfile } from "react-icons/cg";
-import { LuBell, LuShieldCheck } from "react-icons/lu";
+import { LuBell, LuShieldCheck, LuSunMoon } from "react-icons/lu";
import { useSearchParams } from "react-router";
import type { AccountSettingsTab } from "../models";
import { isAccountSettingsTab } from "../models";
import { useAccountSettings } from "../store";
import AccountAvatar from "./AccountAvatar";
+import AppearanceSettings from "./AppearanceSettings";
import type { AccountSettingsConfig } from "./context";
import { AccountSettingsProvider, useAccountSettingsConfig } from "./context";
import NotificationSettings from "./NotificationSettings";
@@ -28,6 +29,7 @@ import SecuritySettings from "./SecuritySettings";
const PANES: Record<AccountSettingsTab, () => ReactElement> = {
profile: ProfileSettings,
+ appearance: AppearanceSettings,
notifications: NotificationSettings,
security: SecuritySettings
};
@@ -74,6 +76,7 @@ function AccountSettingsModal({ tab }: { tab: AccountSettingsTab }) {
const tabs: { id: AccountSettingsTab; name: string; icon: ReactElement }[] = [
{ id: "profile", name: t`Profile`, icon: <CgProfile /> },
+ { id: "appearance", name: t`Appearance`, icon: <LuSunMoon /> },
{ id: "notifications", name: t`Notifications`, icon: <LuBell /> },
{ id: "security", name: t`Security`, icon: <LuShieldCheck /> }
];
diff --git a/packages/account/src/ui/AppearanceSettings.tsx b/packages/account/src/ui/AppearanceSettings.tsx
new file mode 100644
index 0000000000..307bf29cdd
--- /dev/null
+++ b/packages/account/src/ui/AppearanceSettings.tsx
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,
+// including ports, remain AGPLv3; serving them over a network requires releasing their source.
+
+import {
+ cn,
+ getSystemMode,
+ ToggleGroup,
+ ToggleGroupItem,
+ useMode,
+ useModePreference,
+ useRouteData
+} from "@carbon/react";
+import { modeValidator, themeColorValidator, themes } from "@carbon/utils";
+import { Trans, useLingui } from "@lingui/react/macro";
+import type { CSSProperties } from "react";
+import { useEffect, useRef } from "react";
+import { LuCheck, LuLaptop, LuMoon, LuSun } from "react-icons/lu";
+import { useFetcher } from "react-router";
+import {
+ AccountSettingsPane,
+ AccountSettingsSection
+} from "./AccountSettingsLayout";
+import { useAccountSettingsConfig } from "./context";
+
+// Every app's root action stores both as cookies, so the choice is per browser.
+const ROOT_ACTION = "/";
+
+function linearChannel(value: number) {
+ return value <= 0.03928 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4;
+}
+
+/**
+ * True when black reads better than white on a theme swatch (WCAG contrast).
+ * Swatches are `"H S% L%"` strings, so yellow at 53% lightness still needs
+ * dark ink.
+ */
+function isLightSwatch(hsl: string) {
+ const [h = 0, s = 0, l = 0] = hsl
+ .split(" ")
+ .map((part, index) => Number.parseFloat(part) / (index === 0 ? 1 : 100));
+ const a = s * Math.min(l, 1 - l);
+ const channel = (n: number) => {
+ const k = (n + h / 30) % 12;
+ return linearChannel(l - a * Math.max(-1, Math.min(k - 3, 9 - k, 1)));
+ };
+ const luminance =
+ 0.2126 * channel(0) + 0.7152 * channel(8) + 0.0722 * channel(4);
+ return (luminance + 0.05) / 0.05 > 1.05 / (luminance + 0.05);
+}
+
+export default function AppearanceSettings() {
+ const { t } = useLingui();
+ const { transitionMode } = useAccountSettingsConfig();
+ const mode = useMode();
+ const modePreference = useModePreference();
+ const modeFetcher = useFetcher();
+ const themeFetcher = useFetcher();
+ const routeData = useRouteData<{ theme?: string }>(ROOT_ACTION);
+ const previewedVariables = useRef<string[]>([]);
+
+ // The preview lives on <body> and outranks the theme the root document puts
+ // on <html>. Once the save settles, the root loader has revalidated: drop
+ // the preview so <html> shows the saved theme — or the old one if it failed.
+ useEffect(() => {
+ if (themeFetcher.state !== "idle") return;
+ for (const key of previewedVariables.current) {
+ document.body.style.removeProperty(`--${key}`);
+ }
+ previewedVariables.current = [];
+ }, [themeFetcher.state]);
+
+ // The in-flight choice wins until the root loader revalidates with it.
+ const pendingTheme = themeColorValidator.safeParse({
+ theme: themeFetcher.formData?.get("theme")
+ });
+ const theme = pendingTheme.success
+ ? pendingTheme.data.theme
+ : (routeData?.theme ?? "zinc");
+
+ const onModeChange = (value: string) => {
+ const parsed = modeValidator.shape.mode.safeParse(value);
+ if (!parsed.success || parsed.data === modePreference) return;
+ const nextMode = parsed.data === "system" ? getSystemMode() : parsed.data;
+ const persist = () =>
+ modeFetcher.submit(
+ { mode: parsed.data },
+ { method: "post", action: ROOT_ACTION }
+ );
+
+ if (nextMode === mode) {
+ persist();
+ } else if (transitionMode) {
+ transitionMode(nextMode, persist);
+ } else {
+ // Drop a theme preview written for the old mode.
+ document.body.removeAttribute("style");
+ persist();
+ }
+ };
+
+ const onThemeChange = (value: string) => {
+ const next = themes.find((candidate) => candidate.name === value);
+ if (!next || next.name === theme) return;
+ // Preview at once, until the root loader applies it from the cookie.
+ const variables = mode === "dark" ? next.cssVars.dark : next.cssVars.light;
+ Object.entries(variables).forEach(([key, color]) => {
+ document.body.style.setProperty(`--${key}`, color);
+ });
+ previewedVariables.current = Object.keys(variables);
+ themeFetcher.submit(
+ { theme: next.name },
+ { method: "post", action: ROOT_ACTION }
+ );
+ };
+
+ const modeOptions = [
+ { value: "light", label: t`Light`, icon: <LuSun /> },
+ { value: "dark", label: t`Dark`, icon: <LuMoon /> },
+ { value: "system", label: t`System`, icon: <LuLaptop /> }
+ ];
+
+ return (
+ <AccountSettingsPane
+ title={<Trans>Appearance</Trans>}
+ description={<Trans>How Carbon looks in this browser.</Trans>}
+ >
+ <AccountSettingsSection
+ title={<Trans>Mode</Trans>}
+ description={<Trans>Light, dark, or follow your system setting.</Trans>}
+ action={
+ <ToggleGroup
+ type="single"
+ size="sm"
+ value={modePreference}
+ onValueChange={onModeChange}
+ aria-label={t`Mode`}
+ className="w-fit gap-0.5 rounded-lg border border-border bg-muted p-0.5"
+ >
+ {modeOptions.map((option) => (
+ <ToggleGroupItem
+ key={option.value}
+ value={option.value}
+ className={cn(
+ "gap-1.5 rounded-md px-3 text-muted-foreground",
+ "hover:bg-transparent hover:text-foreground",
+ "data-[state=on]:bg-background data-[state=on]:text-foreground data-[state=on]:shadow-sm",
+ "hover:data-[state=on]:bg-background"
+ )}
+ >
+ {option.icon}
+ {option.label}
+ </ToggleGroupItem>
+ ))}
+ </ToggleGroup>
+ }
+ />
+ <AccountSettingsSection
+ title={<Trans>Theme color</Trans>}
+ description={<Trans>The accent color used across Carbon.</Trans>}
+ >
+ <ToggleGroup
+ type="single"
+ size="sm"
+ value={theme}
+ onValueChange={onThemeChange}
+ aria-label={t`Theme color`}
+ className="grid grid-cols-2 gap-2 sm:grid-cols-4"
+ >
+ {themes.map((option) => {
+ const active = option.name === theme;
+ const swatch = option.activeColor[mode];
+ return (
+ <ToggleGroupItem
+ key={option.name}
+ value={option.name}
+ style={
+ {
+ "--theme-primary": `hsl(${swatch})`
+ } as CSSProperties
+ }
+ className={cn(
+ "h-9 justify-start gap-2 rounded-lg border border-border bg-transparent px-3 text-foreground",
+ "hover:bg-accent hover:text-foreground",
+ "data-[state=on]:border-primary data-[state=on]:bg-transparent data-[state=on]:text-foreground",
+ "hover:data-[state=on]:bg-accent"
+ )}
+ >
+ <span className="flex size-4 shrink-0 items-center justify-center rounded-full bg-[var(--theme-primary)]">
+ {active && (
+ <LuCheck
+ className={cn(
+ "size-3",
+ isLightSwatch(swatch) ? "text-black" : "text-white"
+ )}
+ />
+ )}
+ </span>
+ <span className="truncate">{option.label}</span>
+ </ToggleGroupItem>
+ );
+ })}
+ </ToggleGroup>
+ </AccountSettingsSection>
+ </AccountSettingsPane>
+ );
+}
diff --git a/packages/account/src/ui/context.tsx b/packages/account/src/ui/context.tsx
index 533f736b42..dfe6c0fda7 100644
--- a/packages/account/src/ui/context.tsx
+++ b/packages/account/src/ui/context.tsx
@@ -2,6 +2,7 @@
// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,
// including ports, remain AGPLv3; serving them over a network requires releasing their source.
+import type { Mode } from "@carbon/utils";
import type { ReactNode } from "react";
import { createContext, useContext, useMemo } from "react";
import type { AccountSettingsUser } from "../types";
@@ -20,6 +21,11 @@ export type AccountSettingsConfig = {
* it: the push service worker is registered on the ERP's origin.
*/
renderBrowserNotifications?: (publicKey: string) => ReactNode;
+ /**
+ * Animates a mode change, then calls `persist`. Only the ERP passes it (its
+ * stylesheet carries the transition); elsewhere the mode switches at once.
+ */
+ transitionMode?: (nextMode: Mode, persist: () => void) => void;
/**
* The two-factor plan gate. Only the ERP knows the plan; elsewhere the
* button always starts enrollment.
diff --git a/packages/dev/docker/docker-compose.dev.yml b/packages/dev/docker/docker-compose.dev.yml
index 29d6e13357..8484a236c5 100644
--- a/packages/dev/docker/docker-compose.dev.yml
+++ b/packages/dev/docker/docker-compose.dev.yml
@@ -90,7 +90,10 @@ services:
GOTRUE_DB_DRIVER: postgres
GOTRUE_DB_DATABASE_URL: postgres://supabase_auth_admin:postgres@postgres:5432/postgres
GOTRUE_SITE_URL: ${ERP_URL}
- GOTRUE_URI_ALLOW_LIST: ${ERP_URL},${ERP_URL}/callback,${MES_URL},${MES_URL}/callback,${GTM_URL}
+ # `/**` so a callback carrying `?redirectTo=` still matches — an exact
+ # entry does not, and GoTrue then falls back to GOTRUE_SITE_URL (the
+ # ERP). localhost:4000 is the starter (`pnpm dev:starter`).
+ GOTRUE_URI_ALLOW_LIST: ${ERP_URL},${ERP_URL}/**,${MES_URL},${MES_URL}/**,${GTM_URL},http://localhost:4000,http://localhost:4000/**
GOTRUE_DISABLE_SIGNUP: ${GOTRUE_DISABLE_SIGNUP:-false}
GOTRUE_JWT_SECRET: ${SUPABASE_JWT_SECRET}
GOTRUE_JWT_EXP: 3600
diff --git a/packages/locale/locales/de/erp.po b/packages/locale/locales/de/erp.po
index ccdf3c2b2d..4968930797 100644
--- a/packages/locale/locales/de/erp.po
+++ b/packages/locale/locales/de/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Wie der Stückkosten eines Elements bewertet wird: Standard, Durchschnit
msgid "How are these hours calculated?"
msgstr "Wie werden diese Stunden berechnet?"
+msgid "How Carbon looks in this browser."
+msgstr "So sieht Carbon in diesem Browser aus."
+
msgid "How coverage is worked out"
msgstr "Wie die Abdeckung berechnet wird"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Hell"
+msgid "Light, dark, or follow your system setting."
+msgstr "Hell, dunkel oder Systemeinstellung folgen."
+
msgid "Lights Out (24×7)"
msgstr "Lichter aus (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Materialien mischen: {0}{1}. Bestätigen Sie, dass sie bei diesem Lauf z
msgid "Mobile Phone"
msgstr "Mobiltelefon"
+msgid "Mode"
+msgstr "Modus"
+
msgid "Model Number"
msgstr "Modellnummer"
@@ -20948,6 +20957,9 @@ msgstr "Die Phase „{0}\" ist abgeschlossen – ihr Kontrollpunkt „{1}\" wurd
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "Die {0} Phasen bis zur Live-Schaltung, jede endet an einem Checkpoint. Markieren Sie jede Aufgabe, wenn Sie sie abgeschlossen haben."
+msgid "The accent color used across Carbon."
+msgstr "Die in Carbon verwendete Akzentfarbe."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "Die Buchhaltungsdimension, die Artikel zur Berichterstattung und Analyse kategorisiert."
@@ -21943,6 +21955,9 @@ msgstr "Ihre Termine und Aufteilungen werden erneut aus den Positionen geplant."
msgid "Theme"
msgstr "Design"
+msgid "Theme color"
+msgstr "Designfarbe"
+
msgid "Theme Color"
msgstr "Designfarbe"
diff --git a/packages/locale/locales/de/mes.po b/packages/locale/locales/de/mes.po
index 39dd810c35..5cf99f5738 100644
--- a/packages/locale/locales/de/mes.po
+++ b/packages/locale/locales/de/mes.po
@@ -796,6 +796,9 @@ msgstr "Überschrift {level}"
msgid "Hide description"
msgstr "Beschreibung ausblenden"
+msgid "How Carbon looks in this browser."
+msgstr "Aussehen von Carbon in diesem Browser."
+
msgid "How many were actually picked?"
msgstr "Wie viele wurden tatsächlich gepickt?"
@@ -941,6 +944,9 @@ msgstr "Lassen Sie uns etwas bauen"
msgid "Light"
msgstr "Hell"
+msgid "Light, dark, or follow your system setting."
+msgstr "Hell, dunkel oder Systemeinstellung folgen."
+
msgid "lines"
msgstr "Zeilen"
@@ -1059,6 +1065,9 @@ msgstr "Maximale Anzahl an Datensätzen erreicht"
msgid "Metric"
msgstr "Metrisch"
+msgid "Mode"
+msgstr "Modus"
+
msgid "Model"
msgstr "Modell"
@@ -1944,6 +1953,9 @@ msgstr "System"
msgid "Tag"
msgstr "Tag"
+msgid "The accent color used across Carbon."
+msgstr "Die in Carbon verwendete Akzentfarbe."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "Die abgeschlossene Menge für diesen Arbeitsgang ist geringer als die erforderliche Menge von {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "Das Los wird weiterhin dispositioniert, aber ein NCR kann nicht erstellt
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "Der Timer und die Fertigstellung werden von allen {0} Fertigungsaufträgen geteilt. Die Schritte, Materialien und Dateien hier gehören diesem Fertigungsauftrag."
+msgid "Theme color"
+msgstr "Designfarbe"
+
msgid "then"
msgstr "dann"
diff --git a/packages/locale/locales/en/erp.po b/packages/locale/locales/en/erp.po
index f8d13be5f8..19a40caa31 100644
--- a/packages/locale/locales/en/erp.po
+++ b/packages/locale/locales/en/erp.po
@@ -10413,6 +10413,9 @@ msgstr "How an item's unit cost is valued: Standard, Average, FIFO, or LIFO. Set
msgid "How are these hours calculated?"
msgstr "How are these hours calculated?"
+msgid "How Carbon looks in this browser."
+msgstr "How Carbon looks in this browser."
+
msgid "How coverage is worked out"
msgstr "How coverage is worked out"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Light"
+msgid "Light, dark, or follow your system setting."
+msgstr "Light, dark, or follow your system setting."
+
msgid "Lights Out (24×7)"
msgstr "Lights Out (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Mixing materials: {0}{1}. Confirm they nest together on this run."
msgid "Mobile Phone"
msgstr "Mobile Phone"
+msgid "Mode"
+msgstr "Mode"
+
msgid "Model Number"
msgstr "Model Number"
@@ -20948,6 +20957,9 @@ msgstr "The \"{0}\" phase is done — its \"{1}\" checkpoint has been passed."
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
+msgid "The accent color used across Carbon."
+msgstr "The accent color used across Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "The accounting dimension that categorizes items for reporting and analysis."
@@ -21943,6 +21955,9 @@ msgstr "Their dates and splits are planned again from the lines."
msgid "Theme"
msgstr "Theme"
+msgid "Theme color"
+msgstr "Theme color"
+
msgid "Theme Color"
msgstr "Theme Color"
diff --git a/packages/locale/locales/en/mes.po b/packages/locale/locales/en/mes.po
index c4b19918b9..60177a56ea 100644
--- a/packages/locale/locales/en/mes.po
+++ b/packages/locale/locales/en/mes.po
@@ -796,6 +796,9 @@ msgstr "Heading {level}"
msgid "Hide description"
msgstr "Hide description"
+msgid "How Carbon looks in this browser."
+msgstr "How Carbon looks in this browser."
+
msgid "How many were actually picked?"
msgstr "How many were actually picked?"
@@ -941,6 +944,9 @@ msgstr "Let's build something"
msgid "Light"
msgstr "Light"
+msgid "Light, dark, or follow your system setting."
+msgstr "Light, dark, or follow your system setting."
+
msgid "lines"
msgstr "lines"
@@ -1059,6 +1065,9 @@ msgstr "Maximum number of records reached"
msgid "Metric"
msgstr "Metric"
+msgid "Mode"
+msgstr "Mode"
+
msgid "Model"
msgstr "Model"
@@ -1944,6 +1953,9 @@ msgstr "System"
msgid "Tag"
msgstr "Tag"
+msgid "The accent color used across Carbon."
+msgstr "The accent color used across Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "The lot will still be dispositioned, but an NCR cannot be created until
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
+msgid "Theme color"
+msgstr "Theme color"
+
msgid "then"
msgstr "then"
diff --git a/packages/locale/locales/es/erp.po b/packages/locale/locales/es/erp.po
index 6dd5ae47f2..8c57cd5c22 100644
--- a/packages/locale/locales/es/erp.po
+++ b/packages/locale/locales/es/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Cómo se valora el costo unitario de un artículo: Estándar, Promedio,
msgid "How are these hours calculated?"
msgstr "¿Cómo se calculan estas horas?"
+msgid "How Carbon looks in this browser."
+msgstr "Cómo se ve Carbon en este navegador."
+
msgid "How coverage is worked out"
msgstr "Cómo se calcula la cobertura"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Claro"
+msgid "Light, dark, or follow your system setting."
+msgstr "Claro, oscuro o seguir la configuración del sistema."
+
msgid "Lights Out (24×7)"
msgstr "Sin luces (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Mezcla de materiales: {0}{1}. Confirme que se anidan juntas en esta ejec
msgid "Mobile Phone"
msgstr "Teléfono Móvil"
+msgid "Mode"
+msgstr "Modo"
+
msgid "Model Number"
msgstr "Número de Modelo"
@@ -20948,6 +20957,9 @@ msgstr "La fase \"{0}\" está hecha — su punto de control \"{1}\" ha sido supe
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "Los {0} fases para lanzamiento, cada una terminando en un punto de control. Marca cada tarea conforme la completes."
+msgid "The accent color used across Carbon."
+msgstr "El color de acento utilizado en todo Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "La dimensión contable que categoriza artículos para informes y análisis."
@@ -21943,6 +21955,9 @@ msgstr "Sus fechas y divisiones se planifican nuevamente a partir de las líneas
msgid "Theme"
msgstr "Tema"
+msgid "Theme color"
+msgstr "Color del tema"
+
msgid "Theme Color"
msgstr "Color de tema"
diff --git a/packages/locale/locales/es/mes.po b/packages/locale/locales/es/mes.po
index f136f7ec91..61ebc73b4b 100644
--- a/packages/locale/locales/es/mes.po
+++ b/packages/locale/locales/es/mes.po
@@ -796,6 +796,9 @@ msgstr "Encabezado {level}"
msgid "Hide description"
msgstr "Ocultar descripción"
+msgid "How Carbon looks in this browser."
+msgstr "Cómo se ve Carbon en este navegador."
+
msgid "How many were actually picked?"
msgstr "¿Cuántos se recogieron realmente?"
@@ -941,6 +944,9 @@ msgstr "Construyamos algo"
msgid "Light"
msgstr "Claro"
+msgid "Light, dark, or follow your system setting."
+msgstr "Claro, oscuro, o seguir la configuración del sistema."
+
msgid "lines"
msgstr "líneas"
@@ -1059,6 +1065,9 @@ msgstr "Se alcanzó el número máximo de registros"
msgid "Metric"
msgstr "Métrico"
+msgid "Mode"
+msgstr "Modo"
+
msgid "Model"
msgstr "Modelo"
@@ -1944,6 +1953,9 @@ msgstr "Sistema"
msgid "Tag"
msgstr "Etiqueta"
+msgid "The accent color used across Carbon."
+msgstr "El color de acento utilizado en toda Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "La cantidad completada para esta operación es menor que la cantidad requerida de {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "El lote seguirá siendo disposicionado, pero no se puede crear un NCR ha
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "El temporizador y la finalización se comparten entre todas las {0} órdenes de trabajo. Los pasos, materiales y archivos aquí son propios de esta orden de trabajo."
+msgid "Theme color"
+msgstr "Color del tema"
+
msgid "then"
msgstr "luego"
diff --git a/packages/locale/locales/fr/erp.po b/packages/locale/locales/fr/erp.po
index f94173a894..99960cbcea 100644
--- a/packages/locale/locales/fr/erp.po
+++ b/packages/locale/locales/fr/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Comment le coût unitaire d'un article est évalué : Standard, Moyenne,
msgid "How are these hours calculated?"
msgstr "Comment ces heures sont-elles calculées ?"
+msgid "How Carbon looks in this browser."
+msgstr "Comment Carbon s'affiche dans ce navigateur."
+
msgid "How coverage is worked out"
msgstr "Comment la couverture est calculée"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Clair"
+msgid "Light, dark, or follow your system setting."
+msgstr "Clair, sombre, ou suivre le paramètre de votre système."
+
msgid "Lights Out (24×7)"
msgstr "Lumières éteintes (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Mélange de matériaux : {0}{1}. Confirmez qu'ils s'imbriquent ensemble
msgid "Mobile Phone"
msgstr "Téléphone Mobile"
+msgid "Mode"
+msgstr "Mode"
+
msgid "Model Number"
msgstr "Numéro de modèle"
@@ -20948,6 +20957,9 @@ msgstr "La phase « {0} » est faite — son point de contrôle « {1} » a ét
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "Les {0} phases pour le lancement, chacune se terminant à un point de contrôle. Cochez chaque tâche au fur et à mesure que vous la terminez."
+msgid "The accent color used across Carbon."
+msgstr "La couleur d'accent utilisée dans Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "L'axe analytique de comptabilité qui catégorise les articles pour le rapport et l'analyse."
@@ -21943,6 +21955,9 @@ msgstr "Leurs dates et fractions sont recalculées à partir des lignes."
msgid "Theme"
msgstr "Thème"
+msgid "Theme color"
+msgstr "Couleur du thème"
+
msgid "Theme Color"
msgstr "Couleur du thème"
diff --git a/packages/locale/locales/fr/mes.po b/packages/locale/locales/fr/mes.po
index 7dbe6d655d..63064cfa28 100644
--- a/packages/locale/locales/fr/mes.po
+++ b/packages/locale/locales/fr/mes.po
@@ -796,6 +796,9 @@ msgstr "Titre {level}"
msgid "Hide description"
msgstr "Masquer la description"
+msgid "How Carbon looks in this browser."
+msgstr "Aspect de Carbon dans ce navigateur."
+
msgid "How many were actually picked?"
msgstr "Combien ont réellement été prélevés ?"
@@ -941,6 +944,9 @@ msgstr "Construisons quelque chose"
msgid "Light"
msgstr "Clair"
+msgid "Light, dark, or follow your system setting."
+msgstr "Clair, sombre, ou suivre les paramètres système."
+
msgid "lines"
msgstr "lignes"
@@ -1059,6 +1065,9 @@ msgstr "Nombre maximum d'enregistrements atteint"
msgid "Metric"
msgstr "Métrique"
+msgid "Mode"
+msgstr "Mode"
+
msgid "Model"
msgstr "Modèle"
@@ -1944,6 +1953,9 @@ msgstr "Système"
msgid "Tag"
msgstr "Étiquette"
+msgid "The accent color used across Carbon."
+msgstr "Couleur d'accent utilisée dans Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "La quantité produite pour cette opération est inférieure à la quantité requise de {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "Le lot sera toujours dispositionné, mais un NCR ne peut pas être cré
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "Le chronomètre et l'achèvement sont partagés par tous les {0} ordres de fabrication. Les étapes, matières et fichiers ici sont propres à cet ordre de fabrication."
+msgid "Theme color"
+msgstr "Couleur du thème"
+
msgid "then"
msgstr "puis"
diff --git a/packages/locale/locales/hi/erp.po b/packages/locale/locales/hi/erp.po
index c86687b99c..7a4252ea2d 100644
--- a/packages/locale/locales/hi/erp.po
+++ b/packages/locale/locales/hi/erp.po
@@ -10413,6 +10413,9 @@ msgstr "किसी वस्तु की इकाई लागत का म
msgid "How are these hours calculated?"
msgstr "इन घंटों की गणना कैसे की जाती है?"
+msgid "How Carbon looks in this browser."
+msgstr "यह Carbon इस ब्राउज़र में कैसा दिखता है।"
+
msgid "How coverage is worked out"
msgstr "कवरेज कैसे काम किया जाता है"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "हल्का"
+msgid "Light, dark, or follow your system setting."
+msgstr "हल्का, गहरा, या अपनी सिस्टम सेटिंग का पालन करें।"
+
msgid "Lights Out (24×7)"
msgstr "लाइट्स आउट (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "सामग्री मिलाना: {0}{1}। पुष्टि
msgid "Mobile Phone"
msgstr "मोबाइल फोन"
+msgid "Mode"
+msgstr "मोड"
+
msgid "Model Number"
msgstr "मॉडल नंबर"
@@ -20948,6 +20957,9 @@ msgstr "यह \"{0}\" चरण पूर्ण हो गया — इसक
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "{0} चरणों को लाइव करने के लिए, प्रत्येक एक चेकपॉइंट पर समाप्त होता है। जैसे ही आप प्रत्येक कार्य को पूरा करते हैं, उसे टिक करें।"
+msgid "The accent color used across Carbon."
+msgstr "Carbon में उपयोग किए जाने वाले हाइलाइट रंग।"
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "लेखांकन आयाम जो रिपोर्टिंग और विश्लेषण के लिए आइटम को वर्गीकृत करता है।"
@@ -21943,6 +21955,9 @@ msgstr "उनकी तारीखें और विभाजन पंक
msgid "Theme"
msgstr "थीम"
+msgid "Theme color"
+msgstr "थीम रंग"
+
msgid "Theme Color"
msgstr "थीम रंग"
diff --git a/packages/locale/locales/hi/mes.po b/packages/locale/locales/hi/mes.po
index 02f3afd245..fa76884d4d 100644
--- a/packages/locale/locales/hi/mes.po
+++ b/packages/locale/locales/hi/mes.po
@@ -796,6 +796,9 @@ msgstr "शीर्षक {level}"
msgid "Hide description"
msgstr "विवरण छिपाएं"
+msgid "How Carbon looks in this browser."
+msgstr "इस ब्राउज़र में Carbon कैसा दिखता है।"
+
msgid "How many were actually picked?"
msgstr "वास्तव में कितने चुने गए?"
@@ -941,6 +944,9 @@ msgstr "चलिए कुछ बनाते हैं"
msgid "Light"
msgstr "हल्का"
+msgid "Light, dark, or follow your system setting."
+msgstr "हल्का, गहरा, या अपनी सिस्टम सेटिंग का पालन करें।"
+
msgid "lines"
msgstr "लाइनें"
@@ -1059,6 +1065,9 @@ msgstr "रिकॉर्ड की अधिकतम संख्या त
msgid "Metric"
msgstr "मीट्रिक"
+msgid "Mode"
+msgstr "मोड"
+
msgid "Model"
msgstr "मॉडल"
@@ -1944,6 +1953,9 @@ msgstr "सिस्टम"
msgid "Tag"
msgstr "टैग"
+msgid "The accent color used across Carbon."
+msgstr "Carbon में उपयोग किया जाने वाला उच्चारण रंग।"
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "इस ऑपरेशन के लिए पूर्ण मात्रा आवश्यक मात्रा {targetQuantity} से कम है।"
@@ -1963,6 +1975,9 @@ msgstr "लॉट को अभी भी डिस्पोज़ किया
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "टाइमर और पूर्णता सभी {0} जॉब्स द्वारा साझा की जाती है। यहां चरण, सामग्री और फाइलें इस जॉब की अपनी हैं।"
+msgid "Theme color"
+msgstr "थीम रंग"
+
msgid "then"
msgstr "फिर"
diff --git a/packages/locale/locales/it/erp.po b/packages/locale/locales/it/erp.po
index de5ede297f..934cec5ef8 100644
--- a/packages/locale/locales/it/erp.po
+++ b/packages/locale/locales/it/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Come il costo unitario di un articolo è valutato: Standard, Media, FIFO
msgid "How are these hours calculated?"
msgstr "Come vengono calcolate queste ore?"
+msgid "How Carbon looks in this browser."
+msgstr "Come appare Carbon in questo browser."
+
msgid "How coverage is worked out"
msgstr "Come viene calcolata la copertura"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Chiaro"
+msgid "Light, dark, or follow your system setting."
+msgstr "Chiaro, scuro, o segui l'impostazione di sistema."
+
msgid "Lights Out (24×7)"
msgstr "Spento (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Mescolamento materiali: {0}{1}. Conferma che si adattino insieme in ques
msgid "Mobile Phone"
msgstr "Telefono Mobile"
+msgid "Mode"
+msgstr "Modalità"
+
msgid "Model Number"
msgstr "Numero Modello"
@@ -20948,6 +20957,9 @@ msgstr "La fase \"{0}\" è fatta — il suo checkpoint \"{1}\" è stato superato
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "I {0} fasi per andare live, ognuna che termina a un checkpoint. Spunta ogni attività mentre la completi."
+msgid "The accent color used across Carbon."
+msgstr "Il colore di accento utilizzato in Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "La dimensione contabile che categorizza gli articoli per il reporting e l'analisi."
@@ -21943,6 +21955,9 @@ msgstr "Le loro date e suddivisioni vengono pianificate di nuovo dalle righe."
msgid "Theme"
msgstr "Tema"
+msgid "Theme color"
+msgstr "Colore del tema"
+
msgid "Theme Color"
msgstr "Colore Tema"
diff --git a/packages/locale/locales/it/mes.po b/packages/locale/locales/it/mes.po
index fbb8d6e45c..8f92c65846 100644
--- a/packages/locale/locales/it/mes.po
+++ b/packages/locale/locales/it/mes.po
@@ -796,6 +796,9 @@ msgstr "Intestazione {level}"
msgid "Hide description"
msgstr "Nascondi descrizione"
+msgid "How Carbon looks in this browser."
+msgstr "Come appare Carbon in questo browser."
+
msgid "How many were actually picked?"
msgstr "Quanti sono stati effettivamente prelevati?"
@@ -941,6 +944,9 @@ msgstr "Costruiamo qualcosa"
msgid "Light"
msgstr "Chiaro"
+msgid "Light, dark, or follow your system setting."
+msgstr "Chiaro, scuro, o segui le impostazioni di sistema."
+
msgid "lines"
msgstr "righe"
@@ -1059,6 +1065,9 @@ msgstr "Numero massimo di registrazioni raggiunto"
msgid "Metric"
msgstr "Metrico"
+msgid "Mode"
+msgstr "Modalità"
+
msgid "Model"
msgstr "Modello"
@@ -1944,6 +1953,9 @@ msgstr "Sistema"
msgid "Tag"
msgstr "Etichetta"
+msgid "The accent color used across Carbon."
+msgstr "Il colore di accento utilizzato in Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "La quantità completata per questa operazione è inferiore alla quantità richiesta di {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "Il lotto sarà comunque disposizionato, ma non è possibile creare un NC
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "Il timer e il completamento sono condivisi da tutti gli {0} ordini di produzione. I passi, i materiali e i file qui sono di questo ordine di produzione."
+msgid "Theme color"
+msgstr "Colore del tema"
+
msgid "then"
msgstr "poi"
diff --git a/packages/locale/locales/ja/erp.po b/packages/locale/locales/ja/erp.po
index 81f6506b42..d71d9b6952 100644
--- a/packages/locale/locales/ja/erp.po
+++ b/packages/locale/locales/ja/erp.po
@@ -10413,6 +10413,9 @@ msgstr "品目の単位原価がどのように評価されるかについて:
msgid "How are these hours calculated?"
msgstr "これらの時間はどのように計算されますか?"
+msgid "How Carbon looks in this browser."
+msgstr "このブラウザにおけるCarbonの表示方法。"
+
msgid "How coverage is worked out"
msgstr "カバレッジの計算方法"
@@ -11852,6 +11855,9 @@ msgstr "後入先出"
msgid "Light"
msgstr "ライト"
+msgid "Light, dark, or follow your system setting."
+msgstr "ライト、ダーク、またはシステム設定に従う。"
+
msgid "Lights Out (24×7)"
msgstr "ライツアウト(24×7)"
@@ -12790,6 +12796,9 @@ msgstr "混合材料: {0}{1}。これらがこの実行で一緒にネストさ
msgid "Mobile Phone"
msgstr "携帯電話"
+msgid "Mode"
+msgstr "モード"
+
msgid "Model Number"
msgstr "型番"
@@ -20948,6 +20957,9 @@ msgstr "「{0}」フェーズが完了しました — その「{1}」チェッ
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "{0}個のフェーズをリリースするまで進め、各フェーズはチェックポイントで終了します。完了したタスクをチェックオフしてください。"
+msgid "The accent color used across Carbon."
+msgstr "Carbon全体で使用するアクセントカラー。"
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "レポートと分析のためにアイテムを分類する会計ディメンション。"
@@ -21943,6 +21955,9 @@ msgstr "日付と分割は明細から再度計画されます。"
msgid "Theme"
msgstr "テーマ"
+msgid "Theme color"
+msgstr "テーマカラー"
+
msgid "Theme Color"
msgstr "テーマカラー"
diff --git a/packages/locale/locales/ja/mes.po b/packages/locale/locales/ja/mes.po
index 01319ec27b..06d2d7f2ff 100644
--- a/packages/locale/locales/ja/mes.po
+++ b/packages/locale/locales/ja/mes.po
@@ -796,6 +796,9 @@ msgstr "見出し {level}"
msgid "Hide description"
msgstr "説明を非表示"
+msgid "How Carbon looks in this browser."
+msgstr "このブラウザでのCarbonの表示方法。"
+
msgid "How many were actually picked?"
msgstr "実際にはいくつ選ばれましたか?"
@@ -941,6 +944,9 @@ msgstr "さあ、何かを作りましょう"
msgid "Light"
msgstr "ライト"
+msgid "Light, dark, or follow your system setting."
+msgstr "ライト、ダーク、またはシステム設定に従う。"
+
msgid "lines"
msgstr "行"
@@ -1059,6 +1065,9 @@ msgstr "レコードの最大数に達しました"
msgid "Metric"
msgstr "メートル法"
+msgid "Mode"
+msgstr "モード"
+
msgid "Model"
msgstr "モデル"
@@ -1944,6 +1953,9 @@ msgstr "システム"
msgid "Tag"
msgstr "タグ"
+msgid "The accent color used across Carbon."
+msgstr "Carbon全体で使用されるアクセントカラー。"
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "この工程の完了数量が必要数量 {targetQuantity} を下回っています。"
@@ -1963,6 +1975,9 @@ msgstr "ロットは引き続き処分されますが、少なくとも1つの
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "タイマーと完了はすべての{0}製造指図で共有されます。ステップ、材料、ファイルはこの製造指図専用です。"
+msgid "Theme color"
+msgstr "テーマカラー"
+
msgid "then"
msgstr "その後"
diff --git a/packages/locale/locales/ko/erp.po b/packages/locale/locales/ko/erp.po
index 87c9b14c1a..0a224ddd97 100644
--- a/packages/locale/locales/ko/erp.po
+++ b/packages/locale/locales/ko/erp.po
@@ -10413,6 +10413,9 @@ msgstr "품목의 단위 원가를 평가하는 방법입니다: 표준, 이동
msgid "How are these hours calculated?"
msgstr "이 시간들은 어떻게 계산되나요?"
+msgid "How Carbon looks in this browser."
+msgstr "이 브라우저에서 Carbon이 표시되는 방식"
+
msgid "How coverage is worked out"
msgstr "배치가 어떻게 계산되는지"
@@ -11852,6 +11855,9 @@ msgstr "후입선출"
msgid "Light"
msgstr "라이트"
+msgid "Light, dark, or follow your system setting."
+msgstr "밝음, 어두움 또는 시스템 설정 따르기"
+
msgid "Lights Out (24×7)"
msgstr "조명 꺼짐 (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "혼합 재료: {0}{1}. 이 실행에서 함께 중첩되는지 확인하
msgid "Mobile Phone"
msgstr "휴대전화"
+msgid "Mode"
+msgstr "모드"
+
msgid "Model Number"
msgstr "모델 번호"
@@ -20948,6 +20957,9 @@ msgstr "\"{0}\" 단계가 완료되었습니다 — \"{1}\" 체크포인트를
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "도입까지 {0}단계이며, 각 단계는 체크포인트로 마무리됩니다. 완료한 작업은 체크 표시하세요."
+msgid "The accent color used across Carbon."
+msgstr "Carbon 전체에서 사용하는 강조 색상"
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "보고 및 분석을 위해 항목을 분류하는 회계 차원입니다."
@@ -21943,6 +21955,9 @@ msgstr "그들의 날짜와 분할이 라인에서 다시 계획됩니다."
msgid "Theme"
msgstr "테마"
+msgid "Theme color"
+msgstr "테마 색상"
+
msgid "Theme Color"
msgstr "테마 색상"
diff --git a/packages/locale/locales/ko/mes.po b/packages/locale/locales/ko/mes.po
index 353ed1bcc5..c98349214c 100644
--- a/packages/locale/locales/ko/mes.po
+++ b/packages/locale/locales/ko/mes.po
@@ -796,6 +796,9 @@ msgstr "{level} 제목"
msgid "Hide description"
msgstr "설명 숨기기"
+msgid "How Carbon looks in this browser."
+msgstr "이 브라우저에서 Carbon이 표시되는 방식입니다."
+
msgid "How many were actually picked?"
msgstr "실제로 몇 개를 피킹했습니까?"
@@ -941,6 +944,9 @@ msgstr "무언가를 만들어봅시다"
msgid "Light"
msgstr "라이트"
+msgid "Light, dark, or follow your system setting."
+msgstr "밝음, 어두움 또는 시스템 설정 따르기"
+
msgid "lines"
msgstr "라인"
@@ -1059,6 +1065,9 @@ msgstr "최대 레코드 수에 도달했습니다"
msgid "Metric"
msgstr "미터법"
+msgid "Mode"
+msgstr "모드"
+
msgid "Model"
msgstr "모델"
@@ -1944,6 +1953,9 @@ msgstr "시스템"
msgid "Tag"
msgstr "태그"
+msgid "The accent color used across Carbon."
+msgstr "Carbon 전체에서 사용되는 강조 색상입니다."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "이 공정작업의 완료 수량이 필요 수량 {targetQuantity}보다 적습니다."
@@ -1963,6 +1975,9 @@ msgstr "로트는 여전히 처리되지만 최소한 하나의 Issue Type이
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "타이머와 완료는 모든 {0} 작업 지시에 공유됩니다. 여기의 단계, 자재 및 파일은 이 작업 지시의 것입니다."
+msgid "Theme color"
+msgstr "테마 색상"
+
msgid "then"
msgstr "그 다음"
diff --git a/packages/locale/locales/pl/erp.po b/packages/locale/locales/pl/erp.po
index 7190e61ff3..55bf016a88 100644
--- a/packages/locale/locales/pl/erp.po
+++ b/packages/locale/locales/pl/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Jak koszt jednostkowy artykułu jest wyceniany: Standard, Średnia, FIFO
msgid "How are these hours calculated?"
msgstr "Jak obliczane są te godziny?"
+msgid "How Carbon looks in this browser."
+msgstr "Jak Carbon wygląda w tej przeglądarce."
+
msgid "How coverage is worked out"
msgstr "Jak ustalić pokrycie"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Jasne"
+msgid "Light, dark, or follow your system setting."
+msgstr "Jasny, ciemny lub zgodnie z ustawieniami systemu."
+
msgid "Lights Out (24×7)"
msgstr "Bez oświetlenia (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Mieszanie materiałów: {0}{1}. Potwierdź, że zagnieżdżają się raz
msgid "Mobile Phone"
msgstr "Telefon komórkowy"
+msgid "Mode"
+msgstr "Tryb"
+
msgid "Model Number"
msgstr "Numer modelu"
@@ -20948,6 +20957,9 @@ msgstr "Faza \"{0}\" jest gotowa — jej punkt kontrolny \"{1}\" został zaliczo
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "Fazy {0} przed wdrożeniem, każda kończąca się punktem kontrolnym. Zaznaczaj każde zadanie po jego ukończeniu."
+msgid "The accent color used across Carbon."
+msgstr "Kolor akcentu używany w aplikacji Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "Wymiar księgowy, który kategoryzuje artykuły do raportowania i analizy."
@@ -21943,6 +21955,9 @@ msgstr "Ich daty i podziały są planowane ponownie na podstawie pozycji."
msgid "Theme"
msgstr "Motyw"
+msgid "Theme color"
+msgstr "Kolor motywu"
+
msgid "Theme Color"
msgstr "Kolor motywu"
diff --git a/packages/locale/locales/pl/mes.po b/packages/locale/locales/pl/mes.po
index 6c73a41402..67f35ed045 100644
--- a/packages/locale/locales/pl/mes.po
+++ b/packages/locale/locales/pl/mes.po
@@ -796,6 +796,9 @@ msgstr "Nagłówek {level}"
msgid "Hide description"
msgstr "Ukryj opis"
+msgid "How Carbon looks in this browser."
+msgstr "Jak wygląda Carbon w tej przeglądarce."
+
msgid "How many were actually picked?"
msgstr "Ile faktycznie zostało zebrane?"
@@ -941,6 +944,9 @@ msgstr "Zbudujmy coś"
msgid "Light"
msgstr "Jasny"
+msgid "Light, dark, or follow your system setting."
+msgstr "Jasno, ciemno, lub zgodnie z ustawieniami systemu."
+
msgid "lines"
msgstr "linie"
@@ -1059,6 +1065,9 @@ msgstr "Osiągnięto maksymalną liczbę rekordów"
msgid "Metric"
msgstr "Metryczny"
+msgid "Mode"
+msgstr "Tryb"
+
msgid "Model"
msgstr "Model"
@@ -1944,6 +1953,9 @@ msgstr "System"
msgid "Tag"
msgstr "Tag"
+msgid "The accent color used across Carbon."
+msgstr "Kolor akcentu używany w Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "Ukończona ilość dla tej operacji jest mniejsza niż wymagana ilość {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "Partia będzie nadal dyspozycjonowana, ale nie można utworzyć NCR, dop
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "Czasomierz i zakończenie są wspólne dla wszystkich {0} zleceń produkcyjnych. Kroki, materiały i pliki tutaj należą do tego zlecenia produkcyjnego."
+msgid "Theme color"
+msgstr "Kolor motywu"
+
msgid "then"
msgstr "następnie"
diff --git a/packages/locale/locales/pt/erp.po b/packages/locale/locales/pt/erp.po
index acbf018188..485bd1a476 100644
--- a/packages/locale/locales/pt/erp.po
+++ b/packages/locale/locales/pt/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Como o custo unitário de um artigo é avaliado: Padrão, Média, FIFO o
msgid "How are these hours calculated?"
msgstr "Como estas horas são calculadas?"
+msgid "How Carbon looks in this browser."
+msgstr "Como o Carbon aparece neste navegador."
+
msgid "How coverage is worked out"
msgstr "Como a cobertura é calculada"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Claro"
+msgid "Light, dark, or follow your system setting."
+msgstr "Claro, escuro ou seguir a configuração do sistema."
+
msgid "Lights Out (24×7)"
msgstr "Luzes Apagadas (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Mistura de materiais: {0}{1}. Confirme que eles se encaixam juntos nesta
msgid "Mobile Phone"
msgstr "Telefone Móvel"
+msgid "Mode"
+msgstr "Modo"
+
msgid "Model Number"
msgstr "Número do Modelo"
@@ -20948,6 +20957,9 @@ msgstr "A fase \"{0}\" está concluída — seu ponto de verificação \"{1}\" f
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "Os {0} fases para entrar em produção, cada uma terminando em um ponto de verificação. Marque cada tarefa conforme a concluir."
+msgid "The accent color used across Carbon."
+msgstr "A cor de destaque usada em todo o Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "A dimensão contábil que categoriza itens para relatórios e análises."
@@ -21943,6 +21955,9 @@ msgstr "Suas datas e divisões são planejadas novamente a partir das linhas."
msgid "Theme"
msgstr "Tema"
+msgid "Theme color"
+msgstr "Cor do tema"
+
msgid "Theme Color"
msgstr "Cor do Tema"
diff --git a/packages/locale/locales/pt/mes.po b/packages/locale/locales/pt/mes.po
index 034905b0bc..02f6d9662f 100644
--- a/packages/locale/locales/pt/mes.po
+++ b/packages/locale/locales/pt/mes.po
@@ -796,6 +796,9 @@ msgstr "Título {level}"
msgid "Hide description"
msgstr "Ocultar descrição"
+msgid "How Carbon looks in this browser."
+msgstr "Como o Carbon é exibido neste navegador."
+
msgid "How many were actually picked?"
msgstr "Quantos foram realmente apanhados?"
@@ -941,6 +944,9 @@ msgstr "Vamos construir algo"
msgid "Light"
msgstr "Claro"
+msgid "Light, dark, or follow your system setting."
+msgstr "Claro, escuro ou seguir a configuração do sistema."
+
msgid "lines"
msgstr "linhas"
@@ -1059,6 +1065,9 @@ msgstr "Número máximo de registros atingido"
msgid "Metric"
msgstr "Métrico"
+msgid "Mode"
+msgstr "Modo"
+
msgid "Model"
msgstr "Modelo"
@@ -1944,6 +1953,9 @@ msgstr "Sistema"
msgid "Tag"
msgstr "Etiqueta"
+msgid "The accent color used across Carbon."
+msgstr "A cor de destaque usada em todo o Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "A quantidade concluída para esta operação é menor que a quantidade requerida de {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "O lote ainda será disposicionado, mas um NCR não pode ser criado até
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "O temporizador e a conclusão são compartilhados por todas as {0} ordens de produção. Etapas, materiais e arquivos aqui são próprios desta ordem de produção."
+msgid "Theme color"
+msgstr "Cor do tema"
+
msgid "then"
msgstr "depois"
diff --git a/packages/locale/locales/ru/erp.po b/packages/locale/locales/ru/erp.po
index 1a50a8d5e6..1957a64c74 100644
--- a/packages/locale/locales/ru/erp.po
+++ b/packages/locale/locales/ru/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Как оценивается себестоимость за едини
msgid "How are these hours calculated?"
msgstr "Как рассчитываются эти часы?"
+msgid "How Carbon looks in this browser."
+msgstr "Внешний вид Carbon в этом браузере."
+
msgid "How coverage is worked out"
msgstr "Как рассчитывается покрытие"
@@ -11852,6 +11855,9 @@ msgstr "ЛИФО"
msgid "Light"
msgstr "Светлая"
+msgid "Light, dark, or follow your system setting."
+msgstr "Светлая, тёмная или следовать системным параметрам."
+
msgid "Lights Out (24×7)"
msgstr "Темное производство (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Смешивание материалов: {0}{1}. Подтвердит
msgid "Mobile Phone"
msgstr "Мобильный телефон"
+msgid "Mode"
+msgstr "Режим"
+
msgid "Model Number"
msgstr "Номер модели"
@@ -20948,6 +20957,9 @@ msgstr "Фаза «{0}» завершена — её контрольная то
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "Фазы {0} до запуска, каждая заканчивается контрольной точкой. Отмечайте каждую задачу по мере её выполнения."
+msgid "The accent color used across Carbon."
+msgstr "Цвет акцента, используемый во всём Carbon."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "Измерение бухгалтерии, которое категоризирует номенклатуру для отчетности и анализа."
@@ -21943,6 +21955,9 @@ msgstr "Их даты и разделения снова планируются
msgid "Theme"
msgstr "Тема"
+msgid "Theme color"
+msgstr "Цвет темы"
+
msgid "Theme Color"
msgstr "Цвет темы"
diff --git a/packages/locale/locales/ru/mes.po b/packages/locale/locales/ru/mes.po
index f455b57e83..84451767e3 100644
--- a/packages/locale/locales/ru/mes.po
+++ b/packages/locale/locales/ru/mes.po
@@ -796,6 +796,9 @@ msgstr "Заголовок {level}"
msgid "Hide description"
msgstr "Скрыть описание"
+msgid "How Carbon looks in this browser."
+msgstr "Внешний вид Carbon в этом браузере."
+
msgid "How many were actually picked?"
msgstr "Сколько было фактически собрано?"
@@ -941,6 +944,9 @@ msgstr "Давайте создадим что-то"
msgid "Light"
msgstr "Светлый"
+msgid "Light, dark, or follow your system setting."
+msgstr "Светлая, тёмная или согласно параметрам системы."
+
msgid "lines"
msgstr "строки"
@@ -1059,6 +1065,9 @@ msgstr "Достигнуто максимальное количество за
msgid "Metric"
msgstr "Метрическая"
+msgid "Mode"
+msgstr "Режим"
+
msgid "Model"
msgstr "Модель"
@@ -1944,6 +1953,9 @@ msgstr "Система"
msgid "Tag"
msgstr "Тег"
+msgid "The accent color used across Carbon."
+msgstr "Цвет акцента, используемый во всём Carbon."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "Количество готовой продукции по этой операции меньше требуемого количества {targetQuantity}."
@@ -1963,6 +1975,9 @@ msgstr "Партия все еще будет распределена, но NCR
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "Таймер и завершение общие для всех {0} производственных заказов. Шаги, материалы и файлы здесь — собственность этого производственного заказа."
+msgid "Theme color"
+msgstr "Цвет темы"
+
msgid "then"
msgstr "затем"
diff --git a/packages/locale/locales/tr/erp.po b/packages/locale/locales/tr/erp.po
index cbae2c8dd3..12ef0744f8 100644
--- a/packages/locale/locales/tr/erp.po
+++ b/packages/locale/locales/tr/erp.po
@@ -10413,6 +10413,9 @@ msgstr "Bir öğenin birim maliyeti nasıl değerlendirilir: Standart, Ortalama,
msgid "How are these hours calculated?"
msgstr "Bu saatler nasıl hesaplanır?"
+msgid "How Carbon looks in this browser."
+msgstr "Carbon'un bu tarayıcıda nasıl göründüğü."
+
msgid "How coverage is worked out"
msgstr "Kapasite nasıl hesaplanır"
@@ -11852,6 +11855,9 @@ msgstr "LIFO"
msgid "Light"
msgstr "Aydınlık"
+msgid "Light, dark, or follow your system setting."
+msgstr "Açık, Koyu veya sistem ayarınız."
+
msgid "Lights Out (24×7)"
msgstr "Işıklar Kapalı (24×7)"
@@ -12790,6 +12796,9 @@ msgstr "Malzemeleri karıştırma: {0}{1}. Bu çalıştırmada birbirine uygun o
msgid "Mobile Phone"
msgstr "Cep Telefonu"
+msgid "Mode"
+msgstr "Mod"
+
msgid "Model Number"
msgstr "Model Numarası"
@@ -20948,6 +20957,9 @@ msgstr "\"{0}\" aşaması tamamlandı — \"{1}\" denetim noktası geçti."
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "{0} aşamayı canlı yayına almak için, her biri bir kontrol noktasında sona eriyor. Her görevi tamamladıkça işaretleyin."
+msgid "The accent color used across Carbon."
+msgstr "Carbon'da kullanılan vurgu rengi."
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "Raporlama ve analiz için öğeleri kategorize eden muhasebe boyutu."
@@ -21943,6 +21955,9 @@ msgstr "Tarihleri ve bölünüşleri satırlardan yeniden planlanır."
msgid "Theme"
msgstr "Tema"
+msgid "Theme color"
+msgstr "Tema Rengi"
+
msgid "Theme Color"
msgstr "Tema Rengi"
diff --git a/packages/locale/locales/tr/mes.po b/packages/locale/locales/tr/mes.po
index 46875af417..27550730e1 100644
--- a/packages/locale/locales/tr/mes.po
+++ b/packages/locale/locales/tr/mes.po
@@ -796,6 +796,9 @@ msgstr "Başlık {level}"
msgid "Hide description"
msgstr "Açıklamayı gizle"
+msgid "How Carbon looks in this browser."
+msgstr "Bu tarayıcıda Carbon'un görünüşü."
+
msgid "How many were actually picked?"
msgstr "Gerçekte kaç tane alındı?"
@@ -941,6 +944,9 @@ msgstr "Bir şeyler inşa edelim"
msgid "Light"
msgstr "Açık"
+msgid "Light, dark, or follow your system setting."
+msgstr "Açık, koyu veya sistem ayarınızı takip edin."
+
msgid "lines"
msgstr "satırlar"
@@ -1059,6 +1065,9 @@ msgstr "Maksimum kayıt sayısına ulaşıldı"
msgid "Metric"
msgstr "Metrik"
+msgid "Mode"
+msgstr "Mod"
+
msgid "Model"
msgstr "Model"
@@ -1944,6 +1953,9 @@ msgstr "Sistem"
msgid "Tag"
msgstr "Etiket"
+msgid "The accent color used across Carbon."
+msgstr "Carbon'da kullanılan vurgu rengi."
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "Bu işlem için tamamlanan miktar, gerekli miktar olan {targetQuantity}'dan azdır."
@@ -1963,6 +1975,9 @@ msgstr "Lot yine de işleme tabi tutulacak, ancak en az bir Sorun Türü yapıla
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "Zamanlayıcı ve tamamlama tüm {0} iş emirleri tarafından paylaşılır. Buradaki adımlar, malzemeler ve dosyalar bu iş emrinin kendisinindir."
+msgid "Theme color"
+msgstr "Tema rengi"
+
msgid "then"
msgstr "sonra"
diff --git a/packages/locale/locales/zh/erp.po b/packages/locale/locales/zh/erp.po
index 9c43380a3e..e977591dab 100644
--- a/packages/locale/locales/zh/erp.po
+++ b/packages/locale/locales/zh/erp.po
@@ -10413,6 +10413,9 @@ msgstr "物料的单位成本估价方法:标准成本、平均成本、先进
msgid "How are these hours calculated?"
msgstr "这些小时数是如何计算的?"
+msgid "How Carbon looks in this browser."
+msgstr "Carbon 在此浏览器中的外观"
+
msgid "How coverage is worked out"
msgstr "如何计算覆盖范围"
@@ -11852,6 +11855,9 @@ msgstr "后进先出"
msgid "Light"
msgstr "浅色"
+msgid "Light, dark, or follow your system setting."
+msgstr "浅色、深色或跟随系统设置"
+
msgid "Lights Out (24×7)"
msgstr "熄灯(24×7)"
@@ -12790,6 +12796,9 @@ msgstr "混合材料:{0}{1}。确认它们在此运行中可以相互嵌套。
msgid "Mobile Phone"
msgstr "手机"
+msgid "Mode"
+msgstr "模式"
+
msgid "Model Number"
msgstr "型号"
@@ -20948,6 +20957,9 @@ msgstr "\"{0}\"阶段已完成——其\"{1}\"检查点已通过。"
msgid "The {0} phases to go live, each ending at a checkpoint. Tick off each task as you complete it."
msgstr "达成上线的{0}个阶段,每个阶段以检查点结束。当您完成每个任务时,将其勾选。"
+msgid "The accent color used across Carbon."
+msgstr "整个 Carbon 中使用的强调色"
+
msgid "The accounting dimension that categorizes items for reporting and analysis."
msgstr "对物料进行分类以用于报告和分析的会计维度。"
@@ -21943,6 +21955,9 @@ msgstr "其日期和拆分从行中重新计划。"
msgid "Theme"
msgstr "主题"
+msgid "Theme color"
+msgstr "主题色"
+
msgid "Theme Color"
msgstr "主题颜色"
diff --git a/packages/locale/locales/zh/mes.po b/packages/locale/locales/zh/mes.po
index c60e69e702..7b19386eb7 100644
--- a/packages/locale/locales/zh/mes.po
+++ b/packages/locale/locales/zh/mes.po
@@ -796,6 +796,9 @@ msgstr "标题 {level}"
msgid "Hide description"
msgstr "隐藏描述"
+msgid "How Carbon looks in this browser."
+msgstr "Carbon 在此浏览器中的外观。"
+
msgid "How many were actually picked?"
msgstr "实际拣了多少?"
@@ -941,6 +944,9 @@ msgstr "让我们开始构建"
msgid "Light"
msgstr "浅色"
+msgid "Light, dark, or follow your system setting."
+msgstr "浅色、深色或跟随系统设置。"
+
msgid "lines"
msgstr "行"
@@ -1059,6 +1065,9 @@ msgstr "已达到最大记录数"
msgid "Metric"
msgstr "公制"
+msgid "Mode"
+msgstr "模式"
+
msgid "Model"
msgstr "模型"
@@ -1944,6 +1953,9 @@ msgstr "系统"
msgid "Tag"
msgstr "标签"
+msgid "The accent color used across Carbon."
+msgstr "整个 Carbon 中使用的强调色。"
+
msgid "The completed quantity for this operation is less than the required quantity of {targetQuantity}."
msgstr "此工序的完成数量小于所需数量 {targetQuantity}。"
@@ -1963,6 +1975,9 @@ msgstr "该批次仍将进行处置,但在至少配置一个问题类型之前
msgid "The timer and completion are shared by all {0} jobs. Steps, materials and files here are this job's own."
msgstr "计时器和完成状态由所有 {0} 个工单共享。此处的步骤、物料和文件属于此工单。"
+msgid "Theme color"
+msgstr "主题颜色"
+
msgid "then"
msgstr "然后"
diff --git a/packages/react/src/hooks/useMode.tsx b/packages/react/src/hooks/useMode.tsx
index 0484945a95..16840b2824 100644
--- a/packages/react/src/hooks/useMode.tsx
+++ b/packages/react/src/hooks/useMode.tsx
@@ -17,7 +17,10 @@ type RootModeData = { mode?: Mode; modePreference?: ModePreference };
export function useOptimisticMode() {
const fetchers = useFetchers();
- const modeFetcher = fetchers.find((f) => f.formAction === "/");
+ // The root action also takes a theme color; only a mode submission counts.
+ const modeFetcher = fetchers.find(
+ (f) => f.formAction === "/" && f.formData?.has("mode")
+ );
if (modeFetcher && modeFetcher.formData) {
const mode = { mode: modeFetcher.formData.get("mode") };
diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
index abe46025af..8dd6fe6781 100644
--- a/packages/utils/src/types.ts
+++ b/packages/utils/src/types.ts
@@ -3,6 +3,7 @@
// including ports, remain AGPLv3; serving them over a network requires releasing their source.
import { z } from "zod";
+import { themes } from "./themes";
export enum Edition {
Cloud = "cloud",
@@ -20,6 +21,13 @@ export const modeValidator = z.object({
mode: z.enum(["light", "dark", "system"])
});
+/** A theme color by name — one of `themes`. Stored per browser, like the mode. */
+export const themeColorValidator = z.object({
+ theme: z.string().refine((name) => themes.some((t) => t.name === name), {
+ message: "Invalid theme"
+ })
+});
+
export enum Plan {
Starter = "STARTER",
Business = "BUSINESS",