Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

✨ Dark mode (#2087)

Luke Vella3505e5734b3f
diff --git a/apps/landing/src/app/[locale]/(main)/footer.tsx b/apps/landing/src/app/[locale]/(main)/footer.tsx
index 9be77378f..25cb91737 100644
--- a/apps/landing/src/app/[locale]/(main)/footer.tsx
+++ b/apps/landing/src/app/[locale]/(main)/footer.tsx
@@ -100,7 +100,7 @@ export const Footer: React.FunctionComponent = () => {
<a
target="_blank"
href="https://twitter.com/ralllyco"
- className="text-gray-500 text-sm hover:text-primary-600 hover:no-underline"
+ className="text-gray-500 text-sm hover:text-primary hover:no-underline"
rel="noreferrer noopener"
>
<TwitterIcon className="size-5" />
@@ -108,7 +108,7 @@ export const Footer: React.FunctionComponent = () => {
<a
target="_blank"
href="https://discord.gg/uzg4ZcHbuM"
- className="text-gray-500 text-sm hover:text-primary-600 hover:no-underline"
+ className="text-gray-500 text-sm hover:text-primary hover:no-underline"
rel="noreferrer noopener"
>
<DiscordIcon className="size-5" />
@@ -116,7 +116,7 @@ export const Footer: React.FunctionComponent = () => {
<a
target="_blank"
href="https://www.linkedin.com/company/rallly"
- className="text-gray-500 text-sm hover:text-primary-600 hover:no-underline"
+ className="text-gray-500 text-sm hover:text-primary hover:no-underline"
rel="noreferrer noopener"
>
<LinkedinIcon className="size-5" />
@@ -124,7 +124,7 @@ export const Footer: React.FunctionComponent = () => {
<a
target="_blank"
href="https://github.com/lukevella/rallly"
- className="text-gray-500 text-sm hover:text-primary-600 hover:no-underline"
+ className="text-gray-500 text-sm hover:text-primary hover:no-underline"
rel="noreferrer noopener"
>
<GithubIcon className="size-5" />
@@ -236,7 +236,7 @@ export const Footer: React.FunctionComponent = () => {
</div>
<a
href="https://support.rallly.co/contribute/translations"
- className="inline-flex h-8 items-center rounded-md border px-3 text-gray-500 text-xs hover:border-primary-600 hover:text-primary-600"
+ className="inline-flex h-8 items-center rounded-md border px-3 text-gray-500 text-xs hover:border-primary hover:text-primary"
>
<LanguagesIcon className="mr-2 size-5" />
<Trans ns="common" i18nKey="volunteerTranslator" /> &rarr;
diff --git a/apps/landing/src/app/[locale]/(main)/layout.tsx b/apps/landing/src/app/[locale]/(main)/layout.tsx
index 83d53e85b..3858a9dd3 100644
--- a/apps/landing/src/app/[locale]/(main)/layout.tsx
+++ b/apps/landing/src/app/[locale]/(main)/layout.tsx
@@ -99,7 +99,7 @@ export default async function Root(props: {
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuLabel className="space-y-2">
- <Button variant="secondary" className="w-full" asChild>
+ <Button variant="default" className="w-full" asChild>
<LinkBase href={linkToApp("/login")}>
<Trans t={t} i18nKey="login" defaults="Login" />
</LinkBase>
diff --git a/apps/landing/src/app/[locale]/globals.css b/apps/landing/src/app/[locale]/globals.css
index 105bf3702..ae921276a 100644
--- a/apps/landing/src/app/[locale]/globals.css
+++ b/apps/landing/src/app/[locale]/globals.css
@@ -49,7 +49,7 @@ body {
@apply my-12;
}
a {
- @apply text-primary-600 hover:underline;
+ @apply text-primary hover:underline;
}
blockquote {
@apply my-6 border-l-4 border-gray-300 pl-4 italic text-gray-700;
diff --git a/apps/landing/src/components/error-page.tsx b/apps/landing/src/components/error-page.tsx
index bb5884390..bc0503c88 100644
--- a/apps/landing/src/components/error-page.tsx
+++ b/apps/landing/src/components/error-page.tsx
@@ -25,9 +25,7 @@ const ErrorPage: React.FunctionComponent<ComponentProps> = ({
{icon || (
<FileSearchIcon className="mb-4 inline-block size-24 text-gray-400" />
)}
- <div className="mb-2 font-bold text-3xl text-primary-600">
- {title}
- </div>
+ <div className="mb-2 font-bold text-3xl text-primary">{title}</div>
<p className="text-gray-600">{description}</p>
</div>
<div className="flex justify-center space-x-3">
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index 0d7d073e4..586fabd85 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -122,7 +122,6 @@
"dateAndTimeDescription": "Change your preferred date and time settings",
"createdTime": "Created {relativeTime}",
"planFree": "Free",
- "Billing": "Billing",
"becomeATranslator": "Help translate",
"noPolls": "No polls",
"noPollsDescription": "Get started by creating a new poll.",
@@ -259,7 +258,6 @@
"paginationPrevious": "Previous",
"paginationPage": "Page {currentPage, number} of {totalPages, number}",
"paginationNext": "Next",
- "upgradeToProDesc": "Unlock all Pro features",
"searchPollsPlaceholder": "Search polls by title...",
"poll": "Poll",
"sendFeedbackDesc": "Share your feedback with us.",
@@ -554,5 +552,10 @@
"emailChangeInvalidUserId": "Please login with the same email address as the one you used to request the change.",
"ssoAuthenticationOnly": "Authentication is managed through Single Sign-On (SSO). Password management is not available.",
"oidcAutoSignInDescription": "You are being redirected to the login page...",
- "loginVerifyCheckEmail": "If an account exists with this email, you will receive a verification code at <b>{email}</b>"
+ "loginVerifyCheckEmail": "If an account exists with this email, you will receive a verification code at <b>{email}</b>",
+ "themeSystem": "System",
+ "themeLight": "Light",
+ "themeDark": "Dark",
+ "theme": "Theme",
+ "themeDescription": "Choose your preferred appearance"
}
diff --git a/apps/web/src/app/[locale]/(auth)/layout.tsx b/apps/web/src/app/[locale]/(auth)/layout.tsx
index 00b2f3103..7fb1202a9 100644
--- a/apps/web/src/app/[locale]/(auth)/layout.tsx
+++ b/apps/web/src/app/[locale]/(auth)/layout.tsx
@@ -1,6 +1,3 @@
-import { cn } from "@rallly/ui";
-import { DotPattern } from "@rallly/ui/dot-pattern";
-
import {
isQuickCreateEnabled,
QuickCreateButton,
@@ -13,8 +10,8 @@ export default async function Layout({
children: React.ReactNode;
}) {
return (
- <div className="relative flex h-dvh flex-col items-center justify-center bg-gray-100">
- <div className="z-10 flex w-full flex-1 bg-white lg:p-4">
+ <div className="relative flex h-dvh flex-col items-center justify-center bg-background">
+ <div className="z-10 flex w-full flex-1 lg:p-4">
<div className="flex flex-1 flex-col gap-4 p-6">
<div className="my-auto">
<div className="mx-auto w-full max-w-sm">{children}</div>
@@ -26,17 +23,10 @@ export default async function Layout({
) : null}
</div>
{isQuickCreateEnabled ? (
- <div className="relative hidden flex-1 flex-col justify-center rounded-lg border border-gray-100 bg-gray-50 lg:flex lg:p-16">
+ <div className="relative hidden flex-1 flex-col justify-center rounded-lg border bg-muted/50 lg:flex lg:p-16">
<div className="z-10 mx-auto w-full max-w-md">
<QuickCreateWidget />
</div>
- <DotPattern
- cx={10}
- cy={10}
- className={cn(
- "mask-[radial-gradient(400px_circle_at_top,white,transparent)]",
- )}
- />
</div>
) : null}
</div>
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/or-divider.tsx b/apps/web/src/app/[locale]/(auth)/login/components/or-divider.tsx
index 822cb00f6..5ab29dc3c 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/or-divider.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/or-divider.tsx
@@ -4,9 +4,9 @@ export async function OrDivider() {
const { t } = await getTranslation();
return (
<div className="flex items-center gap-x-2.5">
- <hr className="grow border-gray-100" />
+ <hr className="grow border-gray-100 dark:border-gray-700" />
<div className="text-muted-foreground lowercase">{t("or")}</div>
- <hr className="grow border-gray-100" />
+ <hr className="grow border-gray-100 dark:border-gray-700" />
</div>
);
}
diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx
index 946409a10..1e9b1d26f 100644
--- a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx
@@ -41,7 +41,7 @@ export default async function VerifyPage() {
defaults="If an account exists with this email, you will receive a verification code at <b>{email}</b>"
values={{ email }}
components={{
- b: <strong className="font-medium text-gray-800" />,
+ b: <strong className="font-medium text-foreground" />,
}}
/>
</AuthPageDescription>
diff --git a/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx b/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx
index 3377144ea..9e62cf55e 100644
--- a/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx
@@ -42,7 +42,7 @@ export function ResetPasswordForm() {
if (!token) {
return (
- <Alert variant="destructive">
+ <Alert variant="error">
<AlertDescription>
<p>
<Trans
diff --git a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
index e20307427..ecb30179e 100644
--- a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
@@ -24,15 +24,15 @@ export default async function Page() {
}
return (
- <div className="absolute inset-0 h-dvh overflow-auto bg-gray-100">
- <div className="sticky top-0 z-20 border-b bg-gray-100/90 p-3 backdrop-blur-md sm:grid-cols-3">
+ <div className="absolute inset-0 h-dvh overflow-auto bg-gray-100 dark:bg-gray-900">
+ <div className="sticky top-0 z-20 border-b bg-gray-100/90 p-3 backdrop-blur-md sm:grid-cols-3 dark:bg-gray-900/90">
<div className="mx-auto flex items-center justify-between gap-x-2">
<div className="flex items-center gap-x-4 sm:flex-1">
<BackButton />
</div>
<div className="flex flex-1 sm:justify-center">
- <div className="flex items-center gap-x-3">
- <PollPageIcon size="sm" />
+ <div className="flex items-center gap-x-2">
+ <PollPageIcon size="xs" />
<div className="flex items-baseline gap-x-8">
<h1 className="font-semibold">
<Trans i18nKey="poll" defaults="Poll" />
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx
index 0cc9a0021..32b849e02 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx
@@ -29,11 +29,11 @@ export const GuestPollAlert = () => {
defaults="<0>Create an account</0> or <1>login</1> to claim this poll."
components={[
<RegisterLink
- className="underline hover:text-gray-800"
+ className="underline hover:text-foreground"
key="register"
/>,
<LoginLink
- className="underline hover:text-gray-800"
+ className="underline hover:text-foreground"
key="login"
/>,
]}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/components/nav-user.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/nav-user.tsx
index 640822e9b..93676346a 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/components/nav-user.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/components/nav-user.tsx
@@ -7,14 +7,25 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
+ DropdownMenuPortal,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
DropdownMenuSeparator,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from "@rallly/ui/dropdown-menu";
import { Icon } from "@rallly/ui/icon";
+import { useTheme } from "@rallly/ui/theme-provider";
import {
ChevronDownIcon,
LogOutIcon,
+ MonitorIcon,
+ MoonIcon,
Settings2Icon,
+ SunIcon,
+ SunMoonIcon,
UserIcon,
} from "lucide-react";
import Link from "next/link";
@@ -35,6 +46,7 @@ export function NavUser({
}) {
const [isPending, setIsPending] = React.useState(false);
const posthog = usePostHog();
+ const { theme, setTheme } = useTheme();
return (
<>
{isPending && <RouterLoadingIndicator />}
@@ -78,6 +90,39 @@ export function NavUser({
</Link>
</DropdownMenuItem>
<DropdownMenuSeparator />
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger>
+ <Icon>
+ <SunMoonIcon />
+ </Icon>
+ <Trans i18nKey="theme" defaults="Theme" />
+ </DropdownMenuSubTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuSubContent>
+ <DropdownMenuRadioGroup value={theme} onValueChange={setTheme}>
+ <DropdownMenuRadioItem value="system">
+ <Icon>
+ <MonitorIcon />
+ </Icon>
+ <Trans i18nKey="themeSystem" defaults="System" />
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="light">
+ <Icon>
+ <SunIcon />
+ </Icon>
+ <Trans i18nKey="themeLight" defaults="Light" />
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="dark">
+ <Icon>
+ <MoonIcon />
+ </Icon>
+ <Trans i18nKey="themeDark" defaults="Dark" />
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuSubContent>
+ </DropdownMenuPortal>
+ </DropdownMenuSub>
+ <DropdownMenuSeparator />
<DropdownMenuItem
onClick={async () => {
setIsPending(true);
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/components/upgrade-to-pro-alert.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/upgrade-to-pro-alert.tsx
deleted file mode 100644
index 60c9804cb..000000000
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/components/upgrade-to-pro-alert.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-"use client";
-
-import { usePostHog } from "@rallly/posthog/client";
-import { SparklesIcon } from "lucide-react";
-import { Trans } from "@/components/trans";
-import { PayWallButton } from "@/features/billing/client";
-
-export function UpgradeToProAlert() {
- const posthog = usePostHog();
- return (
- <div className="relative overflow-hidden rounded-xl border bg-gray-50 p-3 text-sm shadow-xs">
- <SparklesIcon className="-top-4 absolute right-0 z-0 size-16 text-gray-200" />
- <div className="relative z-10">
- <h2 className="font-semibold">
- <Trans i18nKey="upgrade" defaults="Upgrade" />
- </h2>
- <p className="mt-1 mb-3 text-muted-foreground text-sm">
- <Trans
- i18nKey="upgradeToProDesc"
- defaults="Unlock all Pro features"
- />
- </p>
- <PayWallButton
- variant="primary"
- onClick={() => {
- posthog?.capture("space_sidebar:upgrade_button_click");
- }}
- className="w-full"
- >
- <Trans i18nKey="upgrade" defaults="Upgrade" />
- </PayWallButton>
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/[locale]/(space)/mobile-navigation.tsx b/apps/web/src/app/[locale]/(space)/mobile-navigation.tsx
index ee2c3b909..4596924e4 100644
--- a/apps/web/src/app/[locale]/(space)/mobile-navigation.tsx
+++ b/apps/web/src/app/[locale]/(space)/mobile-navigation.tsx
@@ -15,7 +15,7 @@ import { usePathname } from "next/navigation";
function MobileNavigationIcon({ children }: { children: React.ReactNode }) {
return (
- <Slot className="size-5 text-gray-500 group-hover:text-foreground group-focus:text-primary group-[.is-active]:text-primary">
+ <Slot className="size-5 text-muted-foreground group-hover:text-foreground group-focus:text-primary group-[.is-active]:text-primary">
{children}
</Slot>
);
diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx
index 1d42eb977..b7965d8df 100644
--- a/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx
@@ -136,7 +136,7 @@ export function BillingPageClient({
)}
</div>
{didUpdateSeats ? (
- <Alert variant="tip">
+ <Alert variant="success">
<CheckCircleIcon />
<AlertTitle>
<Trans
diff --git a/apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsx b/apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsx
deleted file mode 100644
index cd3f27615..000000000
--- a/apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { cn } from "@rallly/ui";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";
-import { InfoIcon } from "lucide-react";
-
-export const SettingsContent = ({ children }: React.PropsWithChildren) => {
- return <div className="space-y-6">{children}</div>;
-};
-
-export const SettingsSection = (props: {
- title: React.ReactNode;
- description: React.ReactNode;
- children: React.ReactNode;
-}) => {
- return (
- <section className="rounded-lg border p-4">
- <header className="mb-6">
- <h2 className="mb-2 font-semibold text-base leading-none">
- {props.title}
- </h2>
- <p className="text-muted-foreground text-sm">{props.description}</p>
- </header>
- <div>{props.children}</div>
- </section>
- );
-};
-
-export const SettingsGroup = ({ children }: React.PropsWithChildren) => {
- return <dl className="grid gap-3 md:gap-6">{children}</dl>;
-};
-
-export const SettingsItem = ({ children }: React.PropsWithChildren) => {
- return <div className="grid gap-1.5">{children}</div>;
-};
-export const SettingsItemTitle = ({
- children,
- hint,
-}: React.PropsWithChildren<{ hint?: React.ReactNode }>) => {
- return (
- <div className="flex items-center gap-x-2">
- <dt className="font-medium text-gray-500 text-sm">{children}</dt>
- {hint ? (
- <Tooltip>
- <TooltipTrigger asChild>
- <InfoIcon className="inline-block size-4 text-gray-500" />
- </TooltipTrigger>
- <TooltipContent side="right" className="max-w-sm">
- {hint}
- </TooltipContent>
- </Tooltip>
- ) : null}
- </div>
- );
-};
-
-export const SettingsItemValue = ({
- children,
- className,
-}: React.PropsWithChildren<{ className?: string }>) => {
- return <dd className={cn("text-gray-900 text-sm", className)}>{children}</dd>;
-};
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx
index 64ea8b7a5..b44763b39 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx
@@ -149,7 +149,7 @@ export function DeleteSpaceButton({
return (
<DeleteSpaceDialog spaceName={spaceName} spaceId={spaceId}>
<DialogTrigger asChild>
- <Button className="text-destructive">
+ <Button variant="destructive">
<TrashIcon className="size-4" />
<Trans i18nKey="deleteSpace" defaults="Delete Space" />
</Button>
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/page.tsx b/apps/web/src/app/[locale]/(space)/settings/members/page.tsx
index 6233fb87b..6a1c7b2b7 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/members/page.tsx
@@ -163,7 +163,7 @@ export default async function MembersSettingsPage() {
components={{
a: (
<Link
- className="underline"
+ className="underline hover:text-foreground"
href="/settings/billing"
/>
),
@@ -179,7 +179,7 @@ export default async function MembersSettingsPage() {
components={{
a: (
<Link
- className="underline"
+ className="underline hover:text-foreground"
prefetch={false}
href="https://support.rallly.co/self-hosting/licensing"
/>
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
index 24f623a1b..48f6534a2 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
@@ -128,7 +128,6 @@ const DateTimePreferencesForm = () => {
<Button
loading={formState.isSubmitting}
type="submit"
- variant="primary"
disabled={!formState.isDirty}
>
<Trans i18nKey="save" />
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx
index b50bff392..d9ede6f94 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx
@@ -63,7 +63,6 @@ export const LanguagePreference = () => {
/>
<div className="mt-6 flex flex-wrap gap-2">
<Button
- variant="primary"
disabled={!form.formState.isDirty}
loading={form.formState.isSubmitting}
type="submit"
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/theme-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/theme-preference.tsx
new file mode 100644
index 000000000..34f2d8c47
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/theme-preference.tsx
@@ -0,0 +1,86 @@
+"use client";
+
+import { RadioGroup, RadioGroupItem } from "@rallly/ui/radio-group";
+import { useTheme } from "@rallly/ui/theme-provider";
+import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
+import React from "react";
+
+import { Trans } from "@/components/trans";
+
+const themes = [
+ { value: "system", icon: MonitorIcon },
+ { value: "light", icon: SunIcon },
+ { value: "dark", icon: MoonIcon },
+] as const;
+
+function ThemeOption({
+ value,
+ children,
+}: {
+ value: string;
+ children: React.ReactNode;
+}) {
+ return (
+ <label
+ key={value}
+ className="flex aspect-video flex-1 flex-col items-center justify-center gap-4 rounded-lg border bg-card p-4 transition-colors hover:bg-card-accent has-data-[state=checked]:border-primary/50 has-data-[state=checked]:bg-linear-to-b has-data-[state=checked]:from-primary/10 has-data-[state=checked]:to-primary/5 has-data-[state=checked]:ring-primary [&>svg]:size-5"
+ htmlFor={value}
+ >
+ <RadioGroupItem value={value} id={value} className="peer sr-only" />
+ {children}
+ </label>
+ );
+}
+
+function ThemeOptionLabel({ children }: { children: React.ReactNode }) {
+ return <span className="text-sm">{children}</span>;
+}
+
+export function ThemePreference() {
+ const { theme, setTheme } = useTheme();
+ const [mounted, setMounted] = React.useState(false);
+
+ React.useEffect(() => {
+ setMounted(true);
+ }, []);
+
+ if (!mounted) {
+ return (
+ <div className="flex gap-2">
+ {themes.map(({ value }) => (
+ <div
+ key={value}
+ className="h-20 w-24 animate-pulse rounded-lg bg-card"
+ />
+ ))}
+ </div>
+ );
+ }
+
+ return (
+ <RadioGroup
+ value={theme}
+ onValueChange={setTheme}
+ className="flex flex-wrap gap-2"
+ >
+ <ThemeOption value="system">
+ <MonitorIcon />
+ <ThemeOptionLabel>
+ <Trans i18nKey="themeSystem" defaults="System" />
+ </ThemeOptionLabel>
+ </ThemeOption>
+ <ThemeOption value="light">
+ <SunIcon />
+ <ThemeOptionLabel>
+ <Trans i18nKey="themeLight" defaults="Light" />
+ </ThemeOptionLabel>
+ </ThemeOption>
+ <ThemeOption value="dark">
+ <MoonIcon />
+ <ThemeOptionLabel>
+ <Trans i18nKey="themeDark" defaults="Dark" />
+ </ThemeOptionLabel>
+ </ThemeOption>
+ </RadioGroup>
+ );
+}
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx
index ad86b9895..860df91c9 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx
@@ -11,6 +11,7 @@ import {
import { Trans } from "@/components/trans";
import { DateTimePreferences } from "./components/date-time-preferences";
import { LanguagePreference } from "./components/language-preference";
+import { ThemePreference } from "./components/theme-preference";
export function PreferencesPage() {
return (
@@ -32,6 +33,23 @@ export function PreferencesPage() {
</PageSectionContent>
</PageSection>
+ <PageSection variant="card">
+ <PageSectionHeader>
+ <PageSectionTitle>
+ <Trans i18nKey="theme" defaults="Theme" />
+ </PageSectionTitle>
+ <PageSectionDescription>
+ <Trans
+ i18nKey="themeDescription"
+ defaults="Choose your preferred appearance"
+ />
+ </PageSectionDescription>
+ </PageSectionHeader>
+ <PageSectionContent>
+ <ThemePreference />
+ </PageSectionContent>
+ </PageSection>
+
<PageSection variant="card">
<PageSectionHeader>
<PageSectionTitle>
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
index 71dad51db..5b8935fed 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
@@ -81,7 +81,7 @@ export default async function Page() {
<PageSectionContent>
<DeleteAccountDialog email={user.email}>
<DialogTrigger asChild>
- <Button className="text-destructive">
+ <Button variant="destructive">
<TrashIcon className="size-4" />
<Trans i18nKey="deleteAccount" defaults="Delete Account" />
</Button>
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
index b92afd7fb..21232082c 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
@@ -120,7 +120,7 @@ export const ProfileEmailAddress = ({ email }: { email: string }) => {
</Alert>
) : null}
{error === "invalidToken" ? (
- <Alert variant="destructive">
+ <Alert variant="warning">
<XIcon />
<AlertDescription>
<p>
@@ -133,7 +133,7 @@ export const ProfileEmailAddress = ({ email }: { email: string }) => {
</Alert>
) : null}
{error === "invalidUserId" ? (
- <Alert variant="destructive">
+ <Alert variant="warning">
<XIcon />
<AlertDescription>
<p>
@@ -148,7 +148,6 @@ export const ProfileEmailAddress = ({ email }: { email: string }) => {
<div className="mt-4 flex">
<Button
loading={formState.isSubmitting}
- variant="primary"
type="submit"
disabled={!formState.isDirty}
>
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
index b647d3461..c22e929ea 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
@@ -75,7 +75,6 @@ export const ProfileSettings = ({
<div className="mt-4 flex">
<Button
loading={formState.isSubmitting}
- variant="primary"
type="submit"
disabled={!formState.isDirty}
>
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
index 1487474a0..a6426f4d7 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
@@ -54,7 +54,7 @@ export default async function SecurityPage({
{isEmailLoginEnabled ? (
<>
{setupPassword ? (
- <Alert variant="tip">
+ <Alert variant="success">
<ShieldCheckIcon />
<AlertDescription>
<p>
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
index 5d2173a0c..4c4ad1c40 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
@@ -33,7 +33,7 @@ const GoToApp = () => {
</p>
<div>
<Link
- className="inline-flex items-center gap-2 text-primary hover:underline"
+ className="inline-flex items-center gap-2 hover:underline"
href={`/poll/${poll.id}`}
>
<Trans i18nKey="manage" defaults="Manage" />
@@ -50,9 +50,9 @@ export function InvitePage() {
const poll = usePoll();
return (
- <div className="h-dvh overflow-auto overscroll-none bg-gray-100 p-3 sm:p-6">
+ <div className="h-dvh overflow-auto overscroll-none bg-gray-100 dark:bg-gray-900">
<PollViewTracker pollId={poll.id} />
- <div className="mx-auto w-full max-w-4xl space-y-4">
+ <div className="mx-auto w-full max-w-4xl space-y-2 p-3 lg:space-y-4 lg:p-6">
<GoToApp />
<EventCard />
<ScheduledEvent />
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index 767e0f09e..db43ef09b 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -2,6 +2,7 @@ import "./globals.css";
import { PostHogIdentify, PostHogProvider } from "@rallly/posthog/client";
import { Toaster } from "@rallly/ui/sonner";
+import { ThemeProvider } from "@rallly/ui/theme-provider";
import { TooltipProvider } from "@rallly/ui/tooltip";
import { domAnimation, LazyMotion } from "motion/react";
import type { Metadata, Viewport } from "next";
@@ -14,6 +15,7 @@ import type { Params } from "@/app/[locale]/types";
import { requireUser } from "@/auth/data";
import { UserProvider } from "@/components/user-provider";
import { PreferencesProvider } from "@/contexts/preferences";
+import { env } from "@/env";
import type { UserDTO } from "@/features/user/schema";
import { I18nProvider } from "@/i18n/client";
import { getSession } from "@/lib/auth";
@@ -22,6 +24,7 @@ import { featureFlagConfig } from "@/lib/feature-flags/config";
import { LocaleSync } from "@/lib/locale/client";
import { TimezoneProvider } from "@/lib/timezone/client/context";
import { TRPCProvider } from "@/trpc/client/provider";
+import { getForegroundColor } from "@/utils/color";
import { ConnectedDayjsProvider } from "@/utils/dayjs";
import { PostHogPageView } from "../posthog-page-view";
@@ -71,46 +74,62 @@ export default async function Root({
const { locale } = await params;
const { user } = await loadData();
+ const primaryColor = env.PRIMARY_COLOR;
+
return (
- <html lang={locale} className={inter.className}>
+ <html
+ lang={locale}
+ className={inter.className}
+ suppressHydrationWarning={true}
+ style={
+ primaryColor
+ ? ({
+ "--primary": primaryColor,
+ "--primary-foreground": getForegroundColor(primaryColor),
+ } as React.CSSProperties)
+ : undefined
+ }
+ >
<head>
<PublicEnvScript />
</head>
<body>
- <FeatureFlagsProvider value={featureFlagConfig}>
- <Toaster />
- <I18nProvider locale={locale}>
- <TRPCProvider>
- <LazyMotion features={domAnimation}>
- <PostHogProvider>
- <PostHogIdentify
- distinctId={user && !user.isGuest ? user.id : undefined}
- />
- <PostHogPageView />
- <TooltipProvider>
- <UserProvider user={user ?? undefined}>
- <LocaleSync userLocale={user?.locale ?? locale} />
- <PreferencesProvider
- initialValue={{
- timeFormat: user?.timeFormat,
- timeZone: user?.timeZone,
- weekStart: user?.weekStart,
- }}
- >
- <TimezoneProvider initialTimezone={user?.timeZone}>
- <ConnectedDayjsProvider>
- {children}
- <TimeZoneChangeDetector />
- </ConnectedDayjsProvider>
- </TimezoneProvider>
- </PreferencesProvider>
- </UserProvider>
- </TooltipProvider>
- </PostHogProvider>
- </LazyMotion>
- </TRPCProvider>
- </I18nProvider>
- </FeatureFlagsProvider>
+ <ThemeProvider>
+ <FeatureFlagsProvider value={featureFlagConfig}>
+ <Toaster />
+ <I18nProvider locale={locale}>
+ <TRPCProvider>
+ <LazyMotion features={domAnimation}>
+ <PostHogProvider>
+ <PostHogIdentify
+ distinctId={user && !user.isGuest ? user.id : undefined}
+ />
+ <PostHogPageView />
+ <TooltipProvider>
+ <UserProvider user={user ?? undefined}>
+ <LocaleSync userLocale={user?.locale ?? locale} />
+ <PreferencesProvider
+ initialValue={{
+ timeFormat: user?.timeFormat,
+ timeZone: user?.timeZone,
+ weekStart: user?.weekStart,
+ }}
+ >
+ <TimezoneProvider initialTimezone={user?.timeZone}>
+ <ConnectedDayjsProvider>
+ {children}
+ <TimeZoneChangeDetector />
+ </ConnectedDayjsProvider>
+ </TimezoneProvider>
+ </PreferencesProvider>
+ </UserProvider>
+ </TooltipProvider>
+ </PostHogProvider>
+ </LazyMotion>
+ </TRPCProvider>
+ </I18nProvider>
+ </FeatureFlagsProvider>
+ </ThemeProvider>
</body>
</html>
);
@@ -119,8 +138,8 @@ export default async function Root({
export async function generateMetadata(): Promise<Metadata> {
return {
title: {
- template: "%s | Rallly",
- default: "Rallly",
+ template: `%s | ${env.APP_NAME}`,
+ default: env.APP_NAME,
},
};
}
diff --git a/apps/web/src/app/[locale]/not-found.tsx b/apps/web/src/app/[locale]/not-found.tsx
index bb22f8d65..24f685b24 100644
--- a/apps/web/src/app/[locale]/not-found.tsx
+++ b/apps/web/src/app/[locale]/not-found.tsx
@@ -13,11 +13,13 @@ export default async function Page() {
<div className="flex h-screen w-full items-center justify-center">
<div className="space-y-8">
<div className="space-y-4 text-center">
- <FileSearchIcon className="mb-4 inline-block size-24 text-gray-400" />
- <div className="mb-2 font-bold text-3xl text-primary-600">
+ <FileSearchIcon className="mb-4 inline-block size-24 text-muted-foreground" />
+ <div className="mb-2 font-bold text-3xl text-foreground">
{t("errors_notFoundTitle")}
</div>
- <p className="text-gray-600">{t("errors_notFoundDescription")}</p>
+ <p className="text-muted-foreground">
+ {t("errors_notFoundDescription")}
+ </p>
</div>
<div className="flex justify-center space-x-3">
<Button variant="primary" asChild>
diff --git a/apps/web/src/app/components/logo-link.tsx b/apps/web/src/app/components/logo-link.tsx
deleted file mode 100644
index 4927c12ec..000000000
--- a/apps/web/src/app/components/logo-link.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import Link from "next/link";
-import Logo from "@/assets/logo-mark.svg";
-
-export function LogoLink() {
- return (
- <Link
- className="inline-block transition-transform active:translate-y-1"
- href="/"
- >
- <Logo className="size-8" />
- </Link>
- );
-}
diff --git a/apps/web/src/app/components/page-icons.tsx b/apps/web/src/app/components/page-icons.tsx
index a4d1ad6ff..6c4fcea58 100644
--- a/apps/web/src/app/components/page-icons.tsx
+++ b/apps/web/src/app/components/page-icons.tsx
@@ -23,14 +23,15 @@ const pageIconVariants = cva("inline-flex items-center justify-center", {
color: {
darkGray: "bg-gray-700 text-gray-300",
indigo: "bg-indigo-500 text-white",
- gray: "bg-gray-200 text-gray-600",
+ gray: "bg-gray-500/20 text-gray-500/95",
lime: "bg-lime-500 text-white",
blue: "bg-blue-500 text-white",
rose: "bg-rose-500 text-rose-50",
purple: "bg-purple-500 text-purple-50",
+ primary: "bg-primary text-primary-foreground",
},
size: {
- xs: "size-5 rounded-md [&_svg]:size-3",
+ xs: "size-6 rounded-md [&_svg]:size-3",
sm: "size-7 rounded-md [&_svg]:size-4",
md: "size-8 rounded-lg [&_svg]:size-4",
lg: "size-9 rounded-lg [&_svg]:size-5",
@@ -114,7 +115,7 @@ export function CreatePageIcon() {
export function PollPageIcon(props: PageIconVariantProps) {
return (
- <PageIcon color="purple" size="md" {...props}>
+ <PageIcon color="gray" size="md" {...props}>
<BarChart2Icon />
</PageIcon>
);
@@ -122,7 +123,7 @@ export function PollPageIcon(props: PageIconVariantProps) {
export function EventPageIcon(props: PageIconVariantProps) {
return (
- <PageIcon color="rose" size="md" {...props}>
+ <PageIcon color="gray" size="md" {...props}>
<CalendarIcon />
</PageIcon>
);
diff --git a/apps/web/src/app/components/page-layout.tsx b/apps/web/src/app/components/page-layout.tsx
index acbbfa37c..49c80ea81 100644
--- a/apps/web/src/app/components/page-layout.tsx
+++ b/apps/web/src/app/components/page-layout.tsx
@@ -126,7 +126,7 @@ export function PageSectionGroup({ children }: { children?: React.ReactNode }) {
const pageSectionVariants = cva("flex flex-col gap-4", {
variants: {
variant: {
- card: "rounded-2xl border p-4",
+ card: "rounded-2xl border bg-card p-4",
default: "",
},
},
diff --git a/apps/web/src/components/cookie-consent.tsx b/apps/web/src/components/cookie-consent.tsx
deleted file mode 100644
index 2582f98b1..000000000
--- a/apps/web/src/components/cookie-consent.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import Cookies from "js-cookie";
-import { AnimatePresence } from "motion/react";
-import * as m from "motion/react-m";
-import Link from "next/link";
-import * as React from "react";
-import { createPortal } from "react-dom";
-
-import { getPortal } from "@/utils/selectors";
-
-import CookiesIllustration from "./cookie-consent/cookies.svg";
-
-const CookieConsentPopover = () => {
- const [visible, setVisible] = React.useState(true);
-
- return (
- <>
- {createPortal(
- <AnimatePresence>
- {visible ? (
- <m.div
- variants={{
- enter: {
- opacity: 1,
- y: 0,
- transition: { type: "spring", delay: 2, duration: 1 },
- },
- exit: {
- opacity: 0,
- y: 10,
- transition: { duration: 0.1 },
- },
- }}
- initial={{ opacity: 0, y: 100 }}
- animate="enter"
- exit="exit"
- className="fixed right-8 bottom-8 z-50 w-60 rounded-lg bg-white p-4 pt-8 text-sm shadow-lg"
- >
- <CookiesIllustration className="-top-6 absolute" />
- <div className="mb-3">
- Your privacy is important to us. We only use cookies to improve
- the browsing experience on this website.
- </div>
- <div className="flex items-center space-x-6">
- <Link
- href="/privacy-policy"
- className="text-gray-500 hover:text-primary-600"
- >
- Privacy Policy
- </Link>
- <button
- type="button"
- onClick={() => {
- Cookies.set("rallly_cookie_consent", "1", { expires: 365 });
- setVisible(false);
- }}
- className="grow rounded-md bg-primary-600 px-5 py-1 font-semibold text-white shadow-xs transition-all hover:bg-primary-600/90 focus:ring-2 focus:ring-primary-200 active:bg-primary-600/90"
- >
- OK
- </button>
- </div>
- </m.div>
- ) : null}
- </AnimatePresence>,
- getPortal(),
- )}
- </>
- );
-};
-
-export default CookieConsentPopover;
diff --git a/apps/web/src/components/date-card.tsx b/apps/web/src/components/date-card.tsx
index 46c170a72..145831346 100644
--- a/apps/web/src/components/date-card.tsx
+++ b/apps/web/src/components/date-card.tsx
@@ -16,14 +16,14 @@ const DateCard: React.FunctionComponent<DateCardProps> = ({
return (
<div
className={cn(
- "relative inline-flex size-12 flex-col rounded-md border bg-gray-50 text-center text-slate-800",
+ "relative inline-flex size-12 flex-col rounded-lg border bg-card text-center text-card-foreground",
className,
)}
>
- <div className="border-gray-200 border-b font-normal text-muted-foreground text-xs leading-4">
+ <div className="border-b font-normal text-muted-foreground text-xs leading-4">
{month}
</div>
- <div className="flex grow items-center justify-center rounded-b-md bg-white font-semibold text-lg leading-none tracking-tight">
+ <div className="flex grow items-center justify-center rounded-b-md font-semibold text-lg leading-none tracking-tight">
{day}
</div>
</div>
diff --git a/apps/web/src/components/date-icon.tsx b/apps/web/src/components/date-icon.tsx
index 9b611b2a8..fab39aaa6 100644
--- a/apps/web/src/components/date-icon.tsx
+++ b/apps/web/src/components/date-icon.tsx
@@ -11,14 +11,14 @@ export const DateIconInner = (props: {
return (
<div
className={cn(
- "inline-flex size-10 flex-col overflow-hidden rounded-md border bg-gray-50 text-center text-slate-800",
+ "inline-flex size-10 flex-col overflow-hidden rounded-md border bg-card text-center text-card-foreground",
props.className,
)}
>
- <div className="border-gray-200 border-b font-normal text-muted-foreground text-xs leading-4">
+ <div className="font-normal text-[10px] text-muted-foreground leading-4">
{props.dow}
</div>
- <div className="flex grow items-center justify-center bg-white font-medium text-sm leading-none tracking-tight">
+ <div className="flex grow items-center justify-center font-medium text-sm leading-none tracking-tight">
{props.day}
</div>
</div>
diff --git a/apps/web/src/components/discussion/discussion.tsx b/apps/web/src/components/discussion/discussion.tsx
index 028907af9..07da45e18 100644
--- a/apps/web/src/components/discussion/discussion.tsx
+++ b/apps/web/src/components/discussion/discussion.tsx
@@ -184,7 +184,7 @@ function DiscussionInner() {
</CardTitle>
</CardHeader>
{comments.length ? (
- <CardContent className="border-b">
+ <CardContent>
<div className="space-y-4">
{comments.map((comment) => {
const canDelete = role === "admin" || session.ownsObject(comment);
@@ -206,12 +206,12 @@ function DiscussionInner() {
) : null}
</Participant>
<div className="flex items-center gap-2 text-sm">
- <div className="text-gray-500">
+ <div className="text-muted-foreground">
{dayjs(comment.createdAt).fromNow()}
</div>
{canDelete && (
<DropdownMenu>
- <DropdownMenuTrigger className="text-gray-500 hover:text-foreground">
+ <DropdownMenuTrigger className="text-muted-foreground hover:text-foreground">
<MoreHorizontalIcon className="size-4" />
</DropdownMenuTrigger>
<DropdownMenuContent align="start">
@@ -243,7 +243,7 @@ function DiscussionInner() {
</CardContent>
) : null}
{!poll.event ? (
- <CardFooter className="border-t-0">
+ <CardFooter>
{isWriting ? (
<NewCommentForm
onSubmit={() => {
@@ -256,7 +256,7 @@ function DiscussionInner() {
) : (
<button
type="button"
- className="flex w-full rounded-lg border border-input bg-input-background px-2 py-2 text-left text-muted-foreground text-sm focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-1"
+ className="flex w-full rounded-lg border border-input-border bg-input px-2 py-2 text-left text-muted-foreground text-sm focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-1"
onClick={() => setIsWriting(true)}
>
<Trans
@@ -275,7 +275,7 @@ export default function Discussion() {
const poll = usePoll();
if (poll.disableComments) {
return (
- <p className="rounded-lg bg-gray-100 p-4 text-center text-muted-foreground text-sm">
+ <p className="rounded-lg bg-muted p-4 text-center text-muted-foreground text-sm">
<Icon>
<MessageSquareOffIcon className="mr-2 inline-block" />
</Icon>
diff --git a/apps/web/src/components/empty-state.tsx b/apps/web/src/components/empty-state.tsx
index af55722e2..cdb5b81a2 100644
--- a/apps/web/src/components/empty-state.tsx
+++ b/apps/web/src/components/empty-state.tsx
@@ -22,7 +22,7 @@ export function EmptyState({
export function EmptyStateIcon({ children }: { children: React.ReactNode }) {
return (
- <div className="mb-4 inline-flex rounded-full border bg-linear-to-b from-gray-50 to-white p-4">
+ <div className="mb-4 inline-flex rounded-full border bg-linear-to-b from-gray-50 to-white p-4 dark:border-gray-700 dark:from-gray-800 dark:to-gray-700">
<Icon size="xl" className="opacity-50">
{children}
</Icon>
diff --git a/apps/web/src/components/error-page.tsx b/apps/web/src/components/error-page.tsx
index e9a0e74f6..d14d40339 100644
--- a/apps/web/src/components/error-page.tsx
+++ b/apps/web/src/components/error-page.tsx
@@ -21,11 +21,9 @@ const ErrorPage: React.FunctionComponent<ComponentProps> = ({
<div className="flex h-[calc(100vh-100px)] w-full items-center justify-center">
<div className="space-y-8">
<div className="space-y-4 text-center">
- <Icon className="mb-4 inline-block size-24 text-gray-400" />
- <div className="mb-2 font-bold text-3xl text-primary-600">
- {title}
- </div>
- <p className="text-gray-600">{description}</p>
+ <Icon className="mb-4 inline-block size-24 text-muted-foreground" />
+ <div className="mb-2 font-bold text-3xl text-foreground">{title}</div>
+ <p className="text-muted-foreground">{description}</p>
</div>
<div className="flex justify-center space-x-3">
<Button variant="primary" asChild>
diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/components/event-card.tsx
index f981f1e55..dc4a64cd4 100644
--- a/apps/web/src/components/event-card.tsx
+++ b/apps/web/src/components/event-card.tsx
@@ -36,8 +36,8 @@ export function EventCard() {
const { t } = useTranslation();
return (
<>
- <Card className="bg-gray-50">
- <RandomGradientBar seed={poll.id} />
+ <Card>
+ <RandomGradientBar />
<CardContent className="space-y-4 sm:space-y-6">
<div className="flex flex-col items-start gap-4 lg:flex-row lg:justify-between">
<div>
@@ -45,7 +45,7 @@ export function EventCard() {
{poll.title}
</h1>
<CardDescription>
- <span className="flex items-center gap-0.5 whitespace-nowrap text-gray-500 text-sm">
+ <span className="flex items-center gap-0.5 whitespace-nowrap text-muted-foreground text-sm">
<span>
<Trans
i18nKey="createdBy"
@@ -79,7 +79,7 @@ export function EventCard() {
<div className="flex flex-col justify-between gap-4 sm:flex-row sm:flex-wrap sm:items-center">
<IconGuide />
{poll.location ? (
- <p className="truncate whitespace-nowrap text-muted-foregroun text-sm">
+ <p className="truncate whitespace-nowrap text-muted-foreground text-sm">
<Icon>
<MapPinIcon className="-mt-0.5 mr-1.5 inline-block" />
</Icon>
diff --git a/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx b/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx
index ec46ec4c4..70a5873ab 100644
--- a/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx
@@ -19,7 +19,9 @@ const DateNavigationToolbar: React.FunctionComponent<
return (
<div className="flex h-14 w-full shrink-0 items-center px-4">
<div className="grow font-semibold tracking-tight">
- <span className="mr-2 font-normal text-gray-500 text-sm">{year}</span>
+ <span className="mr-2 font-normal text-muted-foreground text-sm">
+ {year}
+ </span>
<span className="font-semibold">{label}</span>
</div>
<div className="flex items-center space-x-2">
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
index 173e0172f..ed4d5e45b 100644
--- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
@@ -115,14 +115,14 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
return (
<div
key={dayOfWeek}
- className="flex items-center justify-center pb-2 font-medium text-gray-500 text-sm"
+ className="flex items-center justify-center pb-2 font-medium text-muted-foreground text-sm"
>
{dayOfWeek.substring(0, 2)}
</div>
);
})}
</div>
- <div className="grid grow grid-cols-7 rounded-md border bg-white shadow-xs">
+ <div className="grid grow grid-cols-7 overflow-hidden rounded-lg border shadow-xs">
{datepicker.days.map((day, i) => {
return (
<div
@@ -176,11 +176,12 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
className={cn(
"group relative flex h-full w-full items-start justify-end rounded-none px-2.5 py-1.5 font-medium text-sm tracking-tight focus:z-10 focus:rounded-sm",
{
- "bg-gray-100 text-gray-400": day.isPast,
+ "bg-muted text-muted-foreground opacity-50":
+ day.isPast,
"text-rose-600": day.today && !day.selected,
- "bg-gray-50 text-gray-500":
+ "bg-muted/50 text-muted-foreground":
day.outOfMonth && !day.isPast,
- "text-primary-600": day.selected,
+ "text-primary": day.selected,
},
)}
>
@@ -189,8 +190,8 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
className={cn(
"absolute inset-1 z-0 rounded-md border",
day.selected
- ? "border-primary-300 border-dashed shadow-xs group-hover:border-primary-400"
- : "border-transparent border-dashed group-hover:border-gray-400 group-active:bg-gray-200",
+ ? "border-primary/50 border-dashed shadow-xs group-hover:border-primary/60"
+ : "border-transparent border-dashed group-hover:border-accent-border group-active:bg-accent",
)}
/>
<span className="z-10">{day.day}</span>
@@ -486,9 +487,9 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
</div>
) : (
<div className="flex h-full items-center justify-center py-12">
- <div className="text-center font-medium text-gray-400">
- <CalendarIcon className="mb-2 inline-block size-12" />
- <div>{t("noDatesSelected")}</div>
+ <div className="text-center text-muted-foreground">
+ <CalendarIcon className="mb-4 inline-block size-10" />
+ <div className="text-sm">{t("noDatesSelected")}</div>
</div>
</div>
)}
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx
index 59f853cc1..af84907c1 100644
--- a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx
+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx
@@ -72,7 +72,7 @@ const TimePicker: React.FunctionComponent<TimePickerProps> = ({
<div className="flex items-center gap-2">
<span>{dayjs(option).format("LT")}</span>
{after ? (
- <span className="text-gray-500 text-sm">
+ <span className="text-muted-foreground text-sm">
{getDuration(dayjs(after), dayjs(option))}
</span>
) : null}
@@ -85,7 +85,7 @@ const TimePicker: React.FunctionComponent<TimePickerProps> = ({
<div className="flex items-center gap-2">
<span>{dayjs(value).format("LT")}</span>
{after ? (
- <span className="text-gray-500 text-sm">
+ <span className="text-muted-foreground text-sm">
{getDuration(dayjs(after), dayjs(value))}
</span>
) : null}
diff --git a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx
index 6297640c3..e0787bbe5 100644
--- a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx
+++ b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx
@@ -218,7 +218,7 @@ const PollOptionsForm = ({
render={({ field }) => (
<div
className={cn(
- "grid items-center justify-between gap-2.5 border-t bg-gray-50 p-4 md:flex",
+ "grid items-center justify-between gap-2.5 border-t p-4 md:flex",
)}
>
<div className="flex h-9 items-center gap-x-2.5 p-2">
diff --git a/apps/web/src/components/forms/poll-options-form/rbc-overrides.css b/apps/web/src/components/forms/poll-options-form/rbc-overrides.css
index 1ad252c20..091432887 100644
--- a/apps/web/src/components/forms/poll-options-form/rbc-overrides.css
+++ b/apps/web/src/components/forms/poll-options-form/rbc-overrides.css
@@ -1,21 +1,21 @@
.rbc-time-view {
border: 0;
- border-bottom: 1px solid var(--color-gray-100);
- border-top: 1px solid var(--color-gray-100);
+ border-bottom: 1px solid var(--color-border-muted);
+ border-top: 1px solid var(--color-border-muted);
}
.rbc-today {
- background-color: color-mix(in srgb, var(--color-gray-50) 50%, transparent);
+ background-color: color-mix(in srgb, var(--color-muted) 50%, transparent);
}
.rbc-time-content > * + * > * {
- border-color: var(--color-gray-200);
+ border-color: var(--color-border);
}
.rbc-time-header.rbc-overflowing,
.rbc-time-header-content,
.rbc-header {
- border-color: var(--color-gray-100);
+ border-color: var(--color-border-muted);
}
.rbc-time-content {
@@ -40,12 +40,12 @@
}
.rbc-timeslot-group {
- border-color: var(--color-gray-100);
+ border-color: var(--color-border-muted);
}
.rbc-day-slot .rbc-time-slot {
border-style: dashed;
- border-color: var(--color-gray-50);
+ border-color: var(--color-border-muted);
}
.rbc-day-slot .rbc-events-container {
@@ -53,14 +53,17 @@
}
.rbc-slot-selection {
- background-color: color-mix(in srgb, var(--color-gray-100) 50%, transparent);
+ background-color: color-mix(
+ in srgb,
+ var(--color-border-muted) 50%,
+ transparent
+ );
line-height: 1.25;
color: var(--color-gray-600);
}
.rbc-header.rbc-today {
- background-color: var(--color-background);
- color: var(--color-rose-600);
+ color: var(--color-rose-500);
}
.rbc-button-link {
@@ -70,5 +73,5 @@
}
.rbc-time-header-gutter {
- border-bottom: 1px solid var(--color-gray-100);
+ border-bottom: 1px solid var(--color-border-muted);
}
diff --git a/apps/web/src/components/forms/poll-options-form/week-calendar.tsx b/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
index bd6680f81..e4ca5e49d 100644
--- a/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
@@ -102,7 +102,7 @@ const WeekCalendar: React.FunctionComponent<DateTimePickerProps> = ({
<div
// onClick prop doesn't work properly. Seems like some other element is cancelling the event before it reaches this element
onMouseUp={props.onClick}
- className="group absolute ml-1 flex max-h-full flex-col justify-between overflow-hidden rounded-lg border border-primary-300 border-dashed bg-white/50 p-1 text-primary-500 text-xs shadow-xs hover:cursor-pointer hover:border-primary-400 hover:text-primary-600"
+ className="group absolute ml-1 flex max-h-full flex-col justify-between overflow-hidden rounded-lg border border-popover-border bg-popover p-1 text-foreground text-xs shadow-xs backdrop-blur-sm hover:cursor-pointer"
style={{
top: `calc(${props.style?.top}% + 4px)`,
height: `calc(${props.style?.height}% - 8px)`,
@@ -144,7 +144,7 @@ const WeekCalendar: React.FunctionComponent<DateTimePickerProps> = ({
children?: React.ReactNode;
}) {
return (
- <div className="h-6 text-gray-500 text-xs leading-none">
+ <div className="h-6 text-muted-foreground text-xs leading-none">
{children}
</div>
);
diff --git a/apps/web/src/components/forms/poll-settings.tsx b/apps/web/src/components/forms/poll-settings.tsx
index 1bcdc28b3..2f54f404d 100644
--- a/apps/web/src/components/forms/poll-settings.tsx
+++ b/apps/web/src/components/forms/poll-settings.tsx
@@ -38,7 +38,7 @@ const SettingTitle = ({
}>) => {
return (
<div className="flex min-w-0 items-center gap-x-2.5">
- <div className="font-medium text-sm">{children}</div>
+ <div className="text-sm">{children}</div>
{pro ? (
<div>
<ProBadge />
@@ -53,7 +53,7 @@ const Setting = ({ children }: React.PropsWithChildren) => {
// biome-ignore lint/a11y/noLabelWithoutControl: Fix this later
<label
className={cn(
- "cursor-pointer bg-white hover:bg-gray-50 active:bg-gray-100",
+ "cursor-pointer bg-card hover:bg-card-accent",
"flex select-none justify-between gap-x-4 gap-y-2.5 rounded-md border p-3 sm:flex-row",
)}
>
diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsx
index 1d796eaad..a583cf696 100644
--- a/apps/web/src/components/layouts/poll-layout.tsx
+++ b/apps/web/src/components/layouts/poll-layout.tsx
@@ -28,8 +28,8 @@ const Layout = ({ children }: React.PropsWithChildren) => {
const pollLink = `/poll/${poll.id}`;
const pathname = usePathname();
return (
- <div className="h-dvh overflow-auto overscroll-none bg-gray-100">
- <div className="sticky top-0 z-40 border-b bg-gray-100/90 p-3 backdrop-blur-md sm:flex-row">
+ <div className="h-dvh overflow-auto overscroll-none bg-gray-100 dark:bg-gray-900">
+ <div className="sticky top-0 z-40 border-b bg-gray-100/90 p-3 backdrop-blur-lg sm:flex-row dark:bg-gray-900/90">
<div className="mx-auto flex max-w-4xl justify-between">
<div className="flex min-w-0 items-center gap-x-2.5">
{pathname === pollLink ? (
diff --git a/apps/web/src/components/logo.tsx b/apps/web/src/components/logo.tsx
index 85d07ebcf..547b1a397 100644
--- a/apps/web/src/components/logo.tsx
+++ b/apps/web/src/components/logo.tsx
@@ -1,13 +1,11 @@
-import Image from "next/image";
+import { env } from "@/env";
const sizes = {
sm: {
- width: 140,
height: 22,
},
md: {
- width: 150,
- height: 30,
+ height: 32,
},
};
@@ -19,13 +17,14 @@ export const Logo = ({
size?: keyof typeof sizes;
}) => {
return (
- <Image
- priority={true}
+ // biome-ignore lint/performance/noImgElement: we don't need Image component here
+ <img
className={className}
- src="/static/logo.svg"
- width={sizes[size].width}
- height={sizes[size].height}
- alt="Rallly"
+ src={env.LOGO_URL ?? "/static/logo.svg"}
+ style={{
+ height: sizes[size].height,
+ }}
+ alt={env.APP_NAME}
/>
);
};
diff --git a/apps/web/src/components/new-participant-modal.tsx b/apps/web/src/components/new-participant-modal.tsx
index f006e798a..f9113d206 100644
--- a/apps/web/src/components/new-participant-modal.tsx
+++ b/apps/web/src/components/new-participant-modal.tsx
@@ -79,7 +79,7 @@ const VoteSummary = ({
return (
<div
key={voteType}
- className="flex h-8 select-none gap-2.5 rounded-lg border bg-gray-50 p-1 text-sm"
+ className="flex h-8 select-none gap-2.5 rounded-lg border bg-muted p-1 text-sm"
>
<div className="flex items-center gap-2">
<VoteIcon type={voteType} />
diff --git a/apps/web/src/components/pagination.tsx b/apps/web/src/components/pagination.tsx
index 4b8140e8d..5298378ea 100644
--- a/apps/web/src/components/pagination.tsx
+++ b/apps/web/src/components/pagination.tsx
@@ -50,7 +50,7 @@ export function Pagination({
return (
<div className={cn("flex items-center justify-between", className)}>
- <div className="text-gray-500 text-sm">
+ <div className="text-muted-foreground text-sm">
<Trans
i18nKey="paginationItems"
defaults="Showing {startItem}–{endItem} of {totalItems}"
diff --git a/apps/web/src/components/participant-avatar-bar.tsx b/apps/web/src/components/participant-avatar-bar.tsx
index 2e14c9dc2..0dc2881da 100644
--- a/apps/web/src/components/participant-avatar-bar.tsx
+++ b/apps/web/src/components/participant-avatar-bar.tsx
@@ -35,12 +35,12 @@ export const ParticipantAvatarBar = ({
const hiddenCount = totalParticipants - visibleCount;
return (
- <ul className="-space-x-1 flex cursor-default items-center rounded-full bg-white p-0.5">
+ <ul className="-space-x-1 flex cursor-default items-center rounded-full bg-background p-0.5">
{visibleParticipants.map((participant, index) => (
// biome-ignore lint/suspicious/noArrayIndexKey: Fix this later
<Tooltip delayDuration={100} key={index}>
<TooltipTrigger asChild>
- <li className="z-10 inline-flex items-center justify-center rounded-full ring-2 ring-white">
+ <li className="z-10 inline-flex items-center justify-center rounded-full ring-2 ring-background">
<OptimizedAvatarImage
name={participant.name}
src={participant.image}
diff --git a/apps/web/src/components/participant.tsx b/apps/web/src/components/participant.tsx
index 8d54ad9f5..8b4dd430b 100644
--- a/apps/web/src/components/participant.tsx
+++ b/apps/web/src/components/participant.tsx
@@ -26,8 +26,8 @@ export const ParticipantName = ({
setIsTruncated(false);
}
}}
- className={cn("truncate font-medium text-sm", {
- "hover:-translate-x-2 hover:cursor-pointer hover:overflow-visible hover:whitespace-nowrap hover:rounded-md hover:bg-white hover:p-2":
+ className={cn("truncate text-sm", {
+ "hover:-translate-x-2 hover:cursor-pointer hover:overflow-visible hover:whitespace-nowrap hover:rounded-md hover:bg-background hover:p-2":
isTruncated,
})}
>
diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsx
index a379817c6..a0167d173 100644
--- a/apps/web/src/components/poll/desktop-poll.tsx
+++ b/apps/web/src/components/poll/desktop-poll.tsx
@@ -250,15 +250,16 @@ const DesktopPoll: React.FunctionComponent = () => {
<div
className={cn(
expanded
- ? "fixed top-0 left-0 z-50 flex h-full w-full items-center justify-center bg-gray-900/25 p-8"
+ ? "fixed top-0 left-0 z-50 flex h-full w-full items-center justify-center p-8"
: "",
)}
>
<div
className={cn(
- "flex max-h-full flex-col overflow-hidden rounded-md bg-white",
+ "flex max-h-full flex-col overflow-hidden rounded-lg",
{
- "w-full max-w-7xl shadow-huge": expanded,
+ "w-full max-w-7xl border border-popover-border bg-background shadow-2xl":
+ expanded,
},
)}
ref={containerRef}
@@ -288,7 +289,7 @@ const DesktopPoll: React.FunctionComponent = () => {
<TableControls />
</CardHeader>
{poll.options[0]?.duration !== 0 && poll.timeZone ? (
- <div className="border-b bg-gray-50 px-4 py-3">
+ <div className="border-b px-4 py-3">
<TimesShownIn />
</div>
) : null}
@@ -313,7 +314,7 @@ const DesktopPoll: React.FunctionComponent = () => {
"scrollbar-thin hover:scrollbar-thumb-gray-400 scrollbar-thumb-gray-300 scrollbar-track-gray-100 relative z-10 grow overflow-auto scroll-smooth",
)}
>
- <table className="w-full table-auto border-separate border-spacing-0 bg-gray-50">
+ <table className="w-full table-auto border-separate border-spacing-0 bg-muted/50">
<thead>
<PollHeader />
</thead>
@@ -359,7 +360,7 @@ const DesktopPoll: React.FunctionComponent = () => {
</tbody>
</table>
{mode === "new" ? (
- <div className="sticky left-[235px] flex w-[calc(100%-235px)] items-center justify-between gap-4 border-t border-l bg-gray-50 p-3">
+ <div className="sticky left-[235px] flex w-[calc(100%-235px)] items-center justify-between gap-4 border-t border-l p-3">
<Button
onClick={() => {
votingForm.cancel();
diff --git a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx b/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
index 79beed44e..0a8ffd563 100644
--- a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
+++ b/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
@@ -57,7 +57,7 @@ const ParticipantRowForm = ({
<tr className={cn("group", className)}>
<td
style={{ minWidth: 235, maxWidth: 235 }}
- className="sticky left-0 z-10 h-12 bg-white px-4"
+ className="sticky left-0 z-10 h-12 bg-background px-4"
>
<div className="flex items-center justify-between gap-x-2.5">
<Participant>
@@ -105,10 +105,7 @@ const ParticipantRowForm = ({
</td>
{optionIds.map((optionId, i) => {
return (
- <td
- key={optionId}
- className="relative h-12 border-t border-l bg-gray-50"
- >
+ <td key={optionId} className="relative h-12 border-t border-l">
<Controller
control={form.control}
name={`votes.${i}`}
@@ -122,7 +119,10 @@ const ParticipantRowForm = ({
type: toggleVote(field.value?.type),
});
}}
- className="absolute inset-0 flex cursor-pointer items-center justify-center hover:bg-gray-100 active:bg-gray-200/50 active:ring-1 active:ring-gray-200 active:ring-inset"
+ className={cn(
+ "absolute inset-0 flex cursor-pointer items-center justify-center transition-colors",
+ "hover:bg-gray-100 active:bg-gray-200/50 active:ring-1 active:ring-gray-200 active:ring-inset dark:active:bg-gray-700/50 dark:active:ring-gray-700 dark:active:ring-inset dark:hover:bg-gray-800",
+ )}
>
<VoteSelector
value={field.value?.type}
@@ -136,7 +136,7 @@ const ParticipantRowForm = ({
</td>
);
})}
- <td className="border-l bg-diagonal-lines" />
+ <td className="border-l" />
</tr>
);
};
diff --git a/apps/web/src/components/poll/desktop-poll/participant-row.tsx b/apps/web/src/components/poll/desktop-poll/participant-row.tsx
index 0d5fdab37..40b62ac9a 100644
--- a/apps/web/src/components/poll/desktop-poll/participant-row.tsx
+++ b/apps/web/src/components/poll/desktop-poll/participant-row.tsx
@@ -48,7 +48,7 @@ export const ParticipantRowView: React.FunctionComponent<{
>
<td
style={{ minWidth: 235, maxWidth: 235 }}
- className="sticky left-0 z-10 h-12 bg-white px-4"
+ className="sticky left-0 z-10 h-12 bg-background px-4"
>
<div className="flex max-w-full items-center justify-between gap-x-2">
<Participant>
@@ -70,33 +70,15 @@ export const ParticipantRowView: React.FunctionComponent<{
<td
// biome-ignore lint/suspicious/noArrayIndexKey: Fix this later
key={i}
- className={cn(
- "h-12 border-t border-l",
- !vote || vote === "no" ? "bg-gray-100" : "bg-white",
- {
- "bg-gray-100": vote === "no",
- // "bg-waves": vote === "ifNeedBe",
- },
- )}
+ className={cn("h-12 border-t border-l bg-background")}
>
<div className={cn("flex items-center justify-center")}>
- <div
- className={cn(
- "inline-flex h-7 w-7 items-center justify-center rounded-full",
- {
- "bg-green-50": vote === "yes",
- "bg-amber-50": vote === "ifNeedBe",
- "bg-gray-200": vote === "no",
- },
- )}
- >
- <VoteIcon type={vote} />
- </div>
+ <VoteIcon type={vote} />
</div>
</td>
);
})}
- <td className="border-l bg-diagonal-lines" />
+ <td className="border-l" />
</tr>
);
};
diff --git a/apps/web/src/components/poll/desktop-poll/poll-header.tsx b/apps/web/src/components/poll/desktop-poll/poll-header.tsx
index 4f1bad227..1af0596ad 100644
--- a/apps/web/src/components/poll/desktop-poll/poll-header.tsx
+++ b/apps/web/src/components/poll/desktop-poll/poll-header.tsx
@@ -48,7 +48,7 @@ const TimelineRow = ({
<tr>
<th
style={{ minWidth: 235, top }}
- className="sticky left-0 z-30 bg-white pr-4 pl-4"
+ className="sticky left-0 z-30 bg-background pr-4 pl-4"
/>
{children}
<th className="w-full min-w-4 border-l" />
@@ -75,8 +75,10 @@ const PollHeader: React.FunctionComponent = () => {
key={option.optionId}
style={{ height: monthRowHeight }}
className={cn(
- "sticky top-0 space-y-3 bg-gray-50",
- firstOfMonth ? "left-[235px] z-20 border-l" : "z-10",
+ "sticky top-0 space-y-3 bg-background",
+ firstOfMonth
+ ? "left-[235px] z-20 border-card-border border-l"
+ : "z-10",
)}
>
<div className="flex">
@@ -114,7 +116,7 @@ const PollHeader: React.FunctionComponent = () => {
top: monthRowHeight,
}}
className={cn(
- "sticky space-y-2 border-t bg-gray-50",
+ "sticky space-y-2 border-t bg-background",
firstOfDay ? "z-20" : "z-10",
{
"border-l": firstOfDay,
@@ -139,7 +141,7 @@ const PollHeader: React.FunctionComponent = () => {
<th
key={option.optionId}
style={{ minWidth: 80, maxWidth: 90, top: scoreRowTop }}
- className="sticky z-20 border-l bg-gray-50 pb-2.5 align-top"
+ className="sticky z-20 border-l bg-background pb-2.5 align-top"
>
<div className="flex flex-col items-center gap-3">
{option.type === "timeSlot" ? (
diff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/components/poll/manage-poll.tsx
index 7b34575da..42b8b1ab2 100644
--- a/apps/web/src/components/poll/manage-poll.tsx
+++ b/apps/web/src/components/poll/manage-poll.tsx
@@ -249,7 +249,7 @@ const ManagePoll: React.FunctionComponent<{
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
- className="text-destructive"
+ variant="destructive"
onClick={() => {
setShowDeletePollDialog(true);
}}
diff --git a/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx b/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx
index 344832be4..d97d6e6ee 100644
--- a/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx
+++ b/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx
@@ -144,7 +144,7 @@ export const FinalizePollForm = ({
<RadioGroup
onValueChange={field.onChange}
value={field.value}
- className="grid max-h-96 gap-2 overflow-y-auto rounded-lg border bg-gray-100 p-2"
+ className="grid max-h-96 gap-2 overflow-y-auto rounded-xl bg-gray-100 p-2 dark:bg-gray-900"
>
{options.map((option) => {
const start = adjustTimeZone(
@@ -162,7 +162,7 @@ export const FinalizePollForm = ({
key={option.id}
htmlFor={option.id}
className={cn(
- "group flex select-none items-start gap-4 rounded-lg border bg-white p-3 text-base",
+ "group flex select-none items-start gap-4 rounded-lg border bg-card p-3 text-base",
field.value === option.id ? "" : "",
)}
>
diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/components/poll/mobile-poll.tsx
index 7f129edd9..b7fc33798 100644
--- a/apps/web/src/components/poll/mobile-poll.tsx
+++ b/apps/web/src/components/poll/mobile-poll.tsx
@@ -1,6 +1,12 @@
import { Badge } from "@rallly/ui/badge";
import { Button } from "@rallly/ui/button";
-import { Card, CardFooter, CardHeader, CardTitle } from "@rallly/ui/card";
+import {
+ Card,
+ CardContent,
+ CardFooter,
+ CardHeader,
+ CardTitle,
+} from "@rallly/ui/card";
import { Icon } from "@rallly/ui/icon";
import {
Select,
@@ -70,7 +76,7 @@ const MobilePoll: React.FunctionComponent = () => {
</div>
</CardHeader>
- <div className="sticky top-0 z-20 flex flex-col space-y-2 border-b bg-gray-50 p-2">
+ <div className="flex flex-col space-y-2 border-b p-2">
<div className="flex gap-x-2.5">
{selectedParticipantId || !isEditing ? (
<Select
@@ -168,9 +174,9 @@ const MobilePoll: React.FunctionComponent = () => {
</div>
</div>
{poll.options[0]?.duration !== 0 && poll.timeZone ? (
- <CardHeader>
+ <CardContent className="border-b">
<TimesShownIn />
- </CardHeader>
+ </CardContent>
) : null}
<GroupedOptions
selectedParticipantId={selectedParticipantId}
@@ -199,12 +205,13 @@ const MobilePoll: React.FunctionComponent = () => {
transition: { duration: 0.2 },
}}
>
- <CardFooter>
+ <CardFooter className="border-t">
<Button
form="voting-form"
className="w-full"
type="submit"
variant="primary"
+ size="md"
loading={formState.isSubmitting}
>
{selectedParticipantId ? t("save") : t("continue")}
diff --git a/apps/web/src/components/poll/mobile-poll/grouped-options.tsx b/apps/web/src/components/poll/mobile-poll/grouped-options.tsx
index 3d0a2dc15..be1567ef2 100644
--- a/apps/web/src/components/poll/mobile-poll/grouped-options.tsx
+++ b/apps/web/src/components/poll/mobile-poll/grouped-options.tsx
@@ -29,7 +29,7 @@ const GroupedOptions: React.FunctionComponent<GroupedOptionsProps> = ({
<div key={day}>
<div
className={cn(
- "flex border-b bg-gray-50 px-4 py-2 font-medium text-xs uppercase",
+ "flex border-b bg-muted px-4 py-2 font-medium text-xs uppercase",
groupClassName,
)}
>
diff --git a/apps/web/src/components/poll/mobile-poll/poll-option.tsx b/apps/web/src/components/poll/mobile-poll/poll-option.tsx
index d83b78ded..cf0d1f71d 100644
--- a/apps/web/src/components/poll/mobile-poll/poll-option.tsx
+++ b/apps/web/src/components/poll/mobile-poll/poll-option.tsx
@@ -45,7 +45,7 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
return (
<div>
{noVotes ? (
- <p className="rounded-lg bg-gray-50 p-2 text-center text-gray-500 text-sm">
+ <p className="rounded-lg bg-muted p-2 text-center text-muted-foreground text-sm">
{t("noVotes")}
</p>
) : (
@@ -59,7 +59,7 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
<VoteIcon
type="yes"
size="sm"
- className="-translate-x-1.5 absolute bottom-full left-full translate-y-2.5 rounded-full bg-white"
+ className="-translate-x-1.5 absolute bottom-full left-full translate-y-2.5 rounded-full bg-background"
/>
</div>
<div className="truncate text-sm">{name}</div>
@@ -73,7 +73,7 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
<VoteIcon
type="ifNeedBe"
size="sm"
- className="-translate-x-1.5 absolute bottom-full left-full translate-y-2.5 rounded-full bg-white"
+ className="-translate-x-1.5 absolute bottom-full left-full translate-y-2.5 rounded-full bg-background"
/>
</div>
<div className="truncate text-sm"> {name}</div>
@@ -89,7 +89,7 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
<VoteIcon
type="no"
size="sm"
- className="-translate-x-1.5 absolute bottom-full left-full translate-y-2.5 rounded-full bg-white"
+ className="-translate-x-1.5 absolute bottom-full left-full translate-y-2.5 rounded-full bg-background"
/>
</div>
<div className="truncate text-sm">{name}</div>
@@ -119,8 +119,8 @@ const PollOption: React.FunctionComponent<PollOptionProps> = ({
return (
<div
role="button"
- className={cn("space-y-4 bg-white p-4", {
- "bg-gray-500/5": editable && active,
+ className={cn("space-y-4 bg-background p-4 transition-colors", {
+ "bg-accent/50": editable && active,
})}
onPointerDown={() => setActive(editable)}
onPointerUp={() => setActive(false)}
diff --git a/apps/web/src/components/poll/poll-footer.tsx b/apps/web/src/components/poll/poll-footer.tsx
index 6bcfc976e..5a3f5f850 100644
--- a/apps/web/src/components/poll/poll-footer.tsx
+++ b/apps/web/src/components/poll/poll-footer.tsx
@@ -4,7 +4,7 @@ import { Trans } from "@/components/trans";
export function PollFooter() {
return (
- <div className="pt-4 pb-12 text-center text-gray-500 text-sm">
+ <div className="pt-4 pb-12 text-center text-muted-foreground text-sm">
<Trans
defaults="Powered by <a>{name}</a>"
i18nKey="poweredByRallly"
@@ -12,7 +12,7 @@ export function PollFooter() {
components={{
a: (
<Link
- className="rounded-none border-b border-b-gray-500 font-semibold hover:text-primary-600"
+ className="rounded-none border-b border-b-gray-500 font-semibold hover:text-primary"
href="https://rallly.co"
/>
),
diff --git a/apps/web/src/components/poll/scheduled-event.tsx b/apps/web/src/components/poll/scheduled-event.tsx
index 622d3d442..961a452dc 100644
--- a/apps/web/src/components/poll/scheduled-event.tsx
+++ b/apps/web/src/components/poll/scheduled-event.tsx
@@ -23,15 +23,13 @@ function DateIcon({ start }: { start: Date }) {
const d = adjustTimeZone(start, !poll.timeZone);
return (
<time
- className="inline-flex size-12 flex-col rounded-lg border text-center"
+ className="inline-flex size-12 flex-col items-center justify-center gap-1 rounded-lg border text-center"
dateTime={d.toISOString()}
>
- <div className="border-green-600/10 border-b p-px text-xs">
+ <div className="text-[10px] text-muted-foreground uppercase">
{d.format("MMM")}
</div>
- <div className="inline-flex grow items-center justify-center font-bold text-sm">
- {d.format("D")}
- </div>
+ <div className="font-bold text-sm">{d.format("D")}</div>
</time>
);
}
@@ -70,8 +68,8 @@ export function ScheduledEvent() {
return (
<>
- <div className="rounded-lg border bg-white p-0.5 shadow-xs">
- <div className="flex h-9 items-center gap-x-2 rounded-md bg-gray-100 px-2">
+ <div className="rounded-lg border-card-border bg-card p-0.5 shadow-xs">
+ <div className="flex h-9 items-center gap-x-2 rounded-md bg-gray-100 px-2 text-card-foreground dark:bg-gray-800">
<CalendarIcon className="size-4" />
<h2 className="font-medium text-sm">
<Trans i18nKey="schedulateDate" defaults="Scheduled Date" />
diff --git a/apps/web/src/components/poll/score-summary.tsx b/apps/web/src/components/poll/score-summary.tsx
index 496c556d4..a4bfc6200 100644
--- a/apps/web/src/components/poll/score-summary.tsx
+++ b/apps/web/src/components/poll/score-summary.tsx
@@ -73,7 +73,9 @@ const ScoreSummary: React.FunctionComponent<PopularityScoreProps> = React.memo(
<span
className={cn(
"relative inline-flex items-center gap-x-1 text-xs",
- highlight ? "font-medium text-gray-800" : "font-normal text-gray-500",
+ highlight
+ ? "font-medium text-foreground"
+ : "font-normal text-muted-foreground",
)}
style={{
opacity: Math.max(score / highScore, 0.2),
diff --git a/apps/web/src/components/poll/vote-icon.tsx b/apps/web/src/components/poll/vote-icon.tsx
index 908fed6db..503c970d3 100644
--- a/apps/web/src/components/poll/vote-icon.tsx
+++ b/apps/web/src/components/poll/vote-icon.tsx
@@ -10,7 +10,7 @@ import { YesIcon } from "@/components/vote-icon/yes-icon";
const iconVariants = cva("", {
variants: {
size: {
- sm: "size-4",
+ sm: "size-3",
md: "size-5",
},
},
diff --git a/apps/web/src/components/poll/vote-selector.tsx b/apps/web/src/components/poll/vote-selector.tsx
index 26117b89f..7f6e21135 100644
--- a/apps/web/src/components/poll/vote-selector.tsx
+++ b/apps/web/src/components/poll/vote-selector.tsx
@@ -37,7 +37,7 @@ export const VoteSelector = React.forwardRef<
onBlur={onBlur}
onKeyDown={onKeyDown}
className={cn(
- "flex size-7 items-center justify-center rounded-md border bg-white ring-gray-200 focus:ring-2",
+ "flex size-7 items-center justify-center rounded-lg border border-input-border bg-input ring-ring focus-visible:ring-2",
className,
)}
onClick={() => {
diff --git a/apps/web/src/components/poll/you-avatar.tsx b/apps/web/src/components/poll/you-avatar.tsx
index 399322db8..901008467 100644
--- a/apps/web/src/components/poll/you-avatar.tsx
+++ b/apps/web/src/components/poll/you-avatar.tsx
@@ -1,12 +1,9 @@
-import { Icon } from "@rallly/ui/icon";
import { UserIcon } from "lucide-react";
export function YouAvatar() {
return (
- <div className="inline-flex size-5 items-center justify-center rounded-full bg-gray-200 font-medium text-xs">
- <Icon>
- <UserIcon />
- </Icon>
+ <div className="inline-flex size-5 items-center justify-center rounded-full bg-muted font-medium text-muted-foreground text-xs">
+ <UserIcon className="size-3" />
</div>
);
}
diff --git a/apps/web/src/components/random-gradient-bar.tsx b/apps/web/src/components/random-gradient-bar.tsx
index 06060d8b9..8aecfa044 100644
--- a/apps/web/src/components/random-gradient-bar.tsx
+++ b/apps/web/src/components/random-gradient-bar.tsx
@@ -1,10 +1,5 @@
-import { generateGradient } from "@/utils/color-hash";
-
-export function RandomGradientBar({ seed }: { seed?: string }) {
+export function RandomGradientBar() {
return (
- <div
- className="-mx-px -mt-px h-2 sm:rounded-t-md"
- style={{ background: generateGradient(seed ?? "") }}
- />
+ <div className="-mx-px -mt-px h-2 bg-linear-to-r from-primary to-primary/75 sm:rounded-t-2xl" />
);
}
diff --git a/apps/web/src/components/stacked-list.tsx b/apps/web/src/components/stacked-list.tsx
index f320cd7a9..eb9e4396a 100644
--- a/apps/web/src/components/stacked-list.tsx
+++ b/apps/web/src/components/stacked-list.tsx
@@ -8,7 +8,12 @@ export function StackedList({
className?: string;
}) {
return (
- <ul className={cn("divide-y overflow-hidden rounded-xl border", className)}>
+ <ul
+ className={cn(
+ "divide-y overflow-hidden rounded-xl border border-card-border bg-card",
+ className,
+ )}
+ >
{children}
</ul>
);
@@ -24,7 +29,7 @@ export function StackedListItem({
return (
<li
className={cn(
- "flex items-center gap-x-6 p-4 hover:bg-gray-50",
+ "flex items-center gap-x-6 p-4 hover:bg-card-accent",
className,
)}
>
diff --git a/apps/web/src/components/steps/steps.tsx b/apps/web/src/components/steps/steps.tsx
index bf7609555..6cd972176 100644
--- a/apps/web/src/components/steps/steps.tsx
+++ b/apps/web/src/components/steps/steps.tsx
@@ -31,9 +31,9 @@ const Steps: React.FunctionComponent<StepsProps> = ({
// biome-ignore lint/suspicious/noArrayIndexKey: Fix this later
key={i}
className={cn("h-2 w-2 rounded-full transition-all", {
- "bg-primary-400": i <= current,
+ "bg-primary/70": i <= current,
"bg-gray-300": i > current,
- "animate-pulse ring-4 ring-primary-200": i === current,
+ "animate-pulse ring-4 ring-primary/30": i === current,
})}
/>
);
diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsx
index 5db85dea5..a9e04ebca 100644
--- a/apps/web/src/components/user-dropdown.tsx
+++ b/apps/web/src/components/user-dropdown.tsx
@@ -7,24 +7,33 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
+ DropdownMenuPortal,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
DropdownMenuSeparator,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from "@rallly/ui/dropdown-menu";
import { Icon } from "@rallly/ui/icon";
+import { useTheme } from "@rallly/ui/theme-provider";
import {
ArrowUpRight,
ChevronDownIcon,
- CreditCardIcon,
LifeBuoyIcon,
ListIcon,
LogOutIcon,
+ MonitorIcon,
+ MoonIcon,
Settings2Icon,
+ SunIcon,
+ SunMoonIcon,
UserIcon,
} from "lucide-react";
import Link from "next/link";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Trans } from "@/components/trans";
-import { IfCloudHosted } from "@/contexts/environment";
import { signOut } from "@/lib/auth-client";
export const UserDropdown = ({
@@ -39,6 +48,7 @@ export const UserDropdown = ({
className?: string;
}) => {
const posthog = usePostHog();
+ const { theme, setTheme } = useTheme();
return (
<DropdownMenu modal={false}>
@@ -88,17 +98,7 @@ export const UserDropdown = ({
<Trans i18nKey="preferences" defaults="Preferences" />
</Link>
</DropdownMenuItem>
- <IfCloudHosted>
- <DropdownMenuItem asChild={true}>
- <Link
- href="/settings/billing"
- className="flex items-center gap-x-2"
- >
- <CreditCardIcon className="size-4 text-muted-foreground" />
- <Trans i18nKey="Billing" defaults="Billing" />
- </Link>
- </DropdownMenuItem>
- </IfCloudHosted>
+
<DropdownMenuItem asChild={true}>
<Link
target="_blank"
@@ -113,6 +113,39 @@ export const UserDropdown = ({
</Link>
</DropdownMenuItem>
<DropdownMenuSeparator />
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger>
+ <Icon>
+ <SunMoonIcon />
+ </Icon>
+ <Trans i18nKey="theme" defaults="Theme" />
+ </DropdownMenuSubTrigger>
+ <DropdownMenuPortal>
+ <DropdownMenuSubContent>
+ <DropdownMenuRadioGroup value={theme} onValueChange={setTheme}>
+ <DropdownMenuRadioItem value="system">
+ <Icon>
+ <MonitorIcon />
+ </Icon>
+ <Trans i18nKey="themeSystem" defaults="System" />
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="light">
+ <Icon>
+ <SunIcon />
+ </Icon>
+ <Trans i18nKey="themeLight" defaults="Light" />
+ </DropdownMenuRadioItem>
+ <DropdownMenuRadioItem value="dark">
+ <Icon>
+ <MoonIcon />
+ </Icon>
+ <Trans i18nKey="themeDark" defaults="Dark" />
+ </DropdownMenuRadioItem>
+ </DropdownMenuRadioGroup>
+ </DropdownMenuSubContent>
+ </DropdownMenuPortal>
+ </DropdownMenuSub>
+ <DropdownMenuSeparator />
<DropdownMenuItem
onClick={async () => {
await signOut();
diff --git a/apps/web/src/components/user.tsx b/apps/web/src/components/user.tsx
deleted file mode 100644
index da9df5afd..000000000
--- a/apps/web/src/components/user.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-"use client";
-import { cn } from "@rallly/ui";
-import { Icon } from "@rallly/ui/icon";
-import { User2Icon } from "lucide-react";
-
-import { getRandomAvatarColor } from "@/utils/color-hash";
-
-interface UserAvatarProps {
- name?: string;
- size?: "xs" | "sm" | "md" | "lg";
- className?: string;
-}
-
-export const UserAvatar = ({
- size = "md",
- name,
- className,
-}: UserAvatarProps) => {
- const colors = name ? getRandomAvatarColor(name) : null;
- return (
- <span
- className={cn(
- "inline-flex items-center justify-center overflow-hidden rounded-full font-semibold",
- {
- "size-5 text-[10px]": size === "xs",
- "size-6 text-sm": size === "sm",
- "size-8 text-base": size === "md",
- "size-12 text-lg": size === "lg",
- },
- !name
- ? "bg-gray-200"
- : colors?.requiresDarkText
- ? "text-gray-800"
- : "text-white",
- className,
- )}
- style={{
- backgroundColor: colors?.color,
- }}
- >
- {name ? (
- name[0].toUpperCase()
- ) : (
- <Icon>
- <User2Icon />
- </Icon>
- )}
- </span>
- );
-};
diff --git a/apps/web/src/components/vote-icon/no-icon.tsx b/apps/web/src/components/vote-icon/no-icon.tsx
index abf8e467a..29ada75b6 100644
--- a/apps/web/src/components/vote-icon/no-icon.tsx
+++ b/apps/web/src/components/vote-icon/no-icon.tsx
@@ -15,7 +15,7 @@ export function NoIcon({ className }: { className?: string }) {
fillRule="evenodd"
clipRule="evenodd"
d="M10 18C12.1217 18 14.1566 17.1571 15.6569 15.6569C17.1571 14.1566 18 12.1217 18 10C18 7.87827 17.1571 5.84344 15.6569 4.34315C14.1566 2.84285 12.1217 2 10 2C7.87827 2 5.84344 2.84285 4.34315 4.34315C2.84285 5.84344 2 7.87827 2 10C2 12.1217 2.84285 14.1566 4.34315 15.6569C5.84344 17.1571 7.87827 18 10 18ZM8.707 7.293C8.5184 7.11084 8.2658 7.01005 8.0036 7.01233C7.7414 7.0146 7.49059 7.11977 7.30518 7.30518C7.11977 7.49059 7.0146 7.7414 7.01233 8.0036C7.01005 8.2658 7.11084 8.5184 7.293 8.707L8.586 10L7.293 11.293C7.19749 11.3852 7.12131 11.4956 7.0689 11.6176C7.01649 11.7396 6.9889 11.8708 6.98775 12.0036C6.9866 12.1364 7.0119 12.2681 7.06218 12.391C7.11246 12.5139 7.18671 12.6255 7.2806 12.7194C7.3745 12.8133 7.48615 12.8875 7.60905 12.9378C7.73194 12.9881 7.86362 13.0134 7.9964 13.0123C8.12918 13.0111 8.2604 12.9835 8.3824 12.9311C8.50441 12.8787 8.61475 12.8025 8.707 12.707L10 11.414L11.293 12.707C11.4816 12.8892 11.7342 12.99 11.9964 12.9877C12.2586 12.9854 12.5094 12.8802 12.6948 12.6948C12.8802 12.5094 12.9854 12.2586 12.9877 11.9964C12.99 11.7342 12.8892 11.4816 12.707 11.293L11.414 10L12.707 8.707C12.8892 8.5184 12.99 8.2658 12.9877 8.0036C12.9854 7.7414 12.8802 7.49059 12.6948 7.30518C12.5094 7.11977 12.2586 7.0146 11.9964 7.01233C11.7342 7.01005 11.4816 7.11084 11.293 7.293L10 8.586L8.707 7.293Z"
- fill="#99A1AF"
+ fill="#71717b"
/>
</svg>
);
diff --git a/apps/web/src/components/vote-summary-progress-bar.tsx b/apps/web/src/components/vote-summary-progress-bar.tsx
index 922cef01a..99e1df993 100644
--- a/apps/web/src/components/vote-summary-progress-bar.tsx
+++ b/apps/web/src/components/vote-summary-progress-bar.tsx
@@ -27,7 +27,7 @@ export const VoteSummaryProgressBar = (props: {
no: string[];
}) => {
return (
- <div className="flex h-1.5 grow overflow-hidden rounded-sm bg-slate-100">
+ <div className="flex h-1.5 grow overflow-hidden rounded-sm bg-muted">
<Tooltip>
<TooltipTrigger asChild>
<div
@@ -57,7 +57,7 @@ export const VoteSummaryProgressBar = (props: {
<Tooltip>
<TooltipTrigger asChild>
<div
- className="h-full bg-gray-300 opacity-75 hover:opacity-100"
+ className="h-full bg-transparent opacity-75 hover:opacity-100"
style={{
width: `${(props.no.length / props.total) * 100}%`,
}}
diff --git a/apps/web/src/env.ts b/apps/web/src/env.ts
index ec17b633c..08efe1a29 100644
--- a/apps/web/src/env.ts
+++ b/apps/web/src/env.ts
@@ -102,6 +102,23 @@ export const env = createEnv({
MICROSOFT_TENANT_ID: z.string().optional().default("common"),
MICROSOFT_CLIENT_ID: z.string().optional(),
MICROSOFT_CLIENT_SECRET: z.string().optional(),
+
+ /**
+ * App name
+ */
+ APP_NAME: z.string().optional().default("Rallly"),
+ /**
+ * Primary color for theming (hex format, e.g., "#4f46e5")
+ */
+ PRIMARY_COLOR: z
+ .string()
+ .regex(/^#(?:[0-9a-f]{3}){1,2}$/i, "Invalid hex color")
+ .optional(),
+ /**
+ * Logo URL for the email logo
+ */
+ LOGO_URL: z.url().optional(),
+ LOGO_ICON_URL: z.url().optional(),
},
/*
* Environment variables available on the client (and server).
@@ -170,6 +187,10 @@ export const env = createEnv({
MICROSOFT_TENANT_ID: process.env.MICROSOFT_TENANT_ID,
MICROSOFT_CLIENT_ID: process.env.MICROSOFT_CLIENT_ID,
MICROSOFT_CLIENT_SECRET: process.env.MICROSOFT_CLIENT_SECRET,
+ PRIMARY_COLOR: process.env.PRIMARY_COLOR,
+ LOGO_URL: process.env.LOGO_URL,
+ LOGO_ICON_URL: process.env.LOGO_ICON_URL,
+ APP_NAME: process.env.APP_NAME,
},
skipValidation: !!process.env.SKIP_ENV_VALIDATION,
});
diff --git a/apps/web/src/features/billing/components/pay-wall-dialog.tsx b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
index 696a2639b..8480be322 100644
--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx
+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
@@ -49,7 +49,7 @@ function KeyBenefitsItem({
}) {
return (
<li className="flex items-center gap-3">
- <div className="rounded-lg border bg-linear-to-b from-white to-gray-50 p-2">
+ <div className="rounded-lg border bg-muted p-2 text-muted-foreground">
<Icon>{icon}</Icon>
</div>
<div>
@@ -84,7 +84,7 @@ function PlanRadioGroupItem({
return (
<label
htmlFor={id}
- className="flex cursor-pointer items-center justify-between gap-4 rounded-lg border p-4 transition-colors has-data-[state=checked]:border-primary-300 has-data-[state=checked]:bg-primary-background has-data-[state=checked]:ring-primary"
+ className="flex cursor-pointer items-center justify-between gap-4 rounded-lg border border-popover-border p-4 transition-colors has-data-[state=checked]:border-primary has-data-[state=checked]:bg-primary/5 has-data-[state=checked]:ring-primary"
>
<RadioGroupItem value={value} id={id} />
<div className="flex-1">
@@ -143,13 +143,16 @@ export function PayWallDialog({
}
}}
>
- <DialogContent size="4xl" className="overflow-hidden p-0 lg:h-[500px]">
+ <DialogContent
+ size="4xl"
+ className="overflow-hidden p-0 lg:min-h-[500px]"
+ >
<Tabs value={selectedPlan} onValueChange={handleChangePlan} asChild>
<div className="grid min-h-0 grid-cols-1 md:grid-cols-2">
<div className="flex flex-col p-6">
<DialogHeader>
<div className="flex items-center gap-3">
- <PageIcon size="sm" color="indigo">
+ <PageIcon size="sm" color="primary">
<SparklesIcon />
</PageIcon>
<DialogTitle>
@@ -186,12 +189,15 @@ export function PayWallDialog({
<div className="space-y-4 pt-4">
{selectedPlan === "pro" && (
- <div className="flex items-start justify-between gap-4 rounded-lg border border-dashed bg-muted-background p-4">
+ <label
+ htmlFor="annual-switch"
+ className="flex items-start justify-between gap-4 rounded-lg bg-gray-100 p-4 dark:bg-gray-700"
+ >
<div className="mt-1">
- <BadgeDollarSignIcon className="size-4 text-green-500" />
+ <BadgeDollarSignIcon className="size-5 text-green-500 dark:text-green-400" />
</div>
- <div className="flex-1 space-y-2">
- <Label htmlFor="annual-switch" className="leading-4">
+ <div className="flex-1">
+ <div className="text-sm">
<Trans
defaults="Save {amount} with yearly billing"
i18nKey="annualSavings"
@@ -203,8 +209,8 @@ export function PayWallDialog({
),
}}
/>
- </Label>
- <p className="text-muted-foreground text-sm">
+ </div>
+ <div className="text-muted-foreground text-sm">
<Trans
defaults="Pay for {payMonths, number} months, get 12."
i18nKey="annualDiscount"
@@ -212,7 +218,7 @@ export function PayWallDialog({
payMonths: 8,
}}
/>
- </p>
+ </div>
</div>
<div className="mt-1">
<Switch
@@ -221,7 +227,7 @@ export function PayWallDialog({
id="annual-switch"
/>
</div>
- </div>
+ </label>
)}
{selectedPlan === "pro" ? (
<TabsContent value="pro">
@@ -238,7 +244,7 @@ export function PayWallDialog({
</div>
{/* Right Side - Plan Benefits */}
- <div className="hidden overflow-y-auto bg-muted-background px-6 py-6 md:block">
+ <div className="hidden overflow-y-auto bg-gray-100 px-6 py-6 md:block dark:bg-gray-900">
<TabsContent value="hobby" className="space-y-6">
<DialogHeader>
<DialogTitle>{PLAN_NAMES.HOBBY}</DialogTitle>
diff --git a/apps/web/src/features/password/components/password-strength-meter.tsx b/apps/web/src/features/password/components/password-strength-meter.tsx
index 74d6af42f..0213df984 100644
--- a/apps/web/src/features/password/components/password-strength-meter.tsx
+++ b/apps/web/src/features/password/components/password-strength-meter.tsx
@@ -35,12 +35,15 @@ export function PasswordStrengthMeter({
<div
key={`password-strength-bar-${bar}`}
className={cn(
- "h-1 rounded-full bg-gray-200 transition-all duration-300",
+ "h-1 rounded-full bg-gray-200 transition-all duration-300 dark:bg-gray-700",
{
- "bg-red-500": quality === "weak" && bar === 1,
- "bg-amber-500": quality === "fair" && bar <= 2,
- "bg-green-500": quality === "good" && bar <= 3,
- "bg-teal-500": quality === "strong" && bar <= 4,
+ "bg-red-500 dark:bg-red-700": quality === "weak" && bar === 1,
+ "bg-amber-500 dark:bg-amber-700":
+ quality === "fair" && bar <= 2,
+ "bg-green-500 dark:bg-green-700":
+ quality === "good" && bar <= 3,
+ "bg-teal-500 dark:bg-teal-700":
+ quality === "strong" && bar <= 4,
},
)}
/>
diff --git a/apps/web/src/features/poll/components/poll-status-icon.tsx b/apps/web/src/features/poll/components/poll-status-icon.tsx
index 891c05d4a..ba2f2f033 100644
--- a/apps/web/src/features/poll/components/poll-status-icon.tsx
+++ b/apps/web/src/features/poll/components/poll-status-icon.tsx
@@ -26,7 +26,7 @@ export function PollStatusIcon({
case "live":
return <CirclePlayIcon className="size-4 text-amber-500" />;
case "paused":
- return <CirclePauseIcon className="size-4 text-gray-400" />;
+ return <CirclePauseIcon className="size-4 text-gray-500" />;
case "finalized":
return <CircleCheckIcon className="size-4 text-green-500" />;
}
diff --git a/apps/web/src/features/quick-create/quick-create-widget.tsx b/apps/web/src/features/quick-create/quick-create-widget.tsx
index 4ae346673..8279ed6b9 100644
--- a/apps/web/src/features/quick-create/quick-create-widget.tsx
+++ b/apps/web/src/features/quick-create/quick-create-widget.tsx
@@ -16,7 +16,7 @@ export async function QuickCreateWidget() {
return (
<div className="space-y-8">
<div className="space-y-6">
- <div className="inline-flex items-center justify-center gap-2 rounded-md font-medium text-primary">
+ <div className="inline-flex items-center justify-center gap-2 rounded-md font-medium">
<ZapIcon className="size-5" />
<h2>
<Trans
@@ -96,9 +96,7 @@ export async function QuickCreateWidget() {
</div>
<ul className="space-y-2 text-muted-foreground">
<li className="flex items-center gap-2">
- <Icon variant="success" size="lg">
- <CheckIcon />
- </Icon>
+ <CheckIcon className="size-5 text-green-600 dark:text-green-500" />
<Trans
t={t}
ns="app"
@@ -107,9 +105,7 @@ export async function QuickCreateWidget() {
/>
</li>
<li className="flex items-center gap-2">
- <Icon variant="success" size="lg">
- <CheckIcon />
- </Icon>
+ <CheckIcon className="size-5 text-green-600 dark:text-green-500" />
<Trans
t={t}
ns="app"
@@ -118,9 +114,7 @@ export async function QuickCreateWidget() {
/>
</li>
<li className="flex items-center gap-2">
- <Icon variant="success" size="lg">
- <CheckIcon />
- </Icon>
+ <CheckIcon className="size-5 text-green-600 dark:text-green-500" />
<Trans
t={t}
ns="app"
diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsx
index 1b1db13cd..b6bb7d60c 100644
--- a/apps/web/src/features/space/components/space-dropdown.tsx
+++ b/apps/web/src/features/space/components/space-dropdown.tsx
@@ -58,7 +58,7 @@ export function SpaceDropdown({
<DropdownMenu>
<DropdownMenuTrigger asChild={true}>
<Button
- className={cn("flex h-auto w-full p-2", {
+ className={cn("flex h-auto w-full gap-2.5 p-2", {
"pointer-events-none animate-pulse":
setActiveSpace.isPending || isPending,
})}
@@ -69,7 +69,7 @@ export function SpaceDropdown({
<div className="truncate font-medium text-sm">
{activeSpace.name}
</div>
- <div className="text-muted-foreground text-xs">
+ <div className="text-xs">
<SpaceTierLabel tier={activeSpace.tier} />
</div>
</div>
diff --git a/apps/web/src/features/space/components/space-tier.tsx b/apps/web/src/features/space/components/space-tier.tsx
index e4530d48b..41e5a59bc 100644
--- a/apps/web/src/features/space/components/space-tier.tsx
+++ b/apps/web/src/features/space/components/space-tier.tsx
@@ -7,9 +7,9 @@ import type { SpaceTier } from "@/features/space/schema";
export const SpaceTierLabel = ({ tier }: { tier: SpaceTier }) => {
switch (tier) {
case "hobby":
- return PLAN_NAMES.HOBBY;
+ return <span className="text-muted-foreground">{PLAN_NAMES.HOBBY}</span>;
case "pro":
- return PLAN_NAMES.PRO;
+ return <span className="text-primary">{PLAN_NAMES.PRO}</span>;
}
};
@@ -17,14 +17,14 @@ export const SpaceTierIcon = ({ tier }: { tier: SpaceTier }) => {
switch (tier) {
case "hobby":
return (
- <div className="inline-flex size-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 text-xs">
- <HandHeartIcon className="size-5 text-gray-500" />
+ <div className="inline-flex size-10 items-center justify-center rounded-md border border-muted-border bg-muted text-muted-foreground text-xs">
+ <HandHeartIcon className="size-5" />
</div>
);
case "pro":
return (
- <div className="inline-flex size-10 items-center justify-center rounded-md border border-indigo-200 bg-indigo-50 text-xs">
- <SparklesIcon className="size-5 text-indigo-500" />
+ <div className="inline-flex size-10 items-center justify-center rounded-md border border-primary-border bg-primary text-xs">
+ <SparklesIcon className="size-5 text-primary-foreground" />
</div>
);
}
diff --git a/apps/web/src/utils/color-hash.ts b/apps/web/src/utils/color-hash.ts
index d428bf756..023a7a418 100644
--- a/apps/web/src/utils/color-hash.ts
+++ b/apps/web/src/utils/color-hash.ts
@@ -6,37 +6,6 @@ export const colorHash = new ColorHash({
saturation: 0.8,
});
-type RGBColor = [number, number, number];
-
-// Define an array of avatar background colors
-const avatarBackgroundColors: RGBColor[] = [
- [147, 51, 234], // Indigo
- [106, 0, 255], // Purple
- [255, 177, 255], // Pink
- [166, 74, 255], // Violet
- [236, 72, 153], // Pink
- [147, 51, 234], // Teal
- [147, 51, 234], // Indigo
- [192, 38, 211], // Orchid
- [34, 211, 238], // Sky Blue
- [14, 165, 233], // Blue
- [37, 99, 235], // Royal Blue
-];
-
-function isBright(color: RGBColor): boolean {
- const [r, g, b] = color;
- const L = (0.2126 * r) / 255 + (0.7152 * g) / 255 + (0.0722 * b) / 255;
- return L > 0.6;
-}
-
-export const getRandomAvatarColor = (str: string) => {
- const strSum = str.split("").reduce((acc, val) => acc + val.charCodeAt(0), 0);
- const randomIndex = strSum % avatarBackgroundColors.length;
- const color = avatarBackgroundColors[randomIndex];
- const [r, g, b] = color;
- return { color: `rgb(${r}, ${g}, ${b})`, requiresDarkText: isBright(color) };
-};
-
export const generateGradient = (s: string): string => {
const s1 = s.substring(0, s.length / 2);
const s2 = s.substring(s.length / 2);
diff --git a/apps/web/src/utils/color.ts b/apps/web/src/utils/color.ts
new file mode 100644
index 000000000..9e4fd752e
--- /dev/null
+++ b/apps/web/src/utils/color.ts
@@ -0,0 +1,26 @@
+function hexToRgb(hex: string): { r: number; g: number; b: number } | null {
+ const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+ return result
+ ? {
+ r: Number.parseInt(result[1], 16),
+ g: Number.parseInt(result[2], 16),
+ b: Number.parseInt(result[3], 16),
+ }
+ : null;
+}
+
+function getRelativeLuminance(r: number, g: number, b: number): number {
+ const [rs, gs, bs] = [r, g, b].map((c) => {
+ const sRGB = c / 255;
+ return sRGB <= 0.03928 ? sRGB / 12.92 : ((sRGB + 0.055) / 1.055) ** 2.4;
+ });
+ return 0.2126 * rs + 0.7152 * gs + 0.0722 * bs;
+}
+
+export function getForegroundColor(backgroundColor: string): string {
+ const rgb = hexToRgb(backgroundColor);
+ if (!rgb) return "#ffffff";
+
+ const luminance = getRelativeLuminance(rgb.r, rgb.g, rgb.b);
+ return luminance > 0.5 ? "#101828" : "#ffffff";
+}
diff --git a/apps/web/src/utils/emails.ts b/apps/web/src/utils/emails.ts
index becb10eea..782f44d14 100644
--- a/apps/web/src/utils/emails.ts
+++ b/apps/web/src/utils/emails.ts
@@ -4,7 +4,6 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";
import * as Sentry from "@sentry/nextjs";
import { env } from "@/env";
-import { isSelfHosted } from "@/utils/constants";
export const getEmailClient = (locale?: string) => {
return new EmailClient({
@@ -18,12 +17,14 @@ export const getEmailClient = (locale?: string) => {
},
},
config: {
- logoUrl: isSelfHosted
- ? absoluteUrl("/images/rallly-logo-mark.png")
+ logoUrl: env.LOGO_ICON_URL
+ ? env.LOGO_ICON_URL
: "https://d39ixtfgglw55o.cloudfront.net/images/rallly-logo-mark.png",
baseUrl: absoluteUrl(),
domain: absoluteUrl().replace(/(^\w+:|^)\/\//, ""),
supportEmail: env.SUPPORT_EMAIL,
+ primaryColor: env.PRIMARY_COLOR ?? "#4f46e5",
+ appName: env.APP_NAME,
},
locale,
onError: (e) => {
diff --git a/packages/emails/src/components/email-context.tsx b/packages/emails/src/components/email-context.tsx
index 75532204d..9d15e7bf0 100644
--- a/packages/emails/src/components/email-context.tsx
+++ b/packages/emails/src/components/email-context.tsx
@@ -13,4 +13,5 @@ export const previewEmailContext: EmailContext = {
supportEmail: "[email protected]",
i18n: i18nInstance,
t: i18nInstance.getFixedT("en"),
+ appName: "Rallly",
};
diff --git a/packages/emails/src/components/email-layout.tsx b/packages/emails/src/components/email-layout.tsx
index 3f6d41aa3..d1ed8ff42 100644
--- a/packages/emails/src/components/email-layout.tsx
+++ b/packages/emails/src/components/email-layout.tsx
@@ -42,12 +42,11 @@ export const EmailLayout = ({
<Container style={containerStyles}>
<Img
src={logoUrl}
- width="32"
- height="32"
+ height="42"
style={{
marginBottom: 32,
}}
- alt="Rallly Logo"
+ alt={ctx.appName}
/>
{children}
{poweredBy ? (
@@ -62,7 +61,10 @@ export const EmailLayout = ({
values={{ domain: "rallly.co" }}
components={{
a: (
- <Link href="https://rallly.co?utm_source=email&utm_medium=transactional" />
+ <Link
+ color={ctx.primaryColor}
+ href="https://rallly.co?utm_source=email&utm_medium=transactional"
+ />
),
}}
/>
diff --git a/packages/emails/src/components/notification-email.tsx b/packages/emails/src/components/notification-email.tsx
index 1f84e4e79..cccbcf79e 100644
--- a/packages/emails/src/components/notification-email.tsx
+++ b/packages/emails/src/components/notification-email.tsx
@@ -28,7 +28,7 @@ export const NotificationEmail = ({
<EmailLayout ctx={ctx} preview={preview}>
{children}
<Section style={{ marginTop: 32, marginBottom: 32 }}>
- <Button href={pollUrl}>
+ <Button href={pollUrl} color={ctx.primaryColor}>
{ctx.t("common_viewOn", {
ns: "emails",
defaultValue: "View on {domain}",
@@ -46,6 +46,7 @@ export const NotificationEmail = ({
components={{
a: (
<Link
+ color={ctx.primaryColor}
className="whitespace-nowrap"
href={disableNotificationsUrl}
/>
diff --git a/packages/emails/src/components/styled-components.tsx b/packages/emails/src/components/styled-components.tsx
index 9c6ebbbdc..a1e9d1340 100644
--- a/packages/emails/src/components/styled-components.tsx
+++ b/packages/emails/src/components/styled-components.tsx
@@ -38,16 +38,22 @@ export const Text = (
export const Domain = ({ ctx }: { ctx: EmailContext }) => {
const { baseUrl, domain } = ctx;
- return <Link href={baseUrl}>{domain}</Link>;
+ return (
+ <Link color={ctx.primaryColor} href={baseUrl}>
+ {domain}
+ </Link>
+ );
};
-export const Button = (props: React.ComponentProps<typeof UnstyledButton>) => {
+export const Button = (
+ props: React.ComponentProps<typeof UnstyledButton> & { color?: string },
+) => {
return (
<UnstyledButton
{...props}
className={props.className}
style={{
- backgroundColor: "#4F46E5",
+ backgroundColor: props.color ?? "#4F46E5",
borderRadius: "4px",
padding: "14px",
fontFamily,
@@ -64,11 +70,11 @@ export const Button = (props: React.ComponentProps<typeof UnstyledButton>) => {
);
};
-export const Link = (props: LinkProps) => {
+export const Link = (props: LinkProps & { color?: string }) => {
return (
<UnstyledLink
{...props}
- style={{ color: "#4F46E5", fontFamily, ...props.style }}
+ style={{ color: props.color ?? "#4F46E5", fontFamily, ...props.style }}
/>
);
};
@@ -188,5 +194,3 @@ export const trackingWide = {
export const fontFamily =
"'Inter UI', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif";
-
-export const primaryColor = "#4F46E5";
diff --git a/packages/emails/src/send-email.tsx b/packages/emails/src/send-email.tsx
index c3ac2e527..0b1c290b2 100644
--- a/packages/emails/src/send-email.tsx
+++ b/packages/emails/src/send-email.tsx
@@ -55,6 +55,8 @@ type EmailClientConfig = {
baseUrl: string;
domain: string;
supportEmail: string;
+ primaryColor: string;
+ appName: string;
};
locale?: string;
diff --git a/packages/emails/src/templates/abandoned-checkout.tsx b/packages/emails/src/templates/abandoned-checkout.tsx
index 8d5addd5d..517ad01d8 100644
--- a/packages/emails/src/templates/abandoned-checkout.tsx
+++ b/packages/emails/src/templates/abandoned-checkout.tsx
@@ -92,7 +92,7 @@ export const AbandonedCheckoutEmail = ({
{couponCode}
</Text>
</Card>
- <Button href={recoveryUrl} id="recoveryUrl">
+ <Button href={recoveryUrl} id="recoveryUrl" color={ctx.primaryColor}>
<Trans
i18n={ctx.i18n}
t={ctx.t}
diff --git a/packages/emails/src/templates/change-email-request.tsx b/packages/emails/src/templates/change-email-request.tsx
index dceb86e2e..f13279d92 100644
--- a/packages/emails/src/templates/change-email-request.tsx
+++ b/packages/emails/src/templates/change-email-request.tsx
@@ -51,7 +51,7 @@ export const ChangeEmailRequest = ({
})}
</Text>
<Section>
- <Button href={verificationUrl}>
+ <Button href={verificationUrl} color={ctx.primaryColor}>
{ctx.t("changeEmailRequest_button", {
ns: "emails",
defaultValue: "Verify Email Address",
diff --git a/packages/emails/src/templates/finalized-host.tsx b/packages/emails/src/templates/finalized-host.tsx
index 3dacf2722..7390a9565 100644
--- a/packages/emails/src/templates/finalized-host.tsx
+++ b/packages/emails/src/templates/finalized-host.tsx
@@ -107,7 +107,7 @@ const FinalizeHostEmail = ({
})}
</Text>
<Section style={{ marginTop: 32 }}>
- <Button href={pollUrl}>
+ <Button href={pollUrl} color={ctx.primaryColor}>
{ctx.t("finalizeHost_button", {
defaultValue: "View Event",
ns: "emails",
diff --git a/packages/emails/src/templates/finalized-participant.tsx b/packages/emails/src/templates/finalized-participant.tsx
index 8bc52bd06..9d28b0557 100644
--- a/packages/emails/src/templates/finalized-participant.tsx
+++ b/packages/emails/src/templates/finalized-participant.tsx
@@ -103,7 +103,9 @@ const FinalizeParticipantEmail = ({
})}
</Text>
<Section style={{ marginTop: 32 }}>
- <Button href={pollUrl}>View Event</Button>
+ <Button href={pollUrl} color={ctx.primaryColor}>
+ View Event
+ </Button>
</Section>
</EmailLayout>
);
diff --git a/packages/emails/src/templates/license-key.tsx b/packages/emails/src/templates/license-key.tsx
index fe879bcbb..7c6a10f81 100644
--- a/packages/emails/src/templates/license-key.tsx
+++ b/packages/emails/src/templates/license-key.tsx
@@ -109,6 +109,7 @@ export const LicenseKeyEmail = ({
components={{
a: (
<Link
+ color={ctx.primaryColor}
className="text-link"
href="https://support.rallly.co/self-hosting/licensing#activating-your-license"
/>
@@ -134,7 +135,13 @@ export const LicenseKeyEmail = ({
}
values={{ supportEmail: ctx.supportEmail }}
components={{
- a: <Link className="text-link" href="mailto:[email protected]" />,
+ a: (
+ <Link
+ color={ctx.primaryColor}
+ className="text-link"
+ href="mailto:[email protected]"
+ />
+ ),
}}
/>
</Text>
diff --git a/packages/emails/src/templates/new-participant-confirmation.tsx b/packages/emails/src/templates/new-participant-confirmation.tsx
index f294a61d5..3d037e65f 100644
--- a/packages/emails/src/templates/new-participant-confirmation.tsx
+++ b/packages/emails/src/templates/new-participant-confirmation.tsx
@@ -59,7 +59,11 @@ const NewParticipantConfirmationEmail = ({
/>
</Text>
<Section style={{ marginTop: 32 }}>
- <Button id="editSubmissionUrl" href={editSubmissionUrl}>
+ <Button
+ id="editSubmissionUrl"
+ href={editSubmissionUrl}
+ color={ctx.primaryColor}
+ >
<Trans
i18n={ctx.i18n}
t={ctx.t}
diff --git a/packages/emails/src/templates/new-poll.tsx b/packages/emails/src/templates/new-poll.tsx
index a1d6055da..ca87867d5 100644
--- a/packages/emails/src/templates/new-poll.tsx
+++ b/packages/emails/src/templates/new-poll.tsx
@@ -54,10 +54,12 @@ export const NewPollEmail = ({
</Text>
<Card style={{ textAlign: "center" }}>
<Text style={{ textAlign: "center" }}>
- <Link href={participantLink}>{participantLink}</Link>
+ <Link color={ctx.primaryColor} href={participantLink}>
+ {participantLink}
+ </Link>
</Text>
</Card>
- <Button href={adminLink}>
+ <Button href={adminLink} color={ctx.primaryColor}>
{ctx.t("newPoll_button", {
defaultValue: "Manage Poll",
ns: "emails",
diff --git a/packages/emails/src/templates/register.tsx b/packages/emails/src/templates/register.tsx
index 9f39a2bdb..1ef77a64a 100644
--- a/packages/emails/src/templates/register.tsx
+++ b/packages/emails/src/templates/register.tsx
@@ -69,7 +69,12 @@ export const RegisterEmail = ({ code, ctx }: RegisterEmailProps) => {
values={{ supportEmail: ctx.supportEmail }}
components={{
domain: <Domain ctx={ctx} />,
- a: <Link href={`mailto:${ctx.supportEmail}`} />,
+ a: (
+ <Link
+ color={ctx.primaryColor}
+ href={`mailto:${ctx.supportEmail}`}
+ />
+ ),
}}
ns="emails"
/>
diff --git a/packages/emails/src/templates/reset-password.tsx b/packages/emails/src/templates/reset-password.tsx
index 2677703bf..690c22080 100644
--- a/packages/emails/src/templates/reset-password.tsx
+++ b/packages/emails/src/templates/reset-password.tsx
@@ -36,7 +36,7 @@ export const ResetPasswordEmail = ({
})}
</Text>
<Section style={{ marginBottom: 32 }}>
- <Button href={resetLink} id="resetLink">
+ <Button href={resetLink} id="resetLink" color={ctx.primaryColor}>
<Trans
i18n={ctx.i18n}
t={ctx.t}
@@ -54,7 +54,12 @@ export const ResetPasswordEmail = ({
defaults="If you didn't request a password reset, you can ignore this email. Your password will not change unless you create a new one. If this request is suspicious, contact <a>{supportEmail}</a>."
values={{ supportEmail: ctx.supportEmail }}
components={{
- a: <Link href={`mailto:${ctx.supportEmail}`} />,
+ a: (
+ <Link
+ color={ctx.primaryColor}
+ href={`mailto:${ctx.supportEmail}`}
+ />
+ ),
}}
ns="emails"
/>
diff --git a/packages/emails/src/templates/space-invite.tsx b/packages/emails/src/templates/space-invite.tsx
index 58830539f..41b987741 100644
--- a/packages/emails/src/templates/space-invite.tsx
+++ b/packages/emails/src/templates/space-invite.tsx
@@ -45,7 +45,7 @@ export const SpaceInviteEmail = ({
/>
</Text>
<Section style={{ marginBottom: 16 }}>
- <Button href={inviteUrl} id="inviteUrl">
+ <Button href={inviteUrl} id="inviteUrl" color={ctx.primaryColor}>
{ctx.t("spaceInvite_button", {
defaultValue: "Accept Invitation",
ns: "emails",
diff --git a/packages/emails/src/types.ts b/packages/emails/src/types.ts
index 855b9470c..a0b28edb9 100644
--- a/packages/emails/src/types.ts
+++ b/packages/emails/src/types.ts
@@ -10,6 +10,8 @@ export type EmailContext = {
supportEmail: string;
i18n: I18nInstance;
t: TFunction;
+ appName: string;
+ primaryColor?: string;
};
export type TemplateName = keyof EmailTemplates;
diff --git a/packages/tailwind-config/shared-styles.css b/packages/tailwind-config/shared-styles.css
index 7f3b628a8..821fce7ae 100644
--- a/packages/tailwind-config/shared-styles.css
+++ b/packages/tailwind-config/shared-styles.css
@@ -1,11 +1,156 @@
@import 'tailwindcss';
+@custom-variant dark (&:where(.dark, .dark *));
+
@plugin "@tailwindcss/typography";
@plugin "tailwindcss-animate";
@plugin "tailwind-scrollbar";
@source "../../packages/ui/src/**/*.{ts,tsx}";
+:root {
+ --primary: var(--color-indigo-600);
+ --primary-foreground: var(--color-white);
+
+ --border: var(--color-gray-200);
+ --border-muted: oklch(.871 .006 286.286 / .5);
+
+ --input: var(--color-white);
+ --input-border: var(--color-gray-200);
+ --input-foreground: var(--color-gray-800);
+
+ --ring: #d1d5db;
+
+ --destructive: var(--color-rose-600);
+ --destructive-foreground: var(--color-rose-100);
+
+ --background: var(--color-white);
+ --foreground: var(--color-gray-700);
+
+ --accent: oklch(.552 .016 285.938 / .1);
+ --accent-border: var(--color-gray-300);
+ --accent-foreground: var(--color-gray-800);
+
+ --action-bar: var(--color-gray-800);
+ --action-bar-border: var(--color-gray-700);
+ --action-bar-foreground: var(--color-gray-100);
+
+ --muted: oklch(.92 .004 286.32 / .5);
+ --muted-foreground: var(--color-gray-600);
+ --muted-border: oklch(.871 .006 286.286);
+
+ --popover: var(--color-white);
+ --popover-foreground: var(--color-gray-800);
+ --popover-accent: oklch(.552 .016 285.938 / .1);
+ --popover-border: var(--color-gray-200);
+
+ --card: var(--color-white);
+ --card-border: var(--color-gray-200);
+ --card-accent: var(--color-gray-100);
+ --card-foreground: var(--color-gray-800);
+
+ --sidebar: var(--color-gray-100);
+ --sidebar-foreground: var(--color-gray-800);
+ --sidebar-border: var(--color-gray-200);
+
+ --sidebar-accent: var(--color-gray-200);
+ --sidebar-accent-foreground: var(--color-gray-800);
+}
+
+.dark {
+ --background: var(--color-gray-900);
+ --foreground: var(--color-gray-300);
+
+ --primary: var(--color-indigo-500);
+ --primary-foreground: var(--color-indigo-50);
+
+ --sidebar: var(--color-gray-900);
+ --sidebar-foreground: var(--color-gray-100);
+ --sidebar-border: var(--color-gray-800);
+
+ --sidebar-accent: var(--color-gray-800);
+ --sidebar-accent-foreground: #f9fafb;
+
+ --border: oklch(.274 .006 286.033);
+ --border-muted: oklch(.274 .006 286.033 / .5);
+
+ --input: var(--color-gray-800);
+ --input-border: var(--color-gray-700);
+ --input-foreground: var(--color-gray-100);
+
+ --ring: var(--color-gray-600);
+
+ --destructive: var(--color-rose-500);
+ --destructive-foreground: var(--color-rose-50);
+
+ --accent: var(--color-gray-700);
+ --accent-border: var(--color-gray-600);
+ --accent-foreground: var(--color-gray-100);
+
+ --muted: var(--color-gray-800);
+ --muted-foreground: var(--color-gray-400);
+ --muted-border: var(--color-gray-700);
+
+ --popover: var(--color-gray-800);
+ --popover-border: var(--color-gray-700);
+ --popover-foreground: var(--color-gray-300);
+ --popover-accent: var(--color-gray-700);
+
+ --card: color-mix(in srgb, var(--color-gray-800) 25%, transparent);
+ --card-border: var(--color-gray-800);
+ --card-foreground: var(--color-gray-300);
+ --card-accent: var(--color-gray-800);
+}
+
+@theme inline {
+ --color-primary: var(--primary);
+ --color-primary-foreground: var(--primary-foreground);
+
+ --color-border: var(--border);
+ --color-border-muted: var(--border-muted);
+
+ --color-input: var(--input);
+ --color-input-border: var(--input-border);
+ --color-input-foreground: var(--input-foreground);
+
+ --color-ring: var(--ring);
+
+ --color-destructive: var(--destructive);
+ --color-destructive-foreground: var(--destructive-foreground);
+
+ --color-background: var(--background);
+ --color-foreground: var(--foreground);
+
+ --color-accent: var(--accent);
+ --color-accent-border: var(--accent-border);
+ --color-accent-foreground: var(--accent-foreground);
+
+ --color-action-bar: var(--action-bar);
+ --color-action-bar-border: var(--action-bar-border);
+ --color-action-bar-foreground: var(--action-bar-foreground);
+
+ --color-muted: var(--muted);
+ --color-muted-foreground: var(--muted-foreground);
+ --color-muted-border: var(--muted-border);
+
+ --color-popover: var(--popover);
+ --color-popover-border: var(--popover-border);
+ --color-popover-foreground: var(--popover-foreground);
+ --color-popover-accent: var(--popover-accent);
+
+ --color-card: var(--card);
+ --color-card-border: var(--card-border);
+ --color-card-accent: var(--card-accent);
+ --color-card-foreground: var(--card-foreground);
+
+ --color-sidebar: var(--sidebar);
+ --color-sidebar-foreground: var(--sidebar-foreground);
+ --color-sidebar-border: var(--sidebar-border);
+
+ --color-sidebar-accent: var(--sidebar-accent);
+ --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+}
+
@theme {
--shadow-huge:
0px 51px 78px rgb(17 7 53 / 5%), 0px 21.3066px 35.4944px rgb(17 7 53 / 4%),
@@ -15,75 +160,6 @@
0px 1.4113px 1.55262px rgb(17 7 53 / 1%),
inset 0px 1px 0px rgb(41 56 78 / 5%);
- --color-primary-50: #eef2ff;
- --color-primary-100: #e0e7ff;
- --color-primary-200: #c7d2fe;
- --color-primary-300: #a5b4fc;
- --color-primary-400: #818cf8;
- --color-primary-500: #6366f1;
- --color-primary-600: #4f46e5;
- --color-primary-700: #4338ca;
- --color-primary-800: #3730a3;
- --color-primary-900: #312e81;
- --color-primary-950: #1e1b4b;
- --color-primary: #4f46e5;
- --color-primary-foreground: #eef2ff;
- --color-primary-background: #eef2ff;
-
- --color-secondary-background: #eef2ff;
- --color-secondary: #eef2ff;
- --color-secondary-foreground: #4f46e5;
-
- --color-gray-50: #f9fafb;
- --color-gray-100: #f3f4f6;
- --color-gray-200: #e5e7eb;
- --color-gray-300: #d1d5db;
- --color-gray-400: #9ca3af;
- --color-gray-500: #6b7280;
- --color-gray-600: #4b5563;
- --color-gray-700: #374151;
- --color-gray-800: #1f2937;
- --color-gray-900: #111827;
- --color-gray-950: #030712;
-
- --color-border: #e5e7eb;
-
- --color-input: #e5e7eb;
- --color-input-background: #fff;
- --color-input-foreground: #374151;
-
- --color-ring: #d1d5db;
-
- --color-destructive: #e11d48;
- --color-destructive-background: #fff1f2;
- --color-destructive-foreground: #fff1f2;
-
- --color-background: #fff;
- --color-foreground: var(--color-gray-700);
-
- --color-accent: #f3f4f6;
-
- --color-action-bar: #1f2937;
- --color-action-bar-foreground: #f9fafb;
-
- --color-muted: #f3f4f6;
- --color-muted-background: #f9fafb;
- --color-muted-foreground: #6b7280;
-
- --color-popover: #fff;
- --color-popover-foreground: #374151;
-
- --color-card: #fff;
- --color-card-background: #fff;
- --color-card-foreground: #374151;
-
- --color-sidebar: #f3f4f6;
- --color-sidebar-foreground: #374151;
- --color-sidebar-border: #e5e7eb;
-
- --color-sidebar-accent: #e5e7eb;
- --color-sidebar-accent-foreground: #1f2937;
-
--breakpoint-xs: 375px;
--ease-in-expo: cubic-bezier(0.68, -0.6, 0.32, 1.6);
@@ -92,6 +168,19 @@
--font-sans:
var(--font-inter), ui-sans-serif, system-ui, sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+
+ --color-gray-50: var(--color-zinc-50);
+ --color-gray-100: var(--color-zinc-100);
+ --color-gray-200: var(--color-zinc-200);
+ --color-gray-300: var(--color-zinc-300);
+ --color-gray-400: var(--color-zinc-400);
+ --color-gray-500: var(--color-zinc-500);
+ --color-gray-600: var(--color-zinc-600);
+ --color-gray-700: var(--color-zinc-700);
+ --color-gray-800: var(--color-zinc-800);
+ --color-gray-900: var(--color-zinc-900);
+ --color-gray-950: var(--color-zinc-950);
+
}
/*
@@ -108,7 +197,7 @@
::before,
::backdrop,
::file-selector-button {
- border-color: var(--color-gray-200, currentcolor);
+ border-color: var(--color-border, currentcolor);
}
}
@@ -116,12 +205,6 @@
@apply text-primary rounded-md font-medium outline-hidden hover:underline focus:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-1;
}
-@utility bg-diagonal-lines {
- background-color: #f9fafb;
- background-image: url("data:image/svg+xml,%3Csvg width='100' height='100' xmlns='http://www.w3.org/2000/svg'%3E%3Cline x1='0' y1='0' x2='100%' y2='100%' stroke='%23e5e7eb' stroke-width='1'/%3E%3C/svg%3E");
- background-repeat: repeat-y;
-}
-
@layer utilities {
:root {
--spacing: 0.25rem;
@@ -138,4 +221,4 @@
html {
@apply h-full font-sans text-base text-gray-700;
}
-}
\ No newline at end of file
+}
diff --git a/packages/ui/src/action-bar.tsx b/packages/ui/src/action-bar.tsx
index f868cbdb8..38db15eb5 100644
--- a/packages/ui/src/action-bar.tsx
+++ b/packages/ui/src/action-bar.tsx
@@ -22,7 +22,7 @@ const ActionBar = React.forwardRef<
forceMount={true}
ref={ref}
className={cn(
- "-translate-x-1/2 fixed bottom-3 z-50 flex items-start gap-2 rounded-xl bg-action-bar p-2 text-action-bar-foreground shadow-lg transition-transform duration-200 ease-out data-[state=closed]:pointer-events-none data-[state=closed]:translate-y-full data-[state=open]:translate-y-0 data-[state=closed]:opacity-0 data-[state=open]:opacity-100",
+ "-translate-x-1/2 fixed bottom-3 z-50 flex items-center gap-2 rounded-xl border border-action-bar-border bg-action-bar p-2 text-action-bar-foreground shadow-lg transition-transform duration-200 ease-out data-[state=closed]:pointer-events-none data-[state=closed]:translate-y-full data-[state=open]:translate-y-0 data-[state=closed]:opacity-0 data-[state=open]:opacity-100",
"left-1/2 md:bottom-16 md:w-fit",
"w-[calc(100%-24px)]",
className,
diff --git a/packages/ui/src/alert.tsx b/packages/ui/src/alert.tsx
index 597627b3d..429d5d971 100644
--- a/packages/ui/src/alert.tsx
+++ b/packages/ui/src/alert.tsx
@@ -5,26 +5,24 @@ import type * as React from "react";
import { cn } from "./lib/utils";
const alertVariants = cva(
- "relative grid w-full grid-cols-[0_1fr] items-start gap-y-0.5 rounded-lg border px-4 py-3 text-sm has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] has-[>svg]:gap-x-3 [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current",
+ "relative grid w-full grid-cols-[0_1fr] items-start gap-y-0.5 rounded-lg px-4 py-3 text-sm has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] has-[>svg]:gap-x-3 [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current",
{
variants: {
variant: {
- default: "bg-card text-card-foreground",
primary:
- "border-primary-200 bg-primary-50 has-data-[slot=alert-description]:text-primary-700/90 [&>svg]:text-primary-600",
- destructive:
- "border-destructive/20 bg-destructive-background text-destructive has-data-[slot=alert-description]:opacity-90",
- info: "border-blue-200 bg-blue-50 text-blue-900 has-data-[slot=alert-description]:text-blue-800/90 [&>svg]:text-blue-600",
+ "bg-primary *:data-[slot=alert-description]:text-primary-foreground/90 [&>svg]:text-primary-foreground",
+ info: "bg-blue-50 text-blue-500 *:data-[slot=alert-description]:text-blue-700/90 dark:bg-blue-950 dark:text-blue-100 dark:*:data-[slot=alert-description]:text-blue-100/90 [&>svg]:text-blue-700/90 dark:[&>svg]:text-blue-100/90",
warning:
- "border-yellow-200 bg-yellow-50 text-yellow-900 has-data-[slot=alert-description]:text-yellow-800/90 [&>svg]:text-yellow-600",
- tip: "border-green-200 bg-green-50 text-green-900 has-data-[slot=alert-description]:text-green-800/90 [&>svg]:text-green-600",
+ "bg-yellow-50 text-yellow-500 *:data-[slot=alert-description]:text-yellow-500/90 dark:bg-yellow-950 dark:text-yellow-100 dark:*:data-[slot=alert-description]:text-yellow-100/90 [&>svg]:text-yellow-700/90 dark:[&>svg]:text-yellow-100/90",
success:
- "border-green-200 bg-green-50 text-green-900 has-data-[slot=alert-description]:text-green-800/90 [&>svg]:text-green-600",
- note: "border-gray-200 bg-gray-50 text-gray-900 has-data-[slot=alert-description]:text-gray-700/90 [&>svg]:text-gray-600",
+ "bg-green-50 text-green-500 *:data-[slot=alert-description]:text-green-500/90 dark:bg-green-950 dark:text-green-100 dark:*:data-[slot=alert-description]:text-green-100/90 [&>svg]:text-green-700/90 dark:[&>svg]:text-green-100/90",
+ note: "bg-muted text-muted-foreground *:data-[slot=alert-description]:text-muted-foreground/75 [&>svg]:text-muted-foreground/90",
+ error:
+ "bg-rose-50 text-rose-500 *:data-[slot=alert-description]:text-rose-500/90 dark:bg-rose-950 dark:text-rose-100 dark:*:data-[slot=alert-description]:text-rose-100/90 [&>svg]:text-rose-700/90 dark:[&>svg]:text-rose-100/90",
},
},
defaultVariants: {
- variant: "default",
+ variant: "note",
},
},
);
diff --git a/packages/ui/src/avatar.tsx b/packages/ui/src/avatar.tsx
index df5098ec5..7398f326d 100644
--- a/packages/ui/src/avatar.tsx
+++ b/packages/ui/src/avatar.tsx
@@ -1,5 +1,3 @@
-"use client";
-
import * as AvatarPrimitive from "@radix-ui/react-avatar";
import { cn } from "@rallly/ui";
import type { VariantProps } from "class-variance-authority";
@@ -11,8 +9,8 @@ const avatarVariants = cva("relative flex shrink-0 overflow-hidden", {
size: {
xl: "size-12 rounded-lg text-xl",
lg: "size-10 rounded-md text-lg",
- md: "size-8 rounded-xs text-base",
- sm: "size-5 rounded-xs text-[10px]",
+ md: "size-8 rounded-md text-base",
+ sm: "size-5 rounded-sm text-[10px]",
},
},
defaultVariants: {
@@ -47,55 +45,21 @@ const AvatarImage = React.forwardRef<
));
AvatarImage.displayName = AvatarPrimitive.Image.displayName;
-const synthwaveGradients = [
- { from: "#FF36F5", to: "#FF36F5CC" }, // Vibrant Pink to Transparent Pink
- { from: "#B026FF", to: "#B026FFCC" }, // Vibrant Purple to Transparent Purple
- { from: "#FF2182", to: "#FF2182CC" }, // Hot Pink to Transparent Hot Pink
- { from: "#9D4EDD", to: "#9D4EDDCC" }, // Bright Purple to Transparent Bright Purple
- { from: "#7B2CBF", to: "#7B2CBFCC" }, // Deep Purple to Transparent Deep Purple
- { from: "#F72585", to: "#F72585CC" }, // Vibrant Pink to Transparent Vibrant Pink
- { from: "#4361EE", to: "#4361EECC" }, // Bright Blue to Transparent Bright Blue
- { from: "#FF0099", to: "#FF0099CC" }, // Neon Pink to Transparent Neon Pink
- { from: "#6A00F4", to: "#6A00F4CC" }, // Electric Purple to Transparent Electric Purple
- { from: "#D100D1", to: "#D100D1CC" }, // Magenta to Transparent Magenta
- { from: "#FF61C3", to: "#FF61C3CC" }, // Bright Pink to Transparent Bright Pink
-];
-
-export function getGradient(seed: string): {
- fromColor: string;
- toColor: string;
-} {
- let hash = 0;
- for (let i = 0; i < seed.length; i++) {
- hash = seed.charCodeAt(i) + ((hash << 5) - hash);
- }
- const gradient =
- synthwaveGradients[Math.abs(hash) % synthwaveGradients.length];
- return { fromColor: gradient.from, toColor: gradient.to };
-}
-
const AvatarFallback = React.forwardRef<
React.ComponentRef<typeof AvatarPrimitive.Fallback>,
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback> & {
- seed: string;
+ seed?: string;
}
->(({ className, seed, ...props }, ref) => {
- const { fromColor, toColor } = getGradient(seed);
- return (
- <AvatarPrimitive.Fallback
- ref={ref}
- className={cn(
- "flex h-full w-full items-center justify-center font-medium",
- className,
- )}
- style={{
- background: `linear-gradient(135deg, ${fromColor} 0%, ${toColor} 100%)`,
- color: "white",
- }}
- {...props}
- />
- );
-});
+>(({ className, ...props }, ref) => (
+ <AvatarPrimitive.Fallback
+ ref={ref}
+ className={cn(
+ "flex h-full w-full items-center justify-center bg-muted font-normal text-muted-foreground",
+ className,
+ )}
+ {...props}
+ />
+));
AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
export { Avatar, AvatarFallback, AvatarImage };
diff --git a/packages/ui/src/badge.tsx b/packages/ui/src/badge.tsx
index 50743ffb0..f8a2bc292 100644
--- a/packages/ui/src/badge.tsx
+++ b/packages/ui/src/badge.tsx
@@ -9,12 +9,12 @@ const badgeVariants = cva(
{
variants: {
variant: {
- primary: "bg-primary text-primary-50",
- default: "border bg-gray-50",
+ primary: "bg-primary text-primary-foreground",
+ default: "bg-muted",
destructive: "bg-destructive text-destructive-foreground",
outline: "text-foreground",
green: "bg-green-600 text-white",
- secondary: "bg-primary-50 text-primary",
+ secondary: "bg-primary/10 text-primary",
},
size: {
sm: "h-5 min-w-5 px-1.5 text-xs",
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
index c08ce7c60..e26aef190 100644
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -9,21 +9,19 @@ import { cn } from "./lib/utils";
const buttonVariants = cva(
cn(
- "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md font-medium text-sm outline-none transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md font-normal text-sm outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
),
{
variants: {
variant: {
primary:
- "bg-primary text-white active:bg-primary-500 disabled:border-transparent disabled:bg-gray-400",
+ "bg-primary text-primary-foreground hover:bg-primary/90 active:opacity-90",
destructive:
- "border-destructive bg-destructive text-destructive-foreground hover:bg-destructive/90 active:bg-destructive",
+ "bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90 active:opacity-90",
default:
- "border bg-white shadow-xs hover:bg-gray-50 active:bg-gray-100",
- secondary:
- "border-secondary bg-secondary text-secondary-foreground hover:bg-secondary/80 focus-visible:ring-offset-1",
+ "border border-input-border bg-input shadow-xs hover:bg-accent active:shadow-none",
ghost:
- "border-transparent bg-transparent text-gray-800 hover:bg-gray-500/10 active:bg-gray-500/20 data-[state=open]:bg-gray-500/20",
+ "border-transparent bg-transparent text-foreground hover:bg-accent data-[state=open]:bg-accent",
actionBar:
"border-transparent bg-action-bar text-action-bar-foreground hover:bg-action-bar-foreground/10 data-[state=open]:bg-action-bar-foreground/20",
link: "border-transparent text-primary underline-offset-4 hover:underline",
diff --git a/packages/ui/src/card.tsx b/packages/ui/src/card.tsx
index a494098a7..d77384a29 100644
--- a/packages/ui/src/card.tsx
+++ b/packages/ui/src/card.tsx
@@ -9,7 +9,7 @@ const Card = React.forwardRef<
<div
ref={ref}
className={cn(
- "overflow-hidden rounded-2xl border-x border-y bg-card text-card-foreground shadow-2xs",
+ "overflow-hidden rounded-2xl border border-card-border bg-card text-card-foreground shadow-2xs",
className,
)}
{...props}
@@ -24,7 +24,7 @@ const CardHeader = React.forwardRef<
<div
ref={ref}
className={cn(
- "grid rounded-t-md border-b bg-gray-50 p-3 sm:px-4 sm:py-3",
+ "grid rounded-t-md border-card-border border-b bg-card p-3 sm:px-4 sm:py-3",
className,
)}
{...props}
@@ -39,7 +39,7 @@ const CardTitle = React.forwardRef<
<h3
ref={ref}
className={cn(
- "flex items-center gap-x-2.5 font-semibold text-base",
+ "flex items-center gap-x-2.5 font-medium text-base",
className,
)}
{...props}
@@ -74,7 +74,7 @@ const CardFooter = React.forwardRef<
<div
ref={ref}
className={cn(
- "flex items-center gap-x-2 rounded-b-md border-t bg-gray-50 p-3 sm:px-4 sm:py-3",
+ "flex items-center gap-x-2 bg-card p-3 sm:px-4 sm:py-3",
className,
)}
{...props}
diff --git a/packages/ui/src/checkbox.tsx b/packages/ui/src/checkbox.tsx
index 1b9be7e6c..0937b2bc5 100644
--- a/packages/ui/src/checkbox.tsx
+++ b/packages/ui/src/checkbox.tsx
@@ -14,7 +14,7 @@ const Checkbox = React.forwardRef<
<CheckboxPrimitive.Root
ref={ref}
className={cn(
- "peer size-5 shrink-0 rounded-md border border-gray-300 focus-visible:outline-hidden focus-visible:ring-1 active:bg-gray-200 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-primary-700 data-[state=indeterminate]:border-primary data-[state=checked]:bg-primary data-[state=indeterminate]:bg-primary data-[state=checked]:text-primary-foreground data-[state=indeterminate]:text-primary-foreground data-[state=unchecked]:active:border-gray-300 data-[state=checked]:active:bg-primary-700 data-[state=indeterminate]:active:bg-primary-700",
+ "peer size-5 shrink-0 rounded-md border border-gray-300 focus-visible:outline-hidden focus-visible:ring-1 active:bg-gray-200 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-primary data-[state=indeterminate]:border-primary data-[state=checked]:bg-primary data-[state=indeterminate]:bg-primary data-[state=checked]:text-primary-foreground data-[state=indeterminate]:text-primary-foreground data-[state=unchecked]:active:border-gray-300 data-[state=checked]:active:bg-primary/80 data-[state=indeterminate]:active:bg-primary/80",
className,
)}
checked={checked}
diff --git a/packages/ui/src/command.tsx b/packages/ui/src/command.tsx
index 6218fe0fb..2bdabd113 100644
--- a/packages/ui/src/command.tsx
+++ b/packages/ui/src/command.tsx
@@ -17,7 +17,7 @@ const Command = React.forwardRef<
<CommandPrimitive
ref={ref}
className={cn(
- "flex h-full w-full flex-col overflow-hidden rounded-md bg-white",
+ "flex h-full w-full flex-col overflow-hidden rounded-lg bg-popover",
className,
)}
{...props}
@@ -124,7 +124,7 @@ const CommandItem = React.forwardRef<
<CommandPrimitive.Item
ref={ref}
className={cn(
- "relative flex cursor-default select-none items-center gap-2 rounded-md p-2 text-sm outline-hidden aria-selected:bg-gray-100 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
+ "relative flex cursor-default select-none items-center gap-2 rounded-lg p-2 text-sm outline-hidden aria-selected:bg-accent data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
className,
)}
{...props}
@@ -140,7 +140,7 @@ const CommandItemShortcut = React.forwardRef<
<CommandPrimitive.Item
ref={ref}
className={cn(
- "relative flex h-12 cursor-pointer select-none items-center gap-3 rounded-xl px-3 font-medium outline-hidden aria-selected:bg-gray-100 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
+ "relative flex h-12 cursor-pointer select-none items-center gap-3 rounded-xl px-3 font-medium outline-hidden aria-selected:bg-muted data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
className,
)}
{...props}
diff --git a/packages/ui/src/dialog.tsx b/packages/ui/src/dialog.tsx
index 6bd264b3a..d193009c4 100644
--- a/packages/ui/src/dialog.tsx
+++ b/packages/ui/src/dialog.tsx
@@ -51,7 +51,7 @@ function DialogOverlay({
const dialogVariants = cva(
cn(
- "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-xl border bg-background p-4 shadow-lg outline-none duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in",
+ "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-xl border border-popover-border bg-popover p-4 shadow-lg outline-none duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in",
),
{
variants: {
@@ -131,7 +131,7 @@ function DialogTitle({
return (
<DialogPrimitive.Title
data-slot="dialog-title"
- className={cn("font-semibold text-lg leading-none", className)}
+ className={cn("font-semibold text-base leading-none", className)}
{...props}
/>
);
diff --git a/packages/ui/src/dropdown-menu.tsx b/packages/ui/src/dropdown-menu.tsx
index a7afcf0fe..45f440073 100644
--- a/packages/ui/src/dropdown-menu.tsx
+++ b/packages/ui/src/dropdown-menu.tsx
@@ -61,7 +61,7 @@ const DropdownMenuSubContent = React.forwardRef<
<DropdownMenuPrimitive.SubContent
ref={ref}
className={cn(
- "data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 z-50 min-w-32 animate-in overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md",
+ "data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 z-50 min-w-32 animate-in overflow-hidden rounded-lg border border-popover-border bg-popover p-1 text-popover-foreground shadow-md",
className,
)}
{...props}
@@ -79,7 +79,7 @@ const DropdownMenuContent = React.forwardRef<
ref={ref}
sideOffset={sideOffset}
className={cn(
- "data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[100px] animate-in overflow-hidden rounded-lg border bg-popover p-1 text-popover-foreground shadow-md",
+ "data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[100px] animate-in overflow-hidden rounded-lg border border-popover-border bg-popover p-1 text-popover-foreground shadow-md",
className,
)}
{...props}
@@ -93,9 +93,8 @@ const dropdownMenuItemVariants = cva(
{
variants: {
variant: {
- default: "focus:bg-accent focus:text-accent-foreground",
- destructive:
- "text-destructive focus:bg-destructive/10 focus:text-destructive",
+ default: "focus:bg-popover-accent",
+ destructive: "text-destructive focus:bg-popover-accent",
},
},
defaultVariants: {
@@ -156,7 +155,7 @@ const DropdownMenuRadioItem = React.forwardRef<
<DropdownMenuPrimitive.RadioItem
ref={ref}
className={cn(
- "relative flex cursor-default select-none items-center rounded-md py-1.5 pr-8 pl-2 font-medium text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50",
+ "relative flex cursor-default select-none items-center gap-2 rounded-md py-1.5 pr-8 pl-2 font-normal text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50",
className,
)}
{...props}
@@ -197,7 +196,7 @@ const DropdownMenuSeparator = React.forwardRef<
>(({ className, ...props }, ref) => (
<DropdownMenuPrimitive.Separator
ref={ref}
- className={cn("-mx-1 my-1 h-px bg-muted", className)}
+ className={cn("-mx-1 my-1 h-px bg-popover-border", className)}
{...props}
/>
));
diff --git a/packages/ui/src/form.tsx b/packages/ui/src/form.tsx
index 0bbc2f675..a6fd227e2 100644
--- a/packages/ui/src/form.tsx
+++ b/packages/ui/src/form.tsx
@@ -72,7 +72,7 @@ const FormItem = React.forwardRef<
return (
<FormItemContext.Provider value={{ id }}>
- <div ref={ref} className={cn("grid gap-1.5", className)} {...props} />
+ <div ref={ref} className={cn("grid gap-2", className)} {...props} />
</FormItemContext.Provider>
);
});
@@ -87,7 +87,7 @@ const FormLabel = React.forwardRef<
return (
<Label
ref={ref}
- className={cn("font-medium text-sm", className)}
+ className={cn("font-normal text-sm", className)}
htmlFor={formItemId}
{...props}
/>
diff --git a/packages/ui/src/icon.tsx b/packages/ui/src/icon.tsx
index 900c0ae29..3b2c37a63 100644
--- a/packages/ui/src/icon.tsx
+++ b/packages/ui/src/icon.tsx
@@ -8,10 +8,10 @@ import { cn } from "./lib/utils";
const iconVariants = cva("", {
variants: {
variant: {
- default: "text-gray-500",
- success: "text-green-500",
- danger: "text-rose-500",
- primary: "text-primary-600",
+ default: "text-muted-foreground",
+ success: "text-green-600 dark:text-green-500",
+ danger: "text-destructive",
+ primary: "text-primary",
},
size: {
sm: "h-3 w-3",
@@ -40,7 +40,7 @@ export function Icon({
<Slot
className={cn(
iconVariants({ size, variant }),
- "group shrink-0 group-[.bg-destructive]:text-destructive-foreground group-[.bg-primary]:text-primary-50",
+ "group shrink-0 group-[.bg-destructive]:text-destructive-foreground group-[.bg-primary]:text-primary-foreground",
className,
)}
>
diff --git a/packages/ui/src/input.tsx b/packages/ui/src/input.tsx
index 731203487..218f5b528 100644
--- a/packages/ui/src/input.tsx
+++ b/packages/ui/src/input.tsx
@@ -5,7 +5,7 @@ import { cn } from "./lib/utils";
const inputVariants = cva(
cn(
- "w-full min-w-0 border border-input bg-transparent shadow-xs outline-none transition-[color,box-shadow] selection:bg-primary selection:text-primary-foreground file:inline-flex file:h-7 file:border-0 file:bg-transparent file:font-medium file:text-foreground file:text-sm placeholder:text-muted-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 dark:bg-input/30",
+ "w-full min-w-0 border border-input-border bg-transparent shadow-xs outline-none transition-[color,box-shadow] selection:bg-primary selection:text-primary-foreground file:inline-flex file:h-7 file:border-0 file:bg-transparent file:font-medium file:text-foreground file:text-sm placeholder:text-muted-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 dark:bg-input/30",
"focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50",
"aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40",
),
diff --git a/packages/ui/src/label.tsx b/packages/ui/src/label.tsx
index a273fcba6..45e798ac9 100644
--- a/packages/ui/src/label.tsx
+++ b/packages/ui/src/label.tsx
@@ -8,7 +8,7 @@ import * as React from "react";
import { cn } from "./lib/utils";
const labelVariants = cva(
- "text-foreground text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
+ "text-muted-foreground text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
);
const Label = React.forwardRef<
diff --git a/packages/ui/src/page-tabs.tsx b/packages/ui/src/page-tabs.tsx
index ea8eb29de..814205d85 100644
--- a/packages/ui/src/page-tabs.tsx
+++ b/packages/ui/src/page-tabs.tsx
@@ -13,21 +13,24 @@ const TabsList = React.forwardRef<
>(({ className, ...props }, ref) => (
<TabsPrimitive.List
ref={ref}
- className={cn("-mb-px flex space-x-4 border-gray-200 border-b", className)}
+ className={cn(
+ "-mb-px flex space-x-4 border-gray-200 border-b border-b-border",
+ className,
+ )}
{...props}
/>
));
TabsList.displayName = TabsPrimitive.List.displayName;
const TabsTrigger = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.Trigger>,
+ React.ComponentRef<typeof TabsPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
>(({ className, ...props }, ref) => (
<TabsPrimitive.Trigger
ref={ref}
className={cn(
"inline-flex h-9 items-center whitespace-nowrap rounded-none border-b-2 px-1 pt-1 pb-1 font-medium text-sm ring-offset-background transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
- "data-[state=active]:border-indigo-500 data-[state=inactive]:border-transparent data-[state=active]:text-indigo-600 data-[state=inactive]:text-gray-500 data-[state=inactive]:hover:border-gray-300 data-[state=inactive]:hover:text-gray-700",
+ "data-[state=active]:border-primary data-[state=inactive]:border-transparent data-[state=active]:text-primary data-[state=inactive]:text-muted-foreground data-[state=inactive]:hover:border-accent-border data-[state=inactive]:hover:text-accent-foreground",
className,
)}
{...props}
diff --git a/packages/ui/src/progress.tsx b/packages/ui/src/progress.tsx
index eda7feab8..ee1ebfec9 100644
--- a/packages/ui/src/progress.tsx
+++ b/packages/ui/src/progress.tsx
@@ -18,7 +18,7 @@ const Progress = React.forwardRef<
{...props}
>
<ProgressPrimitive.Indicator
- className="h-full w-full flex-1 bg-linear-to-r from-purple-500 to-indigo-500 transition-all"
+ className="h-full w-full flex-1 bg-linear-to-r from-primary/50 to-primary transition-all"
style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
/>
</ProgressPrimitive.Root>
diff --git a/packages/ui/src/radio-group.tsx b/packages/ui/src/radio-group.tsx
index d242d5ad5..844860900 100644
--- a/packages/ui/src/radio-group.tsx
+++ b/packages/ui/src/radio-group.tsx
@@ -28,7 +28,7 @@ const RadioGroupItem = React.forwardRef<
<RadioGroupPrimitive.Item
ref={ref}
className={cn(
- "aspect-square size-4 rounded-full border border-border bg-background text-primary ring-offset-background focus:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+ "aspect-square size-4 rounded-full border border-input-border bg-input text-primary ring-offset-background focus:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
{...props}
diff --git a/packages/ui/src/select.tsx b/packages/ui/src/select.tsx
index 2465ac5f2..12129f000 100644
--- a/packages/ui/src/select.tsx
+++ b/packages/ui/src/select.tsx
@@ -33,11 +33,7 @@ const SelectTrigger = React.forwardRef<
>(({ className, children, ...props }, ref) => (
<SelectPrimitive.Trigger
ref={ref}
- className={cn(
- buttonVariants({ variant: "default" }),
- "bg-background",
- className,
- )}
+ className={cn(buttonVariants({ variant: "default" }), className)}
{...props}
>
{children}
@@ -53,7 +49,7 @@ const SelectContent = React.forwardRef<
<SelectPrimitive.Content
ref={ref}
className={cn(
- "relative z-50 max-h-[300px] min-w-32 animate-in overflow-hidden rounded-lg border bg-white shadow-md",
+ "relative z-50 max-h-[300px] min-w-32 animate-in overflow-hidden rounded-lg border border-popover-border bg-popover shadow-md",
position === "popper" && "translate-y-1",
className,
)}
@@ -96,7 +92,7 @@ const SelectItem = React.forwardRef<
<SelectPrimitive.Item
ref={ref}
className={cn(
- "relative flex w-full cursor-default select-none items-center rounded-md py-2 pr-2 pl-8 text-sm outline-hidden focus:bg-gray-100 data-disabled:pointer-events-none data-disabled:opacity-50",
+ "relative flex w-full cursor-default select-none items-center rounded-md py-2 pr-2 pl-8 text-sm outline-hidden focus:bg-popover-accent data-disabled:pointer-events-none data-disabled:opacity-50",
className,
)}
{...props}
diff --git a/packages/ui/src/sidebar.tsx b/packages/ui/src/sidebar.tsx
index c0fed91d2..b96be5e93 100644
--- a/packages/ui/src/sidebar.tsx
+++ b/packages/ui/src/sidebar.tsx
@@ -515,7 +515,7 @@ const sidebarMenuButtonVariants = cva(
variants: {
variant: {
primary:
- "text-primary active:text-primary data-[active=false]:hover:bg-primary-100",
+ "text-primary active:text-primary data-[active=false]:hover:bg-primary/10",
default:
"hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:text-sidebar-accent-foreground focus:bg-sidebar-accent focus:text-sidebar-accent-foreground focus-visible:text-sidebar-accent-foreground data-[active=false]:hover:bg-sidebar-accent/50",
outline:
diff --git a/packages/ui/src/switch.tsx b/packages/ui/src/switch.tsx
index 9730e583d..bfb02ea79 100644
--- a/packages/ui/src/switch.tsx
+++ b/packages/ui/src/switch.tsx
@@ -13,7 +13,7 @@ const Switch = React.forwardRef<
>(({ className, ...props }, ref) => (
<SwitchPrimitives.Root
className={cn(
- "peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-transparent p-0.5 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-green-600 data-[state=unchecked]:bg-gray-200",
+ "peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full p-0.5 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-green-600 data-[state=unchecked]:bg-muted dark:data-[state=checked]:bg-green-400",
className,
)}
{...props}
@@ -21,7 +21,7 @@ const Switch = React.forwardRef<
>
<SwitchPrimitives.Thumb
className={cn(
- "pointer-events-none flex h-full w-4 items-center justify-center rounded-full bg-white shadow-lg ring-0 transition-transform duration-100 data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0",
+ "pointer-events-none flex h-full w-4 items-center justify-center rounded-full bg-white shadow-lg ring-0 transition-transform duration-100 data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0 dark:bg-gray-700",
)}
>
{props.icon}
diff --git a/packages/ui/src/tabs.tsx b/packages/ui/src/tabs.tsx
index 4e59bba4a..add97eae4 100644
--- a/packages/ui/src/tabs.tsx
+++ b/packages/ui/src/tabs.tsx
@@ -14,7 +14,7 @@ const TabsList = React.forwardRef<
<TabsPrimitive.List
ref={ref}
className={cn(
- "inline-flex h-8 items-center justify-center rounded-lg border bg-muted text-muted-foreground",
+ "inline-flex h-8 items-center justify-center rounded-lg border border-input-border bg-muted text-input-foreground dark:bg-gray-900",
className,
)}
{...props}
@@ -29,7 +29,7 @@ const TabsTrigger = React.forwardRef<
<TabsPrimitive.Trigger
ref={ref}
className={cn(
- "inline-flex h-full items-center justify-center whitespace-nowrap rounded-lg px-3 font-medium text-sm ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:ring-1 data-[state=active]:ring-gray-200",
+ "inline-flex h-full items-center justify-center whitespace-nowrap rounded-lg px-3 font-normal text-muted-foreground text-sm ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-foreground data-[state=active]:ring-1 data-[state=active]:ring-gray-200 dark:data-[state=active]:bg-gray-800 dark:data-[state=active]:ring-gray-700",
className,
)}
{...props}
diff --git a/packages/ui/src/textarea.tsx b/packages/ui/src/textarea.tsx
index 8d5138959..82ba31224 100644
--- a/packages/ui/src/textarea.tsx
+++ b/packages/ui/src/textarea.tsx
@@ -9,7 +9,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
return (
<textarea
className={cn(
- "field-sizing-content flex min-h-16 w-full rounded-lg border border-input bg-input-background px-2 py-2 text-sm shadow-xs outline-none transition-[color,box-shadow] placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:bg-input/30 dark:aria-invalid:ring-destructive/40",
+ "field-sizing-content flex min-h-16 w-full rounded-lg border border-input-border bg-input-background px-2 py-2 text-sm shadow-xs outline-none transition-[color,box-shadow] placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:bg-input/30 dark:aria-invalid:ring-destructive/40",
)}
ref={ref}
{...props}
diff --git a/packages/ui/src/theme-provider.tsx b/packages/ui/src/theme-provider.tsx
new file mode 100644
index 000000000..8ba12cb55
--- /dev/null
+++ b/packages/ui/src/theme-provider.tsx
@@ -0,0 +1,21 @@
+"use client";
+
+import { ThemeProvider as NextThemesProvider, useTheme } from "next-themes";
+
+type ThemeProviderProps = React.ComponentProps<typeof NextThemesProvider>;
+
+function ThemeProvider({ children, ...props }: ThemeProviderProps) {
+ return (
+ <NextThemesProvider
+ attribute="class"
+ defaultTheme="system"
+ enableSystem
+ disableTransitionOnChange
+ {...props}
+ >
+ {children}
+ </NextThemesProvider>
+ );
+}
+
+export { ThemeProvider, useTheme };
diff --git a/packages/ui/src/tile.tsx b/packages/ui/src/tile.tsx
index 25767b0fb..c831622c8 100644
--- a/packages/ui/src/tile.tsx
+++ b/packages/ui/src/tile.tsx
@@ -18,7 +18,7 @@ const Tile = React.forwardRef<
<Comp
ref={ref}
className={cn(
- "relative flex flex-col justify-end rounded-xl border bg-background p-3 text-card-foreground hover:bg-gray-50 active:bg-gray-100",
+ "relative flex flex-col justify-end rounded-xl border border-card-border bg-card p-3 text-card-foreground shadow-xs hover:bg-card-accent",
className,
)}
{...props}