Skip to content

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

⬆️ Upgrade to Tailwind 4 (#2069)

Luke Vella90e15a9223c2
diff --git a/apps/landing/next.config.js b/apps/landing/next.config.ts
similarity index 89%
rename from apps/landing/next.config.js
rename to apps/landing/next.config.ts
index df68f3c91..c9e64bdd5 100644
--- a/apps/landing/next.config.js
+++ b/apps/landing/next.config.ts
@@ -1,16 +1,19 @@
-const withBundleAnalyzer = require("@next/bundle-analyzer")({
+import type { NextConfig } from "next";
+
+import createBundleAnalyzer from "@next/bundle-analyzer";
+
+const withBundleAnalyzer = createBundleAnalyzer({
enabled: process.env.ANALYZE === "true",
});
-
+
const appBaseUrl = process.env.NEXT_PUBLIC_APP_BASE_URL;
-function createAppUrl(subpath) {
+function createAppUrl(subpath: string) {
const url = new URL(subpath, appBaseUrl);
return url.href;
}
-/** @type {import('next').NextConfig} */
-const nextConfig = {
+const nextConfig: NextConfig = {
productionBrowserSourceMaps: true,
transpilePackages: [
"@rallly/ui",
@@ -68,7 +71,7 @@ const nextConfig = {
},
{
source: "/profile",
- destination: createAppUrl(),
+ destination: createAppUrl("/profile"),
permanent: true,
},
{
@@ -122,4 +125,4 @@ const nextConfig = {
// Make sure adding Sentry options is the last code to run before exporting, to
// ensure that your source maps include changes from all other Webpack plugins
-module.exports = withBundleAnalyzer(nextConfig);
+export default withBundleAnalyzer(nextConfig);
diff --git a/apps/landing/package.json b/apps/landing/package.json
index 00e3650d1..e59f37405 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -37,7 +37,8 @@
"react": "^19.1.4",
"react-dom": "^19.1.4",
"react-i18next": "^15.5.1",
- "react-use": "^17.6.0"
+ "react-use": "^17.6.0",
+ "tailwindcss": "^4.1.18"
},
"devDependencies": {
"@next/bundle-analyzer": "^15.5.9",
diff --git a/apps/landing/postcss.config.js b/apps/landing/postcss.config.js
deleted file mode 100644
index f46b31c99..000000000
--- a/apps/landing/postcss.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- plugins: ["tailwindcss", "autoprefixer"],
-};
diff --git a/apps/landing/postcss.config.mjs b/apps/landing/postcss.config.mjs
new file mode 100644
index 000000000..09853a767
--- /dev/null
+++ b/apps/landing/postcss.config.mjs
@@ -0,0 +1,3 @@
+import { postcssConfig } from "@rallly/tailwind-config/postcss";
+
+export default postcssConfig;
\ No newline at end of file
diff --git a/apps/landing/src/app/[locale]/(main)/layout.tsx b/apps/landing/src/app/[locale]/(main)/layout.tsx
index 5914363af..83d53e85b 100644
--- a/apps/landing/src/app/[locale]/(main)/layout.tsx
+++ b/apps/landing/src/app/[locale]/(main)/layout.tsx
@@ -44,7 +44,7 @@ export default async function Root(props: {
<div className="relative z-10 mx-auto flex min-h-full w-full max-w-7xl flex-col space-y-8 p-4 sm:p-8">
<header className="flex w-full items-center">
<div className="flex grow items-center gap-x-12">
- <LinkBase className="inline-block rounded" href="/">
+ <LinkBase className="inline-block rounded-sm" href="/">
<Image src="/logo.svg" width={130} height={30} alt="rallly.co" />
</LinkBase>
<nav className="hidden items-center gap-2 lg:flex">
diff --git a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
index 0873e3657..994bf73f8 100644
--- a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
@@ -151,7 +151,7 @@ export default async function Page(props: {
<PriceTables />
</section>
<section>
- <div className="flex flex-col gap-4 rounded-md border border-cyan-800/10 bg-gradient-to-b from-cyan-50 to-cyan-50/60 p-4 text-cyan-800 shadow-sm sm:flex-row sm:gap-6 sm:p-5">
+ <div className="flex flex-col gap-4 rounded-md border border-cyan-800/10 bg-linear-to-b from-cyan-50 to-cyan-50/60 p-4 text-cyan-800 shadow-xs sm:flex-row sm:gap-6 sm:p-5">
<div>
<TrendingUpIcon className="size-6" />
</div>
diff --git a/apps/landing/src/app/[locale]/globals.css b/apps/landing/src/app/[locale]/globals.css
new file mode 100644
index 000000000..09eca6d0a
--- /dev/null
+++ b/apps/landing/src/app/[locale]/globals.css
@@ -0,0 +1,8 @@
+@import "tailwindcss";
+@import "@rallly/tailwind-config";
+
+/* Any app specific overrides will go here */
+
+body {
+ @apply bg-gray-100;
+}
diff --git a/apps/landing/src/app/[locale]/layout.tsx b/apps/landing/src/app/[locale]/layout.tsx
index 6ab23f6db..d30025e5d 100644
--- a/apps/landing/src/app/[locale]/layout.tsx
+++ b/apps/landing/src/app/[locale]/layout.tsx
@@ -1,4 +1,4 @@
-import "../../style.css";
+import "./globals.css";
import languages from "@rallly/languages";
import { PostHogProvider } from "@rallly/posthog/client";
diff --git a/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx b/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx
index e658bcaf1..f776560e8 100644
--- a/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx
+++ b/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx
@@ -12,7 +12,7 @@ export default async function LicensingThankYouPage(props: {
<main className="relative flex h-dvh flex-col p-4 sm:justify-center sm:p-16">
<div className="relative z-10 mx-auto w-full max-w-2xl space-y-6">
<div className="py-4">
- <LinkBase className="inline-block rounded" href="/">
+ <LinkBase className="inline-block rounded-sm" href="/">
<Image src="/logo.svg" width={150} height={30} alt="rallly.co" />
</LinkBase>
</div>
diff --git a/apps/landing/src/components/home/bonus-item.tsx b/apps/landing/src/components/home/bonus-item.tsx
index 76bd83715..745189a55 100644
--- a/apps/landing/src/components/home/bonus-item.tsx
+++ b/apps/landing/src/components/home/bonus-item.tsx
@@ -24,7 +24,7 @@ export const BonusItem = ({
viewport={{ once: true, amount: "all" }}
className="flex justify-center"
>
- <div className="flex items-center justify-center gap-x-2.5 rounded-full border bg-gray-50 p-1 pr-6 shadow-sm">
+ <div className="flex items-center justify-center gap-x-2.5 rounded-full border bg-gray-50 p-1 pr-6 shadow-xs">
<span
className={cn("rounded-full bg-primary p-2 text-gray-50", className)}
>
diff --git a/apps/landing/src/style.css b/apps/landing/src/style.css
deleted file mode 100644
index fa62247a9..000000000
--- a/apps/landing/src/style.css
+++ /dev/null
@@ -1,204 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
- * {
- @apply border-border;
- }
- body {
- @apply text-foreground h-full overflow-y-auto bg-gray-100 font-sans;
- }
- html {
- @apply h-full font-sans text-base;
- }
- body #__next {
- @apply min-h-screen;
- }
- h1,
- h2,
- h3,
- h4,
- h5 {
- @apply font-sans font-semibold;
- }
- h1 {
- @apply text-2xl;
- }
- h2 {
- @apply text-xl;
- }
-
- label {
- @apply block text-sm;
- }
-
- a,
- button,
- input,
- select,
- textarea {
- @apply rounded outline-none focus-visible:border-transparent focus-visible:ring-2 focus-visible:ring-gray-300;
- }
-}
-
-@layer components {
- .blog-content {
- h2,
- h3,
- h4 {
- @apply mb-4 mt-12;
- }
- h2 {
- @apply text-2xl font-bold;
- }
- h3 {
- @apply text-xl font-semibold;
- }
- h4 {
- @apply text-lg font-semibold;
- }
- p {
- @apply mb-6 leading-relaxed;
- }
- p:has(> img) {
- @apply flex items-center justify-center overflow-hidden rounded-xl border bg-gray-50 p-2;
- }
- img {
- @apply mx-auto rounded-lg border;
- }
- ul,
- ol {
- @apply mb-6 ml-6;
- }
- ul {
- @apply list-disc;
- }
- ol {
- @apply list-decimal;
- }
- li {
- @apply mb-2;
- }
- hr {
- @apply my-12;
- }
- a {
- @apply text-primary-600 hover:underline;
- }
- blockquote {
- @apply my-6 border-l-4 border-gray-300 pl-4 italic text-gray-700;
- }
- pre {
- @apply my-6 overflow-x-auto rounded-lg bg-gray-100 p-4;
- }
- code {
- @apply rounded bg-gray-100 px-1 py-0.5 text-sm;
- }
- }
-
- .text-link {
- @apply text-primary-600 hover:text-primary-600 focus-visible:ring-primary-600 rounded-md font-medium outline-none hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-1;
- }
- .formField {
- @apply mb-4;
- }
- .input {
- @apply appearance-none border px-2 text-gray-800 placeholder:text-gray-500;
- }
- input.input {
- @apply h-9;
- }
- .input-lg {
- @apply input px-3 py-3;
- }
- .input-error {
- @apply focus:ring-rose-500;
- }
- .checkbox {
- @apply text-primary-600 focus:ring-primary-600 size-4 rounded border-gray-300 shadow-sm;
- }
- .btn {
- @apply inline-flex h-9 select-none items-center justify-center gap-x-1.5 whitespace-nowrap rounded-md border px-2.5 text-sm font-medium;
- }
- a.btn {
- @apply cursor-pointer hover:no-underline;
- }
-
- .btn-default {
- @apply btn bg-white/50 text-gray-700 hover:bg-gray-50 hover:shadow-sm active:bg-gray-200 active:shadow-none;
- }
- .btn-danger {
- text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;
- @apply btn border-rose-700 bg-rose-600 text-white shadow-sm ring-1 ring-inset ring-white/10 hover:bg-rose-500 active:bg-rose-700;
- }
- .btn-link {
- @apply text-primary-600 inline-flex items-center underline;
- }
- .btn.btn-disabled {
- text-shadow: none;
- @apply pointer-events-none border-gray-200 bg-gray-500/5 text-gray-400 shadow-none;
- }
- .btn-primary {
- text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;
- @apply btn border-gray-900 bg-gray-800 text-white shadow-sm ring-1 ring-inset ring-white/10 hover:bg-gray-700 active:bg-gray-900;
- }
-
- a.btn-primary {
- @apply text-white;
- }
-
- .segment-button {
- @apply flex h-9 text-center;
- }
-
- .segment-button button {
- @apply inline-flex grow items-center justify-center border-b border-r border-t bg-gray-50 px-4 transition-colors first:rounded-r-none first:border-l last:rounded-l-none hover:bg-gray-50 focus:z-10 active:bg-gray-100;
- }
-
- .segment-button .segment-button-active {
- @apply pointer-events-none bg-white text-gray-800;
- }
-
- .menu {
- @apply relative;
- }
-
- .menu-items {
- @apply absolute z-30 mt-1 overflow-hidden rounded border bg-white shadow-md focus:outline-none;
- }
-
- .menu-item {
- @apply block w-full select-none truncate px-4 py-2 text-left;
- }
-
- button[disabled] {
- @apply cursor-not-allowed;
- }
-
- .card {
- @apply border-y bg-white p-4 shadow-sm md:rounded-lg md:border;
- }
-}
-
-@layer components {
- .heading {
- @apply text-primary-600 mb-2 text-center text-lg sm:mb-4 sm:text-xl;
- }
- .subheading {
- @apply mb-8 text-center text-2xl font-bold text-gray-800 sm:mb-16 sm:text-4xl;
- }
- .heading-sm {
- @apply mb-4 text-xl font-bold text-gray-800;
- }
- .text {
- @apply leading-relaxed text-gray-500 sm:text-lg;
- }
-}
-
-@layer utilities {
- .bg-pattern {
- background-color: #f9fafb;
- background-image: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23f3f4f6' fill-opacity='0.75' fill-rule='evenodd'%3E%3Ccircle cx='3' cy='3' r='3'/%3E%3Ccircle cx='13' cy='13' r='3'/%3E%3C/g%3E%3C/svg%3E");
- }
-}
diff --git a/apps/landing/tailwind.config.js b/apps/landing/tailwind.config.js
deleted file mode 100644
index 7aafe5288..000000000
--- a/apps/landing/tailwind.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const sharedConfig = require("@rallly/tailwind-config/tailwind.config");
-
-module.exports = sharedConfig;
diff --git a/apps/web/next.config.js b/apps/web/next.config.ts
similarity index 93%
rename from apps/web/next.config.js
rename to apps/web/next.config.ts
index 438152b53..b9f032156 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.ts
@@ -2,14 +2,15 @@
// with Sentry.
// https://nextjs.org/docs/api-reference/next.config.js/introduction
// https://docs.sentry.io/platforms/javascript/guides/nextjs/
+import type { NextConfig } from "next";
+import { withSentryConfig } from "@sentry/nextjs";
+import createBundleAnalyzer from "@next/bundle-analyzer";
-const { withSentryConfig } = require("@sentry/nextjs");
-const withBundleAnalyzer = require("@next/bundle-analyzer")({
+const withBundleAnalyzer = createBundleAnalyzer({
enabled: process.env.ANALYZE === "true",
});
-/** @type {import('next').NextConfig} */
-const nextConfig = {
+const nextConfig: NextConfig = {
output:
process.env.NEXT_PUBLIC_SELF_HOSTED === "true" ? "standalone" : undefined,
productionBrowserSourceMaps: true,
@@ -118,7 +119,7 @@ const withBundleAnalyzerConfig = withBundleAnalyzer(nextConfig);
// Make sure adding Sentry options is the last code to run before exporting, to
// ensure that your source maps include changes from all other Webpack plugins
-module.exports =
+export default
process.env.NEXT_PUBLIC_SELF_HOSTED === "true"
? withBundleAnalyzerConfig
: withSentryConfig(withBundleAnalyzerConfig, sentryWebpackPluginOptions);
diff --git a/apps/web/package.json b/apps/web/package.json
index 3efe85eb7..84f0d82c2 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -27,7 +27,7 @@
"@hono-rate-limiter/redis": "^0.1.4",
"@hono/zod-validator": "^0.7.2",
"@hookform/resolvers": "^5.2.2",
- "@next/env": "^15.3.1",
+ "@next/env": "^15.4.8",
"@prisma/client": "^6.8.2",
"@radix-ui/react-radio-group": "^1.2.3",
"@radix-ui/react-select": "^2.2.2",
@@ -44,6 +44,7 @@
"@sentry/nextjs": "^9.14.0",
"@svgr/webpack": "^8.1.0",
"@t3-oss/env-nextjs": "^0.13.8",
+ "@tailwindcss/postcss": "^4.1.18",
"@tanstack/react-query": "^5.90.12",
"@tanstack/react-query-devtools": "^5.91.1",
"@tanstack/react-table": "^8.9.1",
@@ -57,7 +58,6 @@
"@vercel/kv": "^3.0.0",
"ai": "^5.0.41",
"arctic": "^3.7.0",
- "autoprefixer": "^10.4.13",
"better-auth": "^1.4.7",
"calendar-link": "^2.6.0",
"class-variance-authority": "^0.7.1",
@@ -86,7 +86,7 @@
"next-runtime-env": "^3.3.0",
"next-safe-action": "^8.0.7",
"php-serialize": "^4.1.1",
- "postcss": "^8.4.31",
+ "postcss": "^8.5.6",
"react": "^19.1.4",
"react-big-calendar": "^1.8.1",
"react-dom": "^19.1.4",
@@ -98,7 +98,7 @@
"smoothscroll-polyfill": "^0.4.4",
"spacetime": "^7.4.7",
"superjson": "^2.0.0",
- "tailwindcss": "^3.4.17",
+ "tailwindcss": "^4.1.18",
"timezone-soft": "^1.5.1",
"zod": "^4.2.1",
"zxcvbn": "^4.4.2"
diff --git a/apps/web/postcss.config.js b/apps/web/postcss.config.js
deleted file mode 100644
index 12a703d90..000000000
--- a/apps/web/postcss.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
- plugins: {
- tailwindcss: {},
- autoprefixer: {},
- },
-};
diff --git a/apps/web/postcss.config.mjs b/apps/web/postcss.config.mjs
new file mode 100644
index 000000000..09853a767
--- /dev/null
+++ b/apps/web/postcss.config.mjs
@@ -0,0 +1,3 @@
+import { postcssConfig } from "@rallly/tailwind-config/postcss";
+
+export default postcssConfig;
\ No newline at end of file
diff --git a/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx b/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx
index 6a11979a6..0523fc136 100644
--- a/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx
@@ -97,7 +97,6 @@ export function ForgotPasswordForm() {
disabled={formState.isSubmitting}
autoFocus={true}
placeholder={t("emailPlaceholder")}
- error={!!formState.errors.email}
/>
</FormControl>
<FormMessage />
diff --git a/apps/web/src/app/[locale]/(auth)/layout.tsx b/apps/web/src/app/[locale]/(auth)/layout.tsx
index 940d6702d..00b2f3103 100644
--- a/apps/web/src/app/[locale]/(auth)/layout.tsx
+++ b/apps/web/src/app/[locale]/(auth)/layout.tsx
@@ -34,7 +34,7 @@ export default async function Layout({
cx={10}
cy={10}
className={cn(
- "[mask-image:radial-gradient(400px_circle_at_top,white,transparent)]",
+ "mask-[radial-gradient(400px_circle_at_top,white,transparent)]",
)}
/>
</div>
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
index 8acf15a89..c88811643 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
@@ -154,7 +154,6 @@ export function LoginWithEmailForm() {
disabled={formState.isSubmitting}
autoFocus={true}
placeholder={t("emailPlaceholder")}
- error={!!formState.errors.identifier}
/>
</FormControl>
<FormMessage />
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 cbaae5654..3377144ea 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
@@ -98,7 +98,6 @@ export function ResetPasswordForm() {
disabled={formState.isSubmitting}
autoFocus={true}
placeholder="••••••••"
- error={!!formState.errors.password}
/>
</FormControl>
<PasswordStrengthMeter
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 876153853..640822e9b 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
@@ -54,7 +54,7 @@ export function NavUser({
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent
- className="w-[var(--radix-dropdown-menu-trigger-width)]"
+ className="w-(--radix-dropdown-menu-trigger-width)"
align="end"
side="top"
>
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
index e3dc04dd2..60c9804cb 100644
--- 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
@@ -8,7 +8,7 @@ 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-sm">
+ <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">
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 982158364..64ea8b7a5 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
@@ -105,7 +105,6 @@ function DeleteSpaceDialog({
<Input
autoComplete="off"
data-1p-ignore
- error={!!form.formState.errors.spaceName}
placeholder={spaceName}
{...field}
/>
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/components/leave-space-button.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/leave-space-button.tsx
index 4435354fe..b43f4811f 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/components/leave-space-button.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/components/leave-space-button.tsx
@@ -112,7 +112,6 @@ function LeaveSpaceDialog({
<Input
autoComplete="off"
data-1p-ignore
- error={!!form.formState.errors.spaceName}
placeholder={spaceName}
{...field}
/>
diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
index 15c3d5379..3015912a7 100644
--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
@@ -72,7 +72,7 @@ export default async function Layout({
</Sidebar>
<SidebarInset>
<div className="flex flex-1 flex-col">
- <header className="sticky top-0 z-10 border-b bg-background/90 p-3 backdrop-blur-sm md:hidden">
+ <header className="sticky top-0 z-10 border-b bg-background/90 p-3 backdrop-blur-xs md:hidden">
<div className="flex items-center gap-4">
<SidebarTrigger />
<div className="flex items-center gap-2">
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 956e89eca..24f623a1b 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
@@ -1,6 +1,12 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { Button } from "@rallly/ui/button";
-import { Form, FormField, FormItem, FormLabel } from "@rallly/ui/form";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+} from "@rallly/ui/form";
import {
Select,
SelectContent,
@@ -60,6 +66,7 @@ const DateTimePreferencesForm = () => {
<Trans i18nKey="timeZone" />
</FormLabel>
<TimeZoneSelect
+ className="w-fit"
value={field.value}
onValueChange={field.onChange}
/>
@@ -76,10 +83,12 @@ const DateTimePreferencesForm = () => {
<FormLabel>
<Trans i18nKey="timeFormat" />
</FormLabel>
- <TimeFormatPicker
- value={field.value}
- onChange={field.onChange}
- />
+ <FormControl>
+ <TimeFormatPicker
+ value={field.value}
+ onChange={field.onChange}
+ />
+ </FormControl>
</FormItem>
);
}}
@@ -99,7 +108,7 @@ const DateTimePreferencesForm = () => {
field.onChange(Number.parseInt(value));
}}
>
- <SelectTrigger>
+ <SelectTrigger className="w-fit">
<SelectValue />
</SelectTrigger>
<SelectContent>
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 bb2e83a9a..b50bff392 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
@@ -1,6 +1,12 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { Button } from "@rallly/ui/button";
-import { Form, FormField, FormItem, FormLabel } from "@rallly/ui/form";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+} from "@rallly/ui/form";
import { ArrowUpRight } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
@@ -45,7 +51,13 @@ export const LanguagePreference = () => {
<FormLabel>
<Trans i18nKey="common_language" />
</FormLabel>
- <LanguageSelect value={field.value} onChange={field.onChange} />
+ <FormControl>
+ <LanguageSelect
+ className="w-fit"
+ value={field.value}
+ onChange={field.onChange}
+ />
+ </FormControl>
</FormItem>
)}
/>
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
index 30c843af3..5e8ad6fc3 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
@@ -86,7 +86,6 @@ export function DeleteAccountDialog({
<Input
autoComplete="off"
data-1p-ignore
- error={!!form.formState.errors.email}
placeholder={email}
{...field}
/>
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx b/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx
index 7bb628bcc..dabfb39e0 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx
@@ -112,7 +112,6 @@ export function ChangePasswordForm() {
{...field}
disabled={formState.isSubmitting}
placeholder="••••••••"
- error={!!formState.errors.currentPassword}
/>
</FormControl>
<FormMessage />
@@ -133,7 +132,6 @@ export function ChangePasswordForm() {
{...field}
disabled={formState.isSubmitting}
placeholder="••••••••"
- error={!!formState.errors.newPassword}
/>
</FormControl>
<PasswordStrengthMeter
diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx
index ad180200b..a3447ff4c 100644
--- a/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx
@@ -99,7 +99,6 @@ export function LeaveSpaceDialog({
<Input
autoComplete="off"
data-1p-ignore
- error={!!form.formState.errors.spaceName}
placeholder={spaceName}
{...field}
/>
diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
index 596505c3d..d941e12f9 100644
--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
@@ -47,7 +47,7 @@ export default async function JoinPage({
return (
<div className="flex h-dvh flex-col items-center gap-12 py-12">
<FullLogoLink />
- <div className="flex w-full max-w-sm flex-col rounded-xl border bg-white p-12 text-center shadow-sm">
+ <div className="flex w-full max-w-sm flex-col rounded-xl border bg-white p-12 text-center shadow-xs">
<div className="mx-auto mb-4">
<SpaceIcon
src={invite.space.image ?? undefined}
diff --git a/apps/web/src/app/[locale]/globals.css b/apps/web/src/app/[locale]/globals.css
new file mode 100644
index 000000000..c6fa7dc55
--- /dev/null
+++ b/apps/web/src/app/[locale]/globals.css
@@ -0,0 +1,4 @@
+@import "tailwindcss";
+@import "@rallly/tailwind-config";
+
+/* Any app specific overrides will go here */
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index a385ed69c..767e0f09e 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -1,4 +1,4 @@
-import "../../style.css";
+import "./globals.css";
import { PostHogIdentify, PostHogProvider } from "@rallly/posthog/client";
import { Toaster } from "@rallly/ui/sonner";
diff --git a/apps/web/src/app/components/page-layout.tsx b/apps/web/src/app/components/page-layout.tsx
index db80ef526..acbbfa37c 100644
--- a/apps/web/src/app/components/page-layout.tsx
+++ b/apps/web/src/app/components/page-layout.tsx
@@ -69,7 +69,7 @@ export function PageHeaderActions({
className?: string;
}) {
return (
- <div className={cn("flex items-center gap-2 sm:flex-shrink-0", className)}>
+ <div className={cn("flex items-center gap-2 sm:shrink-0", className)}>
{children}
</div>
);
diff --git a/apps/web/src/components/cookie-consent.tsx b/apps/web/src/components/cookie-consent.tsx
index 5f2d1006e..2582f98b1 100644
--- a/apps/web/src/components/cookie-consent.tsx
+++ b/apps/web/src/components/cookie-consent.tsx
@@ -53,7 +53,7 @@ const CookieConsentPopover = () => {
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-sm transition-all hover:bg-primary-600/90 focus:ring-2 focus:ring-primary-200 active:bg-primary-600/90"
+ 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>
diff --git a/apps/web/src/components/description-list.tsx b/apps/web/src/components/description-list.tsx
deleted file mode 100644
index 61cf29528..000000000
--- a/apps/web/src/components/description-list.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { cn } from "@rallly/ui";
-
-export function DescriptionList({
- className,
- ...props
-}: React.ComponentPropsWithoutRef<"dl">) {
- return (
- <dl
- {...props}
- className={cn(
- className,
- "grid grid-cols-1 text-sm/6 sm:grid-cols-[min(50%,320px)_auto]",
- )}
- />
- );
-}
-
-export function DescriptionTerm({
- className,
- ...props
-}: React.ComponentPropsWithoutRef<"dt">) {
- return (
- <dt
- {...props}
- className={cn(
- className,
- "col-start-1 border-gray-800/5 border-t pt-3 text-gray-500 first:border-none sm:border-gray-800/5 sm:border-t sm:py-3 dark:border-white/5 dark:text-gray-400 sm:dark:border-white/5",
- )}
- />
- );
-}
-
-export function DescriptionDetails({
- className,
- ...props
-}: React.ComponentPropsWithoutRef<"dd">) {
- return (
- <dd
- {...props}
- className={cn(
- className,
- "pt-1 pb-3 text-gray-800 sm:border-gray-800/5 sm:border-t sm:py-3 dark:text-white dark:sm:border-white/5 sm:[&:nth-child(2)]:border-none",
- )}
- />
- );
-}
diff --git a/apps/web/src/components/discussion/discussion.tsx b/apps/web/src/components/discussion/discussion.tsx
index d25a8ec45..028907af9 100644
--- a/apps/web/src/components/discussion/discussion.tsx
+++ b/apps/web/src/components/discussion/discussion.tsx
@@ -117,7 +117,7 @@ function NewCommentForm({
placeholder={t("yourName")}
className="lg:w-48"
data-1p-ignore="true"
- error={!!formState.errors.authorName}
+ aria-invalid={!!formState.errors.authorName}
{...field}
/>
)}
@@ -256,7 +256,7 @@ function DiscussionInner() {
) : (
<button
type="button"
- className="flex w-full rounded border border-input bg-transparent px-2 py-2 text-left text-muted-foreground text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-1"
+ 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"
onClick={() => setIsWriting(true)}
>
<Trans
diff --git a/apps/web/src/components/empty-state.tsx b/apps/web/src/components/empty-state.tsx
index c361dd57b..af55722e2 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-gradient-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">
<Icon size="xl" className="opacity-50">
{children}
</Icon>
diff --git a/apps/web/src/components/forms/poll-details-form.tsx b/apps/web/src/components/forms/poll-details-form.tsx
index a851c2450..0aa847b85 100644
--- a/apps/web/src/components/forms/poll-details-form.tsx
+++ b/apps/web/src/components/forms/poll-details-form.tsx
@@ -39,7 +39,6 @@ export const PollDetailsForm = () => {
<Input
{...field}
type="text"
- error={!!errors.title}
id="title"
className="w-full"
placeholder={t("titlePlaceholder")}
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 82d10cea1..173e0172f 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
@@ -122,7 +122,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
);
})}
</div>
- <div className="grid grow grid-cols-7 rounded-md border bg-white shadow-sm">
+ <div className="grid grow grid-cols-7 rounded-md border bg-white shadow-xs">
{datepicker.days.map((day, i) => {
return (
<div
@@ -174,7 +174,7 @@ 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",
+ "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,
"text-rose-600": day.today && !day.selected,
@@ -187,9 +187,9 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
<span
aria-hidden
className={cn(
- "-z-0 absolute inset-1 rounded-md border",
+ "absolute inset-1 z-0 rounded-md border",
day.selected
- ? "border-primary-300 border-dashed shadow-sm group-hover:border-primary-400"
+ ? "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",
)}
/>
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 eee9cf579..1ad252c20 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,73 +1,74 @@
.rbc-time-view {
- @apply border-0 border-b border-t border-gray-100;
+ border: 0;
+ border-bottom: 1px solid var(--color-gray-100);
+ border-top: 1px solid var(--color-gray-100);
}
.rbc-today {
- @apply bg-gray-50 bg-opacity-50;
+ background-color: color-mix(in srgb, var(--color-gray-50) 50%, transparent);
}
.rbc-time-content > * + * > * {
- @apply border-gray-200;
+ border-color: var(--color-gray-200);
}
.rbc-time-header.rbc-overflowing,
.rbc-time-header-content,
.rbc-header {
- @apply border-gray-100;
+ border-color: var(--color-gray-100);
}
.rbc-time-content {
- @apply border-t-0;
+ border-top: 0;
}
.rbc-time-view .rbc-allday-cell {
- @apply hidden;
+ display: none;
}
.rbc-current-time-indicator {
- @apply bg-rose-400;
+ background-color: var(--color-rose-400);
}
.rbc-header + .rbc-header {
- @apply border-l-0;
+ border-left: 0;
}
.rbc-time-slot {
- @apply pl-2 pt-1;
+ padding-left: 0.5rem;
+ padding-top: 0.25rem;
}
.rbc-timeslot-group {
- @apply border-gray-100;
+ border-color: var(--color-gray-100);
}
.rbc-day-slot .rbc-time-slot {
- @apply border-gray-100;
-}
-
-.rbc-day-slot .rbc-time-slot {
- @apply border-dashed border-gray-50;
+ border-style: dashed;
+ border-color: var(--color-gray-50);
}
.rbc-day-slot .rbc-events-container {
- @apply mr-2;
+ margin-right: 0.5rem;
}
.rbc-slot-selection {
- @apply bg-gray-100/50 leading-tight text-gray-600;
+ background-color: color-mix(in srgb, var(--color-gray-100) 50%, transparent);
+ line-height: 1.25;
+ color: var(--color-gray-600);
}
.rbc-header.rbc-today {
- @apply bg-white text-rose-600;
+ background-color: var(--color-background);
+ color: var(--color-rose-600);
}
.rbc-button-link {
- @apply pointer-events-none m-1 w-full;
-}
-
-.rbc-time-content > * + * > * {
- @apply border-gray-100;
+ pointer-events: none;
+ margin: 0.25rem;
+ width: 100%;
}
.rbc-time-header-gutter {
- @apply border-b border-gray-100;
+ border-bottom: 1px solid var(--color-gray-100);
}
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 bc17896ce..bd6680f81 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-sm 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-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"
style={{
top: `calc(${props.style?.top}% + 4px)`,
height: `calc(${props.style?.height}% - 8px)`,
diff --git a/apps/web/src/components/full-width-layout.tsx b/apps/web/src/components/full-width-layout.tsx
index 09d7a382b..53f4a0e20 100644
--- a/apps/web/src/components/full-width-layout.tsx
+++ b/apps/web/src/components/full-width-layout.tsx
@@ -10,7 +10,7 @@ export function FullWidthLayoutHeader({
children: React.ReactNode;
}) {
return (
- <header className="sticky top-0 z-10 rounded-t-lg border-b bg-background/90 px-3 py-4 backdrop-blur-sm md:px-6">
+ <header className="sticky top-0 z-10 rounded-t-lg border-b bg-background/90 px-3 py-4 backdrop-blur-xs md:px-6">
<div className="flex items-center gap-4">
<div className="md:hidden">
<SidebarTrigger />
diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsx
index dee409413..1d796eaad 100644
--- a/apps/web/src/components/layouts/poll-layout.tsx
+++ b/apps/web/src/components/layouts/poll-layout.tsx
@@ -28,7 +28,7 @@ const Layout = ({ children }: React.PropsWithChildren) => {
const pollLink = `/poll/${poll.id}`;
const pathname = usePathname();
return (
- <div className="absolute inset-0 overflow-auto bg-gray-100">
+ <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="mx-auto flex max-w-4xl justify-between">
<div className="flex min-w-0 items-center gap-x-2.5">
diff --git a/apps/web/src/components/maintenance.tsx b/apps/web/src/components/maintenance.tsx
index 4a55fd242..4e03d66f3 100644
--- a/apps/web/src/components/maintenance.tsx
+++ b/apps/web/src/components/maintenance.tsx
@@ -6,7 +6,7 @@ const Maintenance: React.FunctionComponent = () => {
<Head>
<title>Down for maintenance - Be right back</title>
</Head>
- <div className="w-96 rounded-lg border bg-white p-8 text-center shadow-sm">
+ <div className="w-96 rounded-lg border bg-white p-8 text-center shadow-xs">
<div className="">
The site is currently down for some maintenance and will be back
shortly…
diff --git a/apps/web/src/components/modal/modal.tsx b/apps/web/src/components/modal/modal.tsx
index 1d423651d..9d4a0f175 100644
--- a/apps/web/src/components/modal/modal.tsx
+++ b/apps/web/src/components/modal/modal.tsx
@@ -47,7 +47,7 @@ const Modal: React.FunctionComponent<ModalProps> = ({
</DialogHeader>
<p className="text-sm">{content}</p>
<DialogFooter>
- <DialogClose>
+ <DialogClose asChild>
<Button>{cancelText}</Button>
</DialogClose>
<Button
diff --git a/apps/web/src/components/new-participant-modal.tsx b/apps/web/src/components/new-participant-modal.tsx
index 67d06f56e..f006e798a 100644
--- a/apps/web/src/components/new-participant-modal.tsx
+++ b/apps/web/src/components/new-participant-modal.tsx
@@ -3,13 +3,19 @@ import type { VoteType } from "@rallly/database";
import { cn } from "@rallly/ui";
import { Badge } from "@rallly/ui/badge";
import { Button } from "@rallly/ui/button";
-import { FormMessage } from "@rallly/ui/form";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@rallly/ui/form";
import { Input } from "@rallly/ui/input";
-import * as Sentry from "@sentry/nextjs";
+import { Label } from "@rallly/ui/label";
import { TRPCClientError } from "@trpc/client";
import { useForm } from "react-hook-form";
import z from "zod";
-
import { usePoll } from "@/contexts/poll";
import { useTranslation } from "@/i18n/client";
import { useTimezone } from "@/lib/timezone/client/context";
@@ -59,7 +65,10 @@ const VoteSummary = ({
return (
<div
- className={cn("flex flex-wrap gap-1.5 rounded border p-1.5", className)}
+ className={cn(
+ "flex flex-wrap gap-1.5 rounded-lg border p-1.5",
+ className,
+ )}
>
{voteTypes.map((voteType) => {
const votes = voteByType[voteType];
@@ -92,100 +101,107 @@ export const NewParticipantForm = (props: NewParticipantModalProps) => {
const { timezone } = useTimezone();
const { user, createGuestIfNeeded } = useUser();
const isLoggedIn = user && !user.isGuest;
- const { register, setError, formState, handleSubmit } =
- useForm<NewParticipantFormData>({
- resolver: zodResolver(schema),
- defaultValues: {
- requireEmail: isEmailRequired,
- ...(isLoggedIn
- ? { name: user.name, email: user.email ?? "" }
- : {
- name: "",
- email: "",
- }),
- },
- });
+ const form = useForm<NewParticipantFormData>({
+ resolver: zodResolver(schema),
+ defaultValues: {
+ requireEmail: isEmailRequired,
+ ...(isLoggedIn
+ ? { name: user.name, email: user.email ?? "" }
+ : {
+ name: "",
+ email: "",
+ }),
+ },
+ });
+
+ const { setError, formState, handleSubmit } = form;
const addParticipant = useAddParticipantMutation();
return (
- <form
- onSubmit={handleSubmit(async (data) => {
- try {
- await createGuestIfNeeded();
- const newParticipant = await addParticipant.mutateAsync({
- name: data.name,
- votes: props.votes,
- email: data.email,
- pollId: poll.id,
- timeZone: timezone,
- });
- props.onSubmit?.(newParticipant);
- } catch (error) {
- if (error instanceof TRPCClientError) {
- setError("root", {
- message: error.message,
+ <Form {...form}>
+ <form
+ onSubmit={handleSubmit(async (data) => {
+ try {
+ await createGuestIfNeeded();
+ const newParticipant = await addParticipant.mutateAsync({
+ name: data.name,
+ votes: props.votes,
+ email: data.email,
+ pollId: poll.id,
+ timeZone: timezone,
});
+ props.onSubmit?.(newParticipant);
+ } catch (error) {
+ if (error instanceof TRPCClientError) {
+ setError("root", {
+ message: error.message,
+ });
+ }
}
- Sentry.captureException(error);
- }
- })}
- className="space-y-4"
- >
- <fieldset>
- <label htmlFor="name" className="mb-1 text-gray-500">
- {t("name")}
- </label>
- <Input
- className="w-full"
- data-1p-ignore="true"
- autoFocus={true}
- error={!!formState.errors.name}
- disabled={formState.isSubmitting}
- placeholder={t("namePlaceholder")}
- {...register("name")}
+ })}
+ className="space-y-4"
+ >
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>{t("name")}</FormLabel>
+ <FormControl>
+ <Input
+ className="w-full"
+ data-1p-ignore="true"
+ autoFocus={true}
+ disabled={formState.isSubmitting}
+ placeholder={t("namePlaceholder")}
+ {...field}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
/>
- {formState.errors.name?.message ? (
- <div className="mt-2 text-rose-500 text-sm">
- {formState.errors.name.message}
- </div>
- ) : null}
- </fieldset>
- <fieldset>
- <label htmlFor="email" className="mb-1 text-gray-500">
- {t("email")}
- {!isEmailRequired ? ` (${t("optional")})` : null}
- </label>
- <Input
- className="w-full"
- error={!!formState.errors.email}
- disabled={formState.isSubmitting}
- placeholder={t("emailPlaceholder")}
- {...register("email")}
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>
+ {t("email")}
+ {!isEmailRequired ? ` (${t("optional")})` : null}
+ </FormLabel>
+ <FormControl>
+ <Input
+ className="w-full"
+ disabled={formState.isSubmitting}
+ placeholder={t("emailPlaceholder")}
+ {...field}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
/>
- {formState.errors.email?.message ? (
- <div className="mt-1 text-rose-500 text-sm">
- {formState.errors.email.message}
- </div>
+
+ <div className="flex flex-col gap-1.5">
+ <Label>{t("response")}</Label>
+ <VoteSummary votes={props.votes} />
+ </div>
+
+ {formState.errors.root?.message ? (
+ <FormMessage>{formState.errors.root.message}</FormMessage>
) : null}
- </fieldset>
- <fieldset>
- {/* biome-ignore lint/a11y/noLabelWithoutControl: Fix this later */}
- <label className="mb-1 text-gray-500">{t("response")}</label>
- <VoteSummary votes={props.votes} />
- </fieldset>
- {formState.errors.root?.message ? (
- <FormMessage>{formState.errors.root.message}</FormMessage>
- ) : null}
- <div className="flex gap-2">
- <Button onClick={props.onCancel}>{t("cancel")}</Button>
- <Button
- type="submit"
- variant="primary"
- loading={formState.isSubmitting}
- >
- {t("submit")}
- </Button>
- </div>
- </form>
+ <div className="mt-6 flex gap-2">
+ <Button onClick={props.onCancel}>{t("cancel")}</Button>
+ <Button
+ type="submit"
+ variant="primary"
+ loading={formState.isSubmitting}
+ >
+ {t("submit")}
+ </Button>
+ </div>
+ </form>
+ </Form>
);
};
diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsx
index 7395fbae3..a379817c6 100644
--- a/apps/web/src/components/poll/desktop-poll.tsx
+++ b/apps/web/src/components/poll/desktop-poll.tsx
@@ -297,7 +297,7 @@ const DesktopPoll: React.FunctionComponent = () => {
<div
aria-hidden="true"
className={cn(
- "pointer-events-none absolute top-0 bottom-0 left-[235px] z-30 w-4 border-l bg-gradient-to-r from-gray-800/5 via-transparent to-transparent transition-opacity",
+ "pointer-events-none absolute top-0 bottom-0 left-[235px] z-30 w-4 border-l bg-linear-to-r from-gray-800/5 via-transparent to-transparent transition-opacity",
x > 0 ? "opacity-100" : "opacity-0",
)}
/>
@@ -310,7 +310,7 @@ const DesktopPoll: React.FunctionComponent = () => {
}}
ref={scrollRef}
className={cn(
- "scrollbar-thin hover:scrollbar-thumb-gray-400 scrollbar-thumb-gray-300 scrollbar-track-gray-100 relative z-10 flex-grow overflow-auto scroll-smooth",
+ "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">
diff --git a/apps/web/src/components/poll/scheduled-event.tsx b/apps/web/src/components/poll/scheduled-event.tsx
index 844c24425..622d3d442 100644
--- a/apps/web/src/components/poll/scheduled-event.tsx
+++ b/apps/web/src/components/poll/scheduled-event.tsx
@@ -70,7 +70,7 @@ export function ScheduledEvent() {
return (
<>
- <div className="rounded-lg border bg-white p-0.5 shadow-sm">
+ <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">
<CalendarIcon className="size-4" />
<h2 className="font-medium text-sm">
diff --git a/apps/web/src/components/skeleton.tsx b/apps/web/src/components/skeleton.tsx
index 79d77da28..21ee8d3e6 100644
--- a/apps/web/src/components/skeleton.tsx
+++ b/apps/web/src/components/skeleton.tsx
@@ -22,7 +22,7 @@ export function SkeletonCard({
className?: string;
}) {
return (
- <div className={cn("rounded-md bg-white shadow-sm", className)}>
+ <div className={cn("rounded-md bg-white shadow-xs", className)}>
{children}
</div>
);
diff --git a/apps/web/src/components/time-format-picker.tsx b/apps/web/src/components/time-format-picker.tsx
index c0aac162d..583e39833 100644
--- a/apps/web/src/components/time-format-picker.tsx
+++ b/apps/web/src/components/time-format-picker.tsx
@@ -20,14 +20,14 @@ const TimeFormatPicker = ({
{/* biome-ignore lint/a11y/noLabelWithoutControl: Fix this later */}
<label className="flex items-center gap-x-2">
<RadioGroupItem value="hours12" />
- <span>
+ <span className="text-sm">
<Trans i18nKey="12h" />
</span>
</label>
{/* biome-ignore lint/a11y/noLabelWithoutControl: Fix this later */}
<label className="flex items-center gap-x-2">
<RadioGroupItem value="hours24" />
- <span>
+ <span className="text-sm">
<Trans i18nKey="24h" />
</span>
</label>
diff --git a/apps/web/src/components/time-zone-picker/time-zone-select.tsx b/apps/web/src/components/time-zone-picker/time-zone-select.tsx
index d651ed27e..76bb8c195 100644
--- a/apps/web/src/components/time-zone-picker/time-zone-select.tsx
+++ b/apps/web/src/components/time-zone-picker/time-zone-select.tsx
@@ -37,7 +37,7 @@ export const TimeZoneCommand = ({ onSelect, value }: TimeZoneCommandProps) => {
defaultValue: "Search…",
})}
/>
- <CommandList className="max-h-[300px] w-[var(--radix-popover-trigger-width)] max-w-[var(--radix-popover-content-available-width)] overflow-y-auto">
+ <CommandList className="max-h-[300px] w-(--radix-popover-trigger-width) max-w-(--radix-popover-content-available-width) overflow-y-auto">
<CommandEmpty>
<Trans
i18nKey="timeZoneSelect__noOption"
diff --git a/apps/web/src/components/vote-summary-progress-bar.tsx b/apps/web/src/components/vote-summary-progress-bar.tsx
index 942185eb9..922cef01a 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 bg-slate-100">
+ <div className="flex h-1.5 grow overflow-hidden rounded-sm bg-slate-100">
<Tooltip>
<TooltipTrigger asChild>
<div
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 3047d0fc9..7ec269d24 100644
--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx
+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
@@ -50,7 +50,7 @@ function KeyBenefitsItem({
}) {
return (
<li className="flex items-center gap-3">
- <div className="rounded-lg border bg-gradient-to-b from-white to-gray-50 p-2">
+ <div className="rounded-lg border bg-linear-to-b from-white to-gray-50 p-2">
<Icon>{icon}</Icon>
</div>
<div>
@@ -101,7 +101,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 p-4 transition-colors has-data-[state=checked]:border-primary-300 has-data-[state=checked]:bg-primary-background has-data-[state=checked]:ring-primary"
>
<RadioGroupItem value={value} id={id} />
<div className="flex-1">
@@ -202,8 +202,8 @@ export function PayWallDialog({
<div className="space-y-4 pt-4">
{selectedPlan === "pro" && (
- <div className="flex justify-between gap-4 rounded-lg border border-dashed bg-muted-background p-4">
- <div>
+ <div className="flex items-start justify-between gap-4 rounded-lg border border-dashed bg-muted-background p-4">
+ <div className="mt-1">
<BadgeDollarSignIcon className="size-4 text-green-500" />
</div>
<div className="flex-1 space-y-2">
@@ -230,11 +230,13 @@ export function PayWallDialog({
/>
</p>
</div>
- <Switch
- checked={isAnnual}
- onCheckedChange={setIsAnnual}
- id="annual-switch"
- />
+ <div className="mt-1">
+ <Switch
+ checked={isAnnual}
+ onCheckedChange={setIsAnnual}
+ id="annual-switch"
+ />
+ </div>
</div>
)}
<TabsContent value="pro">
diff --git a/apps/web/src/globals.css b/apps/web/src/globals.css
new file mode 100644
index 000000000..c6fa7dc55
--- /dev/null
+++ b/apps/web/src/globals.css
@@ -0,0 +1,4 @@
+@import "tailwindcss";
+@import "@rallly/tailwind-config";
+
+/* Any app specific overrides will go here */
diff --git a/apps/web/src/style.css b/apps/web/src/style.css
deleted file mode 100644
index a26deb909..000000000
--- a/apps/web/src/style.css
+++ /dev/null
@@ -1,165 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-:root {
- --spacing: 0.25rem;
-}
-
-@layer base {
- * {
- @apply border-border;
- }
- body {
- @apply text-foreground bg-background;
- font-feature-settings:
- "rlig" 1,
- "calt" 1;
- }
- html {
- @apply h-full font-sans text-base text-gray-700;
- }
- body,
- #__next {
- @apply h-full;
- }
-
- label {
- @apply block text-sm;
- }
-
- p {
- @apply leading-normal;
- }
-
- a,
- button,
- input,
- select,
- textarea {
- @apply rounded outline-none;
- }
-}
-
-@layer components {
- .text-link {
- @apply text-primary rounded-md font-medium outline-none hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-1;
- }
- .formField {
- @apply mb-4;
- }
- .input {
- @apply appearance-none border px-2 text-gray-800 placeholder:text-gray-500;
- @apply focus-visible:ring-offset-input-background focus-visible:ring-1 focus-visible:ring-offset-1;
- @apply focus-visible:border-primary-400 focus-visible:ring-primary-100;
- }
- input.input {
- @apply h-9;
- }
- .input-lg {
- @apply input px-3 py-3;
- }
- .input-error {
- @apply focus:ring-rose-600;
- }
- .checkbox {
- @apply text-primary-600 focus:ring-primary-600 size-4 rounded border-gray-300 shadow-sm;
- }
- .btn {
- @apply inline-flex h-9 select-none items-center justify-center gap-x-1.5 whitespace-nowrap rounded-md border px-2.5 text-sm font-medium;
- }
- a.btn {
- @apply cursor-pointer hover:no-underline;
- }
-
- .btn-default {
- @apply btn bg-white/50 text-gray-700 hover:bg-gray-50 hover:shadow-sm active:bg-gray-200 active:shadow-none;
- }
- .btn-danger {
- text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;
- @apply btn border-destructive-700 bg-destructive-600 hover:bg-destructive-500 active:bg-destructive-700 text-white shadow-sm ring-1 ring-inset ring-white/10;
- }
- .btn-link {
- @apply text-primary-600 inline-flex items-center underline;
- }
- .btn.btn-disabled {
- text-shadow: none;
- @apply pointer-events-none border-gray-200 bg-gray-50 text-gray-400 shadow-none;
- }
- .btn-primary {
- text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;
- @apply btn border-gray-900 bg-gray-800 text-white shadow-sm ring-1 ring-inset ring-white/10 hover:bg-gray-700 active:bg-gray-900;
- }
-
- a.btn-primary {
- @apply text-white;
- }
-
- .segment-button {
- @apply flex h-9 text-center;
- }
-
- .segment-button button {
- @apply inline-flex grow items-center justify-center border-b border-r border-t bg-gray-50 px-4 text-sm font-medium transition-colors first:rounded-r-none first:border-l last:rounded-l-none hover:bg-gray-50 focus:z-10 active:bg-gray-100;
- }
-
- .segment-button .segment-button-active {
- @apply pointer-events-none bg-white text-gray-800;
- }
-
- .menu {
- @apply relative;
- }
-
- .menu-items {
- @apply absolute z-30 mt-1 overflow-hidden rounded border bg-white shadow-md focus:outline-none;
- }
-
- .menu-item {
- @apply block w-full select-none truncate px-4 py-2 text-left;
- }
-
- button[disabled] {
- @apply cursor-not-allowed;
- }
-
- .card {
- @apply border-y bg-white p-4 shadow-sm md:rounded-lg md:border;
- }
-}
-
-@layer components {
- .heading {
- @apply text-primary-600 mb-4 text-xl;
- }
- .subheading {
- @apply mb-16 text-4xl font-bold text-gray-800;
- }
- .heading-sm {
- @apply mb-4 text-xl font-bold text-gray-800;
- }
- .text {
- @apply text-lg leading-relaxed text-gray-500;
- }
-}
-
-@layer utilities {
- .bg-lines {
- background-color: #f8fafc;
- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100' height='199' viewBox='0 0 100 199'%3E%3Cg fill='%23e2e8f0' fill-opacity='0.4'%3E%3Cpath d='M0 199V0h1v1.99L100 199h-1.12L1 4.22V199H0zM100 2h-.12l-1-2H100v2z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
- }
- .bg-pattern {
- background-color: #f9fafb;
- background-image: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23f3f4f6' fill-opacity='0.75' fill-rule='evenodd'%3E%3Ccircle cx='3' cy='3' r='3'/%3E%3Ccircle cx='13' cy='13' r='3'/%3E%3C/g%3E%3C/svg%3E");
- }
- .bg-waves {
- background-color: #f9fafb;
- background-image: url("data:image/svg+xml,%3Csvg width='100' height='20' viewBox='0 0 100 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M21.184 20c.357-.13.72-.264 1.088-.402l1.768-.661C33.64 15.347 39.647 14 50 14c10.271 0 15.362 1.222 24.629 4.928.955.383 1.869.74 2.75 1.072h6.225c-2.51-.73-5.139-1.691-8.233-2.928C65.888 13.278 60.562 12 50 12c-10.626 0-16.855 1.397-26.66 5.063l-1.767.662c-2.475.923-4.66 1.674-6.724 2.275h6.335zm0-20C13.258 2.892 8.077 4 0 4V2c5.744 0 9.951-.574 14.85-2h6.334zM77.38 0C85.239 2.966 90.502 4 100 4V2c-6.842 0-11.386-.542-16.396-2h-6.225zM0 14c8.44 0 13.718-1.21 22.272-4.402l1.768-.661C33.64 5.347 39.647 4 50 4c10.271 0 15.362 1.222 24.629 4.928C84.112 12.722 89.438 14 100 14v-2c-10.271 0-15.362-1.222-24.629-4.928C65.888 3.278 60.562 2 50 2 39.374 2 33.145 3.397 23.34 7.063l-1.767.662C13.223 10.84 8.163 12 0 12v2z' fill='%23e5e7eb' fill-opacity='0.4' fill-rule='evenodd'/%3E%3C/svg%3E");
- }
-
- .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;
- }
-}
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
deleted file mode 100644
index 55a9036e4..000000000
--- a/apps/web/tailwind.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const sharedConfig = require("@rallly/tailwind-config");
-
-module.exports = sharedConfig;
diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
index 3d7717435..a9a70d1d0 100644
--- a/packages/tailwind-config/package.json
+++ b/packages/tailwind-config/package.json
@@ -2,15 +2,17 @@
"name": "@rallly/tailwind-config",
"version": "0.0.0",
"private": true,
- "main": "tailwind.config.js",
- "types": "tailwind.config.d.ts",
- "dependencies": {
- "tailwindcss": "^3.4.17"
+ "type": "module",
+ "exports": {
+ ".": "./shared-styles.css",
+ "./postcss": "./postcss.config.mjs"
},
- "devDependencies": {
- "@tailwindcss/typography": "^0.5.13",
- "autoprefixer": "^10.4.13",
- "tailwind-scrollbar": "^3.0.4",
- "tailwindcss-animate": "^1.0.5"
+ "dependencies": {
+ "@tailwindcss/postcss": "^4.1.18",
+ "@tailwindcss/typography": "^0.5.19",
+ "postcss": "^8.5.6",
+ "tailwind-scrollbar": "^4.0.2",
+ "tailwindcss": "^4.1.18",
+ "tailwindcss-animate": "^1.0.7"
}
}
diff --git a/packages/tailwind-config/postcss.config.mjs b/packages/tailwind-config/postcss.config.mjs
new file mode 100644
index 000000000..1f0cfb10a
--- /dev/null
+++ b/packages/tailwind-config/postcss.config.mjs
@@ -0,0 +1,6 @@
+// Optional PostCSS configuration for applications that need it
+export const postcssConfig = {
+ plugins: {
+ "@tailwindcss/postcss": {},
+ },
+};
\ No newline at end of file
diff --git a/packages/tailwind-config/shared-styles.css b/packages/tailwind-config/shared-styles.css
new file mode 100644
index 000000000..7f3b628a8
--- /dev/null
+++ b/packages/tailwind-config/shared-styles.css
@@ -0,0 +1,141 @@
+@import 'tailwindcss';
+
+@plugin "@tailwindcss/typography";
+@plugin "tailwindcss-animate";
+@plugin "tailwind-scrollbar";
+
+@source "../../packages/ui/src/**/*.{ts,tsx}";
+
+@theme {
+ --shadow-huge:
+ 0px 51px 78px rgb(17 7 53 / 5%), 0px 21.3066px 35.4944px rgb(17 7 53 / 4%),
+ 0px 11.3915px 18.9418px rgb(17 7 53 / 3%),
+ 0px 6.38599px 9.8801px rgb(17 7 53 / 3%),
+ 0px 3.39155px 4.58665px rgb(17 7 53 / 2%),
+ 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);
+ --ease-out-expo: cubic-bezier(0.19, 1, 0.22, 1);
+
+ --font-sans:
+ var(--font-inter), ui-sans-serif, system-ui, sans-serif,
+ 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+}
+
+/*
+ The default border color has changed to `currentcolor` in Tailwind CSS v4,
+ so we've added these compatibility styles to make sure everything still
+ looks the same as it did with Tailwind CSS v3.
+
+ If we ever want to remove these styles, we need to add an explicit border
+ color utility to any element that depends on these defaults.
+*/
+@layer base {
+ *,
+ ::after,
+ ::before,
+ ::backdrop,
+ ::file-selector-button {
+ border-color: var(--color-gray-200, currentcolor);
+ }
+}
+
+@utility text-link {
+ @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;
+ }
+}
+
+@layer base {
+ body {
+ @apply text-foreground bg-background;
+ font-feature-settings:
+ "rlig" 1,
+ "calt" 1;
+ }
+ html {
+ @apply h-full font-sans text-base text-gray-700;
+ }
+}
\ No newline at end of file
diff --git a/packages/tailwind-config/tailwind.config.d.ts b/packages/tailwind-config/tailwind.config.d.ts
deleted file mode 100644
index 4c2162f36..000000000
--- a/packages/tailwind-config/tailwind.config.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module "@rallly/tailwind-config";
diff --git a/packages/tailwind-config/tailwind.config.js b/packages/tailwind-config/tailwind.config.js
deleted file mode 100644
index 7aaade882..000000000
--- a/packages/tailwind-config/tailwind.config.js
+++ /dev/null
@@ -1,113 +0,0 @@
-const colors = require("tailwindcss/colors");
-const defaultTheme = require("tailwindcss/defaultTheme");
-
-module.exports = {
- content: [
- "./src/**/*.{ts,tsx}",
- "../../packages/ui/src/**/*.{ts,tsx}",
- "../../packages/tailwind-config/tailwind.config.js",
- ],
- plugins: [
- require("@tailwindcss/typography"),
- require("tailwindcss-animate"),
- require("tailwind-scrollbar"),
- ],
- theme: {
- extend: {
- boxShadow: {
- huge: "0px 51px 78px rgb(17 7 53 / 5%), 0px 21.3066px 35.4944px rgb(17 7 53 / 4%), 0px 11.3915px 18.9418px rgb(17 7 53 / 3%), 0px 6.38599px 9.8801px rgb(17 7 53 / 3%), 0px 3.39155px 4.58665px rgb(17 7 53 / 2%), 0px 1.4113px 1.55262px rgb(17 7 53 / 1%), inset 0px 1px 0px rgb(41 56 78 / 5%)",
- },
- colors: {
- primary: {
- ...colors.indigo,
- DEFAULT: colors.indigo["600"],
- foreground: colors.indigo["50"],
- background: colors.indigo["50"],
- },
- secondary: {
- background: colors.indigo["50"],
- DEFAULT: colors.indigo["50"],
- foreground: colors.indigo["600"],
- },
- gray: colors.gray,
- border: colors.gray["200"],
- input: {
- DEFAULT: colors.gray["200"],
- background: colors.white,
- foreground: colors.gray["700"],
- },
- ring: {
- DEFAULT: colors.gray["300"],
- },
- destructive: {
- DEFAULT: colors.rose["600"],
- background: colors.rose["50"],
- foreground: colors.rose["50"],
- },
- background: colors.white,
- foreground: colors.gray["700"],
- accent: {
- DEFAULT: colors.gray["100"],
- },
- "action-bar": {
- DEFAULT: colors.gray["800"],
- foreground: colors.gray["50"],
- },
- muted: {
- DEFAULT: colors.gray["100"],
- background: colors.gray["50"],
- foreground: colors.gray["500"],
- },
- popover: {
- DEFAULT: colors.white,
- foreground: colors.gray["700"],
- },
- card: {
- DEFAULT: colors.white,
- background: colors.white,
- foreground: colors.gray["700"],
- },
- sidebar: {
- DEFAULT: colors.gray["100"],
- foreground: colors.gray["700"],
- border: colors.gray["200"],
- accent: {
- DEFAULT: colors.gray["200"],
- foreground: colors.gray["800"],
- },
- },
- },
- keyframes: {
- wiggle: {
- "0%, 100%": { transform: "rotate(-1deg)" },
- "50%": { transform: "rotate(1deg)" },
- },
- popIn: {
- "0%": {
- transform: "scale(0.8) translateY(-10px)",
- opacity: "0",
- },
- "100%": {
- transform: "scale(1) translateY(0px)",
- opacity: "1",
- translateY: "0",
- },
- },
- },
- animation: {
- wiggle: "wiggle 0.2s ease-in-out",
- popIn: "popIn 0.1s ease-out",
- },
- screens: {
- xs: "375px",
- },
- transitionTimingFunction: {
- "in-expo": "cubic-bezier(0.68, -0.6, 0.32, 1.6)",
- "out-expo": "cubic-bezier(0.19, 1, 0.22, 1)",
- },
- fontFamily: {
- sans: ["var(--font-inter)", ...defaultTheme.fontFamily.sans],
- },
- },
- },
-};
diff --git a/packages/ui/components.json b/packages/ui/components.json
index 6a210b900..1c297f4cf 100644
--- a/packages/ui/components.json
+++ b/packages/ui/components.json
@@ -3,13 +3,6 @@
"style": "default",
"rsc": true,
"tsx": true,
- "tailwind": {
- "config": "tailwind.config.js",
- "css": "src/styles/globals.css",
- "baseColor": "gray",
- "cssVariables": false,
- "prefix": ""
- },
"aliases": {
"components": "@rallly/ui",
"ui": "src",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 2b7ee87f8..522e8ca9e 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -14,7 +14,7 @@
".": "./src/lib/utils.ts",
"./*": "./src/*.tsx",
"./hooks/*": "./src/hooks/*.ts",
- "./styles": "./src/styles/globals.css"
+ "./style.css": "./src/style.css"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.1.2",
diff --git a/packages/ui/src/alert.tsx b/packages/ui/src/alert.tsx
index 9274bc205..597627b3d 100644
--- a/packages/ui/src/alert.tsx
+++ b/packages/ui/src/alert.tsx
@@ -11,16 +11,16 @@ const alertVariants = cva(
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",
+ "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",
+ "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",
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",
+ "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",
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",
+ "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",
},
},
defaultVariants: {
diff --git a/packages/ui/src/avatar.tsx b/packages/ui/src/avatar.tsx
index e286c3691..df5098ec5 100644
--- a/packages/ui/src/avatar.tsx
+++ b/packages/ui/src/avatar.tsx
@@ -11,8 +11,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 text-base",
- sm: "size-5 rounded-sm text-[10px]",
+ md: "size-8 rounded-xs text-base",
+ sm: "size-5 rounded-xs text-[10px]",
},
},
defaultVariants: {
diff --git a/packages/ui/src/badge.tsx b/packages/ui/src/badge.tsx
index f8a737fd1..50743ffb0 100644
--- a/packages/ui/src/badge.tsx
+++ b/packages/ui/src/badge.tsx
@@ -5,7 +5,7 @@ import type * as React from "react";
import { cn } from "./lib/utils";
const badgeVariants = cva(
- "group inline-flex items-center justify-center whitespace-nowrap rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+ "group inline-flex items-center justify-center whitespace-nowrap rounded-full transition-colors focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2",
{
variants: {
variant: {
diff --git a/packages/ui/src/billing-plan.tsx b/packages/ui/src/billing-plan.tsx
index 2f0000b94..372060fb1 100644
--- a/packages/ui/src/billing-plan.tsx
+++ b/packages/ui/src/billing-plan.tsx
@@ -9,7 +9,7 @@ export const BillingPlan = ({
return (
<div
className={cn(
- "space-y-4 rounded-md border bg-white px-5 py-4 shadow-sm backdrop-blur-sm",
+ "space-y-4 rounded-md border bg-white px-5 py-4 shadow-2xs backdrop-blur-xs",
className,
)}
>
diff --git a/packages/ui/src/breadcrumb.tsx b/packages/ui/src/breadcrumb.tsx
index 7258e5e54..b760473f4 100644
--- a/packages/ui/src/breadcrumb.tsx
+++ b/packages/ui/src/breadcrumb.tsx
@@ -19,7 +19,7 @@ const BreadcrumbList = React.forwardRef<
<ol
ref={ref}
className={cn(
- "flex flex-wrap items-center gap-1.5 break-words text-muted-foreground text-sm sm:gap-2.5",
+ "wrap-break-word flex flex-wrap items-center gap-1.5 text-muted-foreground text-sm sm:gap-2.5",
className,
)}
{...props}
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
index 69b29c2bf..c08ce7c60 100644
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -9,22 +9,21 @@ import { cn } from "./lib/utils";
const buttonVariants = cva(
cn(
- "inline-flex select-none items-center justify-center whitespace-nowrap border border text-shadow disabled:pointer-events-none disabled:opacity-50",
- "focus-visible:shadow-none",
+ "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",
),
{
variants: {
variant: {
primary:
- "border-primary bg-primary text-white focus-visible:ring-2 focus-visible:ring-gray-300 focus-visible:ring-offset-1 active:bg-primary-500 disabled:border-transparent disabled:bg-gray-400",
+ "bg-primary text-white active:bg-primary-500 disabled:border-transparent disabled:bg-gray-400",
destructive:
- "border-destructive bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90 focus-visible:ring-offset-1 active:bg-destructive",
+ "border-destructive bg-destructive text-destructive-foreground hover:bg-destructive/90 active:bg-destructive",
default:
- "bg-white hover:bg-gray-50 focus-visible:ring-offset-1 active:bg-gray-100",
+ "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",
ghost:
- "border-transparent bg-transparent text-gray-800 hover:bg-gray-500/10 focus-visible:ring-2 focus-visible:ring-gray-200 active:bg-gray-500/20 data-[state=open]:bg-gray-500/20",
+ "border-transparent bg-transparent text-gray-800 hover:bg-gray-500/10 active:bg-gray-500/20 data-[state=open]:bg-gray-500/20",
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 c390041fb..a494098a7 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-lg border-x border-y bg-card text-card-foreground shadow-sm",
+ "overflow-hidden rounded-2xl border-x border-y bg-card text-card-foreground shadow-2xs",
className,
)}
{...props}
diff --git a/packages/ui/src/checkbox.tsx b/packages/ui/src/checkbox.tsx
index aa72a45f4..1b9be7e6c 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-none 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-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",
className,
)}
checked={checked}
diff --git a/packages/ui/src/command.tsx b/packages/ui/src/command.tsx
index ea424e15a..6218fe0fb 100644
--- a/packages/ui/src/command.tsx
+++ b/packages/ui/src/command.tsx
@@ -30,13 +30,8 @@ type CommandDialogProps = DialogProps;
const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
return (
<Dialog {...props}>
- <DialogContent
- hideCloseButton={true}
- size="xl"
- position="top"
- className="p-0"
- >
- <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:size-4 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:p-2 [&_[cmdk-item]_svg]:size-4">
+ <DialogContent showCloseButton={false} size="xl" className="p-0">
+ <Command className="[&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:size-4 [&_[cmdk-item]_svg]:size-4 [[cmdk-group-heading]]:**:px-2 [[cmdk-group-heading]]:**:font-medium [[cmdk-group-heading]]:**:text-muted-foreground [[cmdk-group]]:**:px-2 [[cmdk-input]]:**:h-12 [[cmdk-item]]:**:p-2">
{children}
</Command>
</DialogContent>
@@ -58,7 +53,7 @@ const CommandInput = React.forwardRef<
<CommandPrimitive.Input
ref={ref}
className={cn(
- "flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-foreground-muted focus:ring-0 disabled:cursor-not-allowed disabled:opacity-50",
+ "flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-hidden placeholder:text-foreground-muted focus:ring-0 disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
{...props}
@@ -101,7 +96,7 @@ const CommandGroup = React.forwardRef<
<CommandPrimitive.Group
ref={ref}
className={cn(
- "overflow-hidden p-2 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-gray-500 [&_[cmdk-group-heading]]:text-sm",
+ "overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group-heading]]:text-xs",
className,
)}
{...props}
@@ -129,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-none 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-md p-2 text-sm outline-hidden aria-selected:bg-gray-100 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
className,
)}
{...props}
@@ -145,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-none 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-gray-100 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 7dd2b0426..6bd264b3a 100644
--- a/packages/ui/src/dialog.tsx
+++ b/packages/ui/src/dialog.tsx
@@ -1,57 +1,61 @@
"use client";
import * as DialogPrimitive from "@radix-ui/react-dialog";
-import { Slot } from "@radix-ui/react-slot";
import type { VariantProps } from "class-variance-authority";
import { cva } from "class-variance-authority";
import { XIcon } from "lucide-react";
-import * as React from "react";
-import { Button } from "./button";
-import { Icon } from "./icon";
+import React from "react";
import { cn } from "./lib/utils";
-export type { DialogProps } from "@radix-ui/react-dialog";
+function Dialog({
+ ...props
+}: React.ComponentProps<typeof DialogPrimitive.Root>) {
+ return <DialogPrimitive.Root data-slot="dialog" {...props} />;
+}
-const Dialog = DialogPrimitive.Root;
+export type DialogProps = React.ComponentProps<typeof DialogPrimitive.Root>;
+
+function DialogTrigger({
+ ...props
+}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
+ return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
+}
-const DialogTrigger = DialogPrimitive.Trigger;
-const DialogClose = DialogPrimitive.Close;
+function DialogPortal({
+ ...props
+}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
+ return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
+}
-const DialogPortal = DialogPrimitive.Portal;
+function DialogClose({
+ ...props
+}: React.ComponentProps<typeof DialogPrimitive.Close>) {
+ return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
+}
-const DialogOverlay = React.forwardRef<
- React.ComponentRef<typeof DialogPrimitive.Overlay>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
->(({ className, ...props }, ref) => (
- <DialogPrimitive.Overlay
- ref={ref}
- className={cn(
- "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-gray-900/40 data-[state=closed]:animate-out data-[state=open]:animate-in",
- className,
- )}
- {...props}
- />
-));
-DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
+function DialogOverlay({
+ className,
+ ...props
+}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+ return (
+ <DialogPrimitive.Overlay
+ data-slot="dialog-overlay"
+ className={cn(
+ "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-gray-900/50 data-[state=closed]:animate-out data-[state=open]:animate-in",
+ className,
+ )}
+ {...props}
+ />
+ );
+}
-const dialogContentVariants = cva(
+const dialogVariants = cva(
cn(
- //style
- "gap-4 rounded-xl bg-background p-4 shadow-lg",
- // position
- "-translate-x-1/2 sm:-translate-y-1/2 fixed top-4 left-1/2 z-50 grid w-full sm:top-1/2",
- // animation
- "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=open]:slide-in-from-left-1/2 data-[state=closed]:slide-out-to-left-1/2 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 bg-background p-4 shadow-lg outline-none duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in",
),
{
variants: {
- position: {
- top: "data-[state=closed]:slide-out-to-top-[10%] data-[state=open]:slide-in-from-top-[10%] sm:top-48",
- center:
- "data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-top-[48%] sm:top-[50%] sm:translate-y-[-50%]",
- },
size: {
- xs: "sm:max-w-xs",
sm: "sm:max-w-sm",
md: "sm:max-w-md",
lg: "sm:max-w-lg",
@@ -60,112 +64,91 @@ const dialogContentVariants = cva(
"3xl": "sm:max-w-3xl",
"4xl": "sm:max-w-4xl",
"5xl": "sm:max-w-5xl",
+ "6xl": "sm:max-w-6xl",
+ "7xl": "sm:max-w-7xl",
},
},
- defaultVariants: {
- position: "center",
- size: "md",
- },
},
);
-const DialogContent = React.forwardRef<
- React.ComponentRef<typeof DialogPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
- hideCloseButton?: boolean;
- } & VariantProps<typeof dialogContentVariants>
->(
- (
- { className, children, position, size = "md", hideCloseButton, ...props },
- ref,
- ) => (
- <DialogPortal>
+function DialogContent({
+ className,
+ children,
+ showCloseButton = true,
+ size = "md",
+ ...props
+}: React.ComponentProps<typeof DialogPrimitive.Content> &
+ VariantProps<typeof dialogVariants> & {
+ showCloseButton?: boolean;
+ }) {
+ return (
+ <DialogPortal data-slot="dialog-portal">
<DialogOverlay />
<DialogPrimitive.Content
- ref={ref}
- className={cn(
- "max-w-[calc(100%-2rem)]",
- dialogContentVariants({ position, size }),
- className,
- )}
+ data-slot="dialog-content"
+ className={cn(dialogVariants({ size }), className)}
{...props}
>
{children}
- {!hideCloseButton ? (
- <DialogClose asChild className="absolute top-2 right-2">
- <Button size="icon" variant="ghost">
- <Icon>
- <XIcon />
- </Icon>
- <span className="sr-only">Close</span>
- </Button>
+ {showCloseButton && (
+ <DialogClose className="absolute top-4 right-4 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0">
+ <XIcon />
+ <span className="sr-only">Close</span>
</DialogClose>
- ) : null}
+ )}
</DialogPrimitive.Content>
</DialogPortal>
- ),
-);
-DialogContent.displayName = DialogPrimitive.Content.displayName;
+ );
+}
+
+function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ data-slot="dialog-header"
+ className={cn("flex flex-col gap-2 sm:text-left", className)}
+ {...props}
+ />
+ );
+}
-const DialogHeader = ({
+function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+ <div
+ data-slot="dialog-footer"
+ className={cn(
+ "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+ className,
+ )}
+ {...props}
+ />
+ );
+}
+
+function DialogTitle({
className,
- icon,
- children,
...props
-}: React.HTMLAttributes<HTMLDivElement> & {
- icon?: React.ReactNode;
-}) => (
- <div className={cn("flex flex-col gap-4", className)} {...props}>
- {icon ? (
- <span className="inline-flex size-8 items-center justify-center rounded-lg bg-primary-foreground text-primary">
- <Slot className="size-4">{icon}</Slot>
- </span>
- ) : null}
- <div>{children}</div>
- </div>
-);
-DialogHeader.displayName = "DialogHeader";
+}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+ return (
+ <DialogPrimitive.Title
+ data-slot="dialog-title"
+ className={cn("font-semibold text-lg leading-none", className)}
+ {...props}
+ />
+ );
+}
-const DialogFooter = ({
+function DialogDescription({
className,
...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "mt-2 flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
- className,
- )}
- {...props}
- />
-);
-DialogFooter.displayName = "DialogFooter";
-
-const DialogTitle = React.forwardRef<
- React.ComponentRef<typeof DialogPrimitive.Title>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
->(({ className, ...props }, ref) => (
- <DialogPrimitive.Title
- ref={ref}
- className={cn(
- "font-semibold text-base leading-none tracking-tight",
- className,
- )}
- {...props}
- />
-));
-DialogTitle.displayName = DialogPrimitive.Title.displayName;
-
-const DialogDescription = React.forwardRef<
- React.ComponentRef<typeof DialogPrimitive.Description>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
->(({ className, ...props }, ref) => (
- <DialogPrimitive.Description
- ref={ref}
- className={cn("mt-2 text-muted-foreground text-sm", className)}
- {...props}
- />
-));
-DialogDescription.displayName = DialogPrimitive.Description.displayName;
+}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+ return (
+ <DialogPrimitive.Description
+ data-slot="dialog-description"
+ className={cn("text-muted-foreground text-sm", className)}
+ {...props}
+ />
+ );
+}
function useDialog() {
const [isOpen, setIsOpen] = React.useState(false);
@@ -204,6 +187,8 @@ export {
DialogDescription,
DialogFooter,
DialogHeader,
+ DialogOverlay,
+ DialogPortal,
DialogTitle,
DialogTrigger,
useDialog,
diff --git a/packages/ui/src/dropdown-menu.tsx b/packages/ui/src/dropdown-menu.tsx
index bc4a745e7..a7afcf0fe 100644
--- a/packages/ui/src/dropdown-menu.tsx
+++ b/packages/ui/src/dropdown-menu.tsx
@@ -41,7 +41,7 @@ const DropdownMenuSubTrigger = React.forwardRef<
<DropdownMenuPrimitive.SubTrigger
ref={ref}
className={cn(
- "flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent data-[disabled]:opacity-50",
+ "flex cursor-default select-none items-center gap-2 rounded-xs px-2 py-1.5 text-sm outline-hidden focus:bg-accent data-[state=open]:bg-accent data-disabled:opacity-50",
inset && "pl-8",
className,
)}
@@ -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-[8rem] 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-md border bg-popover p-1 text-popover-foreground shadow-md",
className,
)}
{...props}
@@ -89,7 +89,7 @@ const DropdownMenuContent = React.forwardRef<
DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
const dropdownMenuItemVariants = cva(
- "relative flex cursor-default select-none items-center gap-x-2.5 rounded-md px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+ "relative flex cursor-default select-none items-center gap-x-2.5 rounded-md px-2 py-1.5 text-sm outline-hidden data-disabled:pointer-events-none data-disabled:opacity-50",
{
variants: {
variant: {
@@ -130,7 +130,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
<DropdownMenuPrimitive.CheckboxItem
ref={ref}
className={cn(
- "relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+ "relative flex cursor-default select-none items-center rounded-xs py-1.5 pr-2 pl-8 outline-hidden focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50",
className,
)}
checked={checked}
@@ -156,7 +156,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-none 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 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",
className,
)}
{...props}
diff --git a/packages/ui/src/form.tsx b/packages/ui/src/form.tsx
index 24e73884e..0bbc2f675 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("space-y-2.5", className)} {...props} />
+ <div ref={ref} className={cn("grid gap-1.5", className)} {...props} />
</FormItemContext.Provider>
);
});
diff --git a/packages/ui/src/input.tsx b/packages/ui/src/input.tsx
index 05bb996fa..731203487 100644
--- a/packages/ui/src/input.tsx
+++ b/packages/ui/src/input.tsx
@@ -1,58 +1,45 @@
+import type { VariantProps } from "class-variance-authority";
import { cva } from "class-variance-authority";
-import * as React from "react";
-
+import type * as React from "react";
import { cn } from "./lib/utils";
-export type InputProps = Omit<
- React.InputHTMLAttributes<HTMLInputElement>,
- "size"
-> & {
- size?: "sm" | "md" | "lg";
- error?: boolean;
-};
-
const inputVariants = cva(
cn(
- "w-full focus:ring-2 focus:ring-ring focus-visible:border-gray-300",
- "h-9 rounded-md border border-input bg-white file:border-0 file:bg-transparent file:font-medium file:text-sm placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
+ "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",
+ "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",
),
{
variants: {
size: {
- sm: "h-7 px-1 text-xs",
- md: "h-8 px-2 text-sm",
- lg: "h-12 px-3 text-base",
- },
- variant: {
- default: "border-primary-400 focus-visible:border-primary-400",
- error: "border-rose-400 focus-visible:border-rose-400",
- ghost: "border-transparent focus-visible:border-primary-400",
+ default: "h-8 rounded-lg px-2.5 py-1 text-sm",
+ sm: "h-7 rounded-md px-2 text-sm",
+ lg: "h-12 rounded-lg px-3 text-base",
},
},
defaultVariants: {
- size: "md",
+ size: "default",
},
},
);
-const Input = React.forwardRef<HTMLInputElement, InputProps>(
- ({ className, size, type, error, ...props }, ref) => {
- return (
- <input
- type={type}
- className={cn(
- inputVariants({ size }),
- error
- ? "focus-visible:border-rose-400 focus-visible:ring-rose-100"
- : "focus-visible:border-primary-400 focus-visible:ring-primary-100",
- className,
- )}
- ref={ref}
- {...props}
- />
- );
- },
-);
-Input.displayName = "Input";
+function Input({
+ className,
+ type,
+ size = "default",
+ ...props
+}: Omit<React.ComponentProps<"input">, "size"> &
+ VariantProps<typeof inputVariants>) {
+ return (
+ <input
+ type={type}
+ data-slot="input"
+ className={inputVariants({ size, className })}
+ {...props}
+ />
+ );
+}
+
+export type InputProps = React.ComponentProps<typeof Input>;
export { Input };
diff --git a/packages/ui/src/page-tabs.tsx b/packages/ui/src/page-tabs.tsx
index e88a35581..ea8eb29de 100644
--- a/packages/ui/src/page-tabs.tsx
+++ b/packages/ui/src/page-tabs.tsx
@@ -26,7 +26,7 @@ const TabsTrigger = React.forwardRef<
<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-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+ "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",
className,
)}
@@ -42,7 +42,7 @@ const TabsContent = React.forwardRef<
<TabsPrimitive.Content
ref={ref}
className={cn(
- "mt-4 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 lg:mt-6",
+ "mt-4 ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 lg:mt-6",
className,
)}
{...props}
diff --git a/packages/ui/src/popover.tsx b/packages/ui/src/popover.tsx
index 04bfcf552..7d7ffb634 100644
--- a/packages/ui/src/popover.tsx
+++ b/packages/ui/src/popover.tsx
@@ -20,7 +20,7 @@ const PopoverContent = React.forwardRef<
sideOffset={sideOffset}
collisionPadding={12}
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 animate-in rounded-md border bg-white p-4 shadow-huge outline-none",
+ "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 animate-in rounded-md border bg-white p-4 shadow-huge outline-hidden",
className,
)}
{...props}
diff --git a/packages/ui/src/progress.tsx b/packages/ui/src/progress.tsx
index 16f305b08..eda7feab8 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-gradient-to-r from-purple-500 to-indigo-500 transition-all"
+ className="h-full w-full flex-1 bg-linear-to-r from-purple-500 to-indigo-500 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 166b7e72f..d242d5ad5 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-none 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-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",
className,
)}
{...props}
diff --git a/packages/ui/src/select.tsx b/packages/ui/src/select.tsx
index ac5e5ba45..2465ac5f2 100644
--- a/packages/ui/src/select.tsx
+++ b/packages/ui/src/select.tsx
@@ -53,7 +53,7 @@ const SelectContent = React.forwardRef<
<SelectPrimitive.Content
ref={ref}
className={cn(
- "relative z-50 max-h-[300px] min-w-[8rem] 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 bg-white shadow-md",
position === "popper" && "translate-y-1",
className,
)}
@@ -64,7 +64,7 @@ const SelectContent = React.forwardRef<
className={cn(
"p-1",
position === "popper" &&
- "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
+ "h-(--radix-select-trigger-height) w-full min-w-(--radix-select-trigger-width)",
)}
>
{children}
@@ -96,7 +96,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-none 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-gray-100 data-disabled:pointer-events-none data-disabled:opacity-50",
className,
)}
{...props}
diff --git a/packages/ui/src/separator.tsx b/packages/ui/src/separator.tsx
index 12d97b782..d8f3941e6 100644
--- a/packages/ui/src/separator.tsx
+++ b/packages/ui/src/separator.tsx
@@ -19,7 +19,7 @@ const Separator = React.forwardRef<
orientation={orientation}
className={cn(
"shrink-0 bg-border",
- orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+ orientation === "horizontal" ? "h-px w-full" : "h-full w-px",
className,
)}
{...props}
diff --git a/packages/ui/src/sheet.tsx b/packages/ui/src/sheet.tsx
index db9d85a04..398dd3b76 100644
--- a/packages/ui/src/sheet.tsx
+++ b/packages/ui/src/sheet.tsx
@@ -65,7 +65,7 @@ const SheetContent = React.forwardRef<
{...props}
>
{children}
- <SheetPrimitive.Close className="absolute top-4 right-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
+ <SheetPrimitive.Close className="absolute top-4 right-4 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
<X className="h-4 w-4" />
<span className="sr-only">Close</span>
</SheetPrimitive.Close>
diff --git a/packages/ui/src/sidebar.tsx b/packages/ui/src/sidebar.tsx
index 6732a1cee..c0fed91d2 100644
--- a/packages/ui/src/sidebar.tsx
+++ b/packages/ui/src/sidebar.tsx
@@ -133,7 +133,7 @@ const SidebarProvider = React.forwardRef<
} as React.CSSProperties
}
className={cn(
- "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
+ "group/sidebar-wrapper flex min-h-svh w-full has-data-[variant=inset]:bg-sidebar",
className,
)}
ref={ref}
@@ -173,7 +173,7 @@ const Sidebar = React.forwardRef<
return (
<div
className={cn(
- "flex h-full w-[--sidebar-width] flex-col bg-sidebar text-sidebar-foreground",
+ "flex h-full w-(--sidebar-width) flex-col bg-sidebar text-sidebar-foreground",
className,
)}
ref={ref}
@@ -190,7 +190,7 @@ const Sidebar = React.forwardRef<
<SheetContent
data-sidebar="sidebar"
data-mobile="true"
- className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
+ className="w-(--sidebar-width) bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
style={
{
"--sidebar-width": SIDEBAR_WIDTH_MOBILE,
@@ -220,31 +220,31 @@ const Sidebar = React.forwardRef<
{/* This is what handles the sidebar gap on desktop */}
<div
className={cn(
- "relative w-[--sidebar-width] bg-transparent transition-[width] duration-200 ease-linear",
+ "relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear",
"group-data-[collapsible=offcanvas]:w-0",
"group-data-[side=right]:rotate-180",
variant === "floating" || variant === "inset"
- ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
- : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
+ ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"
+ : "group-data-[collapsible=icon]:w-(--sidebar-width-icon)",
)}
/>
<div
className={cn(
- "fixed inset-y-0 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] duration-200 ease-linear md:flex",
+ "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
side === "left"
? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
: "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
// Adjust the padding for floating and inset variants.
variant === "floating" || variant === "inset"
- ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
- : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
+ ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
+ : "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",
className,
)}
{...props}
>
<div
data-sidebar="sidebar"
- className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow"
+ className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow-xs"
>
{children}
</div>
@@ -299,7 +299,7 @@ const SidebarRail = React.forwardRef<
title="Toggle Sidebar"
className={cn(
"-translate-x-1/2 group-data-[side=left]:-right-4 absolute inset-y-0 z-20 hidden w-2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=right]:left-0 sm:flex",
- "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",
+ "in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
"[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
"group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:hover:bg-sidebar group-data-[collapsible=offcanvas]:after:left-full",
"[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
@@ -321,7 +321,7 @@ const SidebarInset = React.forwardRef<
ref={ref}
className={cn(
"flex w-full flex-1 flex-col bg-background",
- "md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-lg md:peer-data-[variant=inset]:border md:peer-data-[variant=inset]:shadow-sm",
+ "md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-lg md:peer-data-[variant=inset]:border md:peer-data-[variant=inset]:shadow-2xs",
className,
)}
{...props}
@@ -437,7 +437,7 @@ const SidebarGroupLabel = React.forwardRef<
ref={ref}
data-sidebar="group-label"
className={cn(
- "flex h-8 shrink-0 items-center rounded-md px-2 font-medium text-sidebar-foreground/70 text-xs outline-none ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+ "flex h-8 shrink-0 items-center rounded-md px-2 font-medium text-sidebar-foreground/70 text-xs outline-hidden ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
"group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
className,
)}
@@ -458,9 +458,9 @@ const SidebarGroupAction = React.forwardRef<
ref={ref}
data-sidebar="group-action"
className={cn(
- "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+ "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-hidden ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
// Increases the hit area of the button on mobile.
- "after:-inset-2 after:absolute after:md:hidden",
+ "after:-inset-2 after:absolute md:after:hidden",
"group-data-[collapsible=icon]:hidden",
className,
)}
@@ -510,7 +510,7 @@ const SidebarMenuItem = React.forwardRef<
SidebarMenuItem.displayName = "SidebarMenuItem";
const sidebarMenuButtonVariants = cva(
- "peer/menu-button group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 flex w-full items-center gap-2.5 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] focus-visible:ring-2 focus-visible:ring-gray-400 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+ "peer/menu-button flex w-full items-center gap-2.5 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] focus-visible:ring-2 focus-visible:ring-gray-400 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
{
variants: {
variant: {
@@ -524,7 +524,7 @@ const sidebarMenuButtonVariants = cva(
size: {
default: "h-9 text-sm",
sm: "h-7 text-xs",
- lg: "group-data-[collapsible=icon]:!p-0 h-12 text-sm",
+ lg: "h-12 text-sm group-data-[collapsible=icon]:p-0!",
},
},
defaultVariants: {
@@ -607,9 +607,9 @@ const SidebarMenuAction = React.forwardRef<
ref={ref}
data-sidebar="menu-action"
className={cn(
- "absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
+ "absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-hidden ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
// Increases the hit area of the button on mobile.
- "after:-inset-2 after:absolute after:md:hidden",
+ "after:-inset-2 after:absolute md:after:hidden",
"peer-data-[size=sm]/menu-button:top-1",
"peer-data-[size=default]/menu-button:top-1.5",
"peer-data-[size=lg]/menu-button:top-2.5",
@@ -670,7 +670,7 @@ const SidebarMenuSkeleton = React.forwardRef<
/>
)}
<Skeleton
- className="h-4 max-w-[--skeleton-width] flex-1"
+ className="h-4 max-w-(--skeleton-width) flex-1"
data-sidebar="menu-skeleton-text"
style={
{
@@ -723,7 +723,7 @@ const SidebarMenuSubButton = React.forwardRef<
data-size={size}
data-active={isActive}
className={cn(
- "-translate-x-px flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
+ "-translate-x-px flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-hidden ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
"data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
size === "sm" && "text-xs",
size === "md" && "text-sm",
diff --git a/packages/ui/src/styles/globals.css b/packages/ui/src/styles/globals.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/ui/src/switch.tsx b/packages/ui/src/switch.tsx
index 81a17cedb..9730e583d 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-none 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 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",
className,
)}
{...props}
diff --git a/packages/ui/src/table.tsx b/packages/ui/src/table.tsx
index 458474a44..9487e795d 100644
--- a/packages/ui/src/table.tsx
+++ b/packages/ui/src/table.tsx
@@ -73,7 +73,7 @@ const TableHead = React.forwardRef<
<th
ref={ref}
className={cn(
- "h-10 px-2 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+ "h-10 px-2 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 [[role=checkbox]]:*:translate-y-[2px]",
className,
)}
{...props}
@@ -88,7 +88,7 @@ const TableCell = React.forwardRef<
<td
ref={ref}
className={cn(
- "p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+ "p-2 align-middle [&:has([role=checkbox])]:pr-0 [[role=checkbox]]:*:translate-y-[2px]",
className,
)}
{...props}
diff --git a/packages/ui/src/tabs.tsx b/packages/ui/src/tabs.tsx
index 126f83e9a..4e59bba4a 100644
--- a/packages/ui/src/tabs.tsx
+++ b/packages/ui/src/tabs.tsx
@@ -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-none 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-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",
className,
)}
{...props}
@@ -44,7 +44,7 @@ const TabsContent = React.forwardRef<
<TabsPrimitive.Content
ref={ref}
className={cn(
- "ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+ "ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
className,
)}
{...props}
diff --git a/packages/ui/src/textarea.tsx b/packages/ui/src/textarea.tsx
index 299b3d98c..d35e992c1 100644
--- a/packages/ui/src/textarea.tsx
+++ b/packages/ui/src/textarea.tsx
@@ -9,10 +9,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
return (
<textarea
className={cn(
- "flex min-h-[80px] rounded-md border border-input bg-white px-2 py-2 text-sm placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
- "focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-input-background",
- "focus-visible:border-primary-400 focus-visible:ring-primary-100",
- className,
+ "field-sizing-content flex min-h-16 w-full rounded-lg border border-input bg-input-background px-2 py-2 text-base 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 md:text-sm dark:bg-input/30 dark:aria-invalid:ring-destructive/40",
)}
ref={ref}
{...props}
diff --git a/packages/ui/src/toast.tsx b/packages/ui/src/toast.tsx
index 3e3e1a762..dcbaac70d 100644
--- a/packages/ui/src/toast.tsx
+++ b/packages/ui/src/toast.tsx
@@ -15,7 +15,7 @@ const ToastViewport = React.forwardRef<
<ToastPrimitives.Viewport
ref={ref}
className={cn(
- "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:top-auto sm:right-4 sm:bottom-4 sm:flex-col md:max-w-[420px]",
+ "fixed top-0 z-100 flex max-h-screen w-full flex-col-reverse p-4 sm:top-auto sm:right-4 sm:bottom-4 sm:flex-col md:max-w-[420px]",
className,
)}
{...props}
@@ -24,7 +24,7 @@ const ToastViewport = React.forwardRef<
ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
const toastVariants = cva(
- "group data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-lg p-5 shadow-huge transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[state=closed]:animate-out data-[state=open]:animate-in data-[swipe=end]:animate-out data-[swipe=move]:transition-none",
+ "group data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-lg p-5 shadow-huge transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-(--radix-toast-swipe-end-x) data-[swipe=move]:translate-x-(--radix-toast-swipe-move-x) data-[state=closed]:animate-out data-[state=open]:animate-in data-[swipe=end]:animate-out data-[swipe=move]:transition-none",
{
variants: {
variant: {
@@ -61,7 +61,7 @@ const ToastAction = React.forwardRef<
<ToastPrimitives.Action
ref={ref}
className={cn(
- "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 font-medium text-sm ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:focus:ring-destructive group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground",
+ "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 font-medium text-sm ring-offset-background transition-colors hover:bg-secondary focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:focus:ring-destructive group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground",
className,
)}
{...props}
@@ -76,7 +76,7 @@ const ToastClose = React.forwardRef<
<ToastPrimitives.Close
ref={ref}
className={cn(
- "absolute top-2 right-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600 group-[.destructive]:hover:text-red-50",
+ "absolute top-2 right-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-hidden focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600 group-[.destructive]:hover:text-red-50",
className,
)}
toast-close=""
diff --git a/packages/ui/src/tooltip.tsx b/packages/ui/src/tooltip.tsx
index 44b601cab..c1858f787 100644
--- a/packages/ui/src/tooltip.tsx
+++ b/packages/ui/src/tooltip.tsx
@@ -22,7 +22,7 @@ const TooltipContent = React.forwardRef<
sideOffset={sideOffset}
side={side}
className={cn(
- "z-50 overflow-hidden rounded-md bg-gray-800 px-2 py-1.5 text-gray-50 text-sm shadow-sm",
+ "z-50 overflow-hidden rounded-md bg-gray-800 px-2 py-1.5 text-gray-50 text-sm shadow-2xs",
className,
)}
{...props}
diff --git a/packages/ui/tailwind.config.js b/packages/ui/tailwind.config.js
deleted file mode 100644
index 31dcd66a6..000000000
--- a/packages/ui/tailwind.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require("@rallly/tailwind-config/tailwind.config");
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 991aaa2ae..20b9808bc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -31,7 +31,7 @@ importers:
version: 5.8.3
vitest:
specifier: ^4.0.16
apps/docs:
dependencies:
@@ -132,6 +132,9 @@ importers:
react-use:
specifier: ^17.6.0
+ tailwindcss:
+ specifier: ^4.1.18
+ version: 4.1.18
devDependencies:
'@next/bundle-analyzer':
specifier: ^15.5.9
@@ -197,8 +200,8 @@ importers:
specifier: ^5.2.2
'@next/env':
- specifier: ^15.3.1
- version: 15.4.6
+ specifier: ^15.4.8
+ version: 15.5.7
'@prisma/client':
specifier: ^6.8.2
@@ -247,6 +250,9 @@ importers:
'@t3-oss/env-nextjs':
specifier: ^0.13.8
+ '@tailwindcss/postcss':
+ specifier: ^4.1.18
+ version: 4.1.18
'@tanstack/react-query':
specifier: ^5.90.12
version: 5.90.12([email protected])
@@ -286,12 +292,9 @@ importers:
arctic:
specifier: ^3.7.0
version: 3.7.0
- autoprefixer:
- specifier: ^10.4.13
- version: 10.4.21([email protected])
better-auth:
specifier: ^1.4.7
calendar-link:
specifier: ^2.6.0
version: 2.8.0
@@ -374,7 +377,7 @@ importers:
specifier: ^4.1.1
version: 4.1.1
postcss:
- specifier: ^8.4.31
+ specifier: ^8.5.6
version: 8.5.6
react:
specifier: ^19.1.4
@@ -410,8 +413,8 @@ importers:
specifier: ^2.0.0
version: 2.2.2
tailwindcss:
- specifier: ^3.4.17
- version: 3.4.17
+ specifier: ^4.1.18
+ version: 4.1.18
timezone-soft:
specifier: ^1.5.1
version: 1.5.2
@@ -472,7 +475,7 @@ importers:
version: 4.4.5
'@vitejs/plugin-react':
specifier: ^5.0.0
cheerio:
specifier: ^1.0.0-rc.12
version: 1.0.0
@@ -490,7 +493,7 @@ importers:
version: 26.1.0
vitest:
specifier: ^4.0.16
packages/billing:
dependencies:
@@ -648,22 +651,24 @@ importers:
packages/tailwind-config:
dependencies:
- tailwindcss:
- specifier: ^3.4.17
- version: 3.4.17
- devDependencies:
+ '@tailwindcss/postcss':
+ specifier: ^4.1.18
+ version: 4.1.18
'@tailwindcss/typography':
- specifier: ^0.5.13
- version: 0.5.16([email protected])
- autoprefixer:
- specifier: ^10.4.13
- version: 10.4.21([email protected])
+ specifier: ^0.5.19
+ version: 0.5.19([email protected])
+ postcss:
+ specifier: ^8.5.6
+ version: 8.5.6
tailwind-scrollbar:
- specifier: ^3.0.4
- version: 3.1.0([email protected])
+ specifier: ^4.0.2
+ tailwindcss:
+ specifier: ^4.1.18
+ version: 4.1.18
tailwindcss-animate:
- specifier: ^1.0.5
- version: 1.0.7([email protected])
+ specifier: ^1.0.7
+ version: 1.0.7([email protected])
packages/tsconfig:
devDependencies:
@@ -791,7 +796,7 @@ importers:
version: 20.19.27
vitest:
specifier: ^4.0.16
packages:
@@ -2541,6 +2546,9 @@ packages:
resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
engines: {node: '>=6.0.0'}
+ '@jridgewell/[email protected]':
+ resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
'@jridgewell/[email protected]':
resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
engines: {node: '>=6.0.0'}
@@ -2639,8 +2647,8 @@ packages:
resolution: {integrity: sha512-lT1EBpFyGVN9u8M43f2jE78DsCu0A5KPA5OkF5PdIHrKDo4oTJ4lUQKciA9T2u9gccSXIPQcZb5TYkHF4f8iiw==}
- resolution: {integrity: sha512-yHDKVTcHrZy/8TWhj0B23ylKv5ypocuCwey9ZqPyv4rPdUdRzpGCkSi03t04KBPyU96kxVtUqx6O3nE1kpxASQ==}
+ resolution: {integrity: sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==}
resolution: {integrity: sha512-4GlTZ+EJM7WaW2HEZcyU317tIQDjkQIyENDLxYJfSWlfqguN+dHkZgyQTV/7ykvobU7yEH5gKvreNrH4B6QgIg==}
@@ -4479,8 +4487,96 @@ packages:
zod:
optional: true
- '@tailwindcss/[email protected]':
- resolution: {integrity: sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==}
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==}
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-dJHz7+Ugr9U/diKJA0W6N/6/cjI+ZTAoxPf9Iz9BFRF2GzEX8IvXxFIi/dZBloVJX/MZGvRuFA9rqwdiIEZQ0Q==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [android]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-FL5oxr2xQsFrc3X9o1fjHKBYBMD1QZNyc1Xzw/h5Qu4XnEBi3dZn96HcHm41c/euGV+GRiXFfh2hUCyKi/e+yw==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [darwin]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-Fj+RHgu5bDodmV1dM9yAxlfJwkkWvLiRjbhuO2LEtwtlYlBgiAT4x/j5wQr1tC3SANAgD+0YcmWVrj8R9trVMA==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [freebsd]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-Fp+Wzk/Ws4dZn+LV2Nqx3IilnhH51YZoRaYHQsVq3RQvEl+71VGKFpkfHrLM/Li+kt5c0DJe/bHXK1eHgDmdiA==}
+ engines: {node: '>= 10'}
+ cpu: [arm]
+ os: [linux]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-S0n3jboLysNbh55Vrt7pk9wgpyTTPD0fdQeh7wQfMqLPM/Hrxi+dVsLsPrycQjGKEQk85Kgbx+6+QnYNiHalnw==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [linux]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [linux]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==}
+ engines: {node: '>=14.0.0'}
+ cpu: [wasm32]
+ bundledDependencies:
+ - '@napi-rs/wasm-runtime'
+ - '@emnapi/core'
+ - '@emnapi/runtime'
+ - '@tybys/wasm-util'
+ - '@emnapi/wasi-threads'
+ - tslib
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-HjSA7mr9HmC8fu6bdsZvZ+dhjyGCLdotjVOgLA2vEqxEBZaQo9YTX4kwgEvPCpRh8o4uWc4J/wEoFzhEmjvPbA==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [win32]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [win32]
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==}
+ engines: {node: '>= 10'}
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-Ce0GFnzAOuPyfV5SxjXGn0CubwGcuDB0zcdaPuCSzAa/2vII24JTkH+I6jcbXLb1ctjZMZZI6OjDaLPJQL1S0g==}
+
+ '@tailwindcss/[email protected]':
+ resolution: {integrity: sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==}
peerDependencies:
tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
@@ -4748,6 +4844,9 @@ packages:
resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==}
+
resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}
@@ -5204,13 +5303,6 @@ packages:
resolution: {integrity: sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- resolution: {integrity: sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==}
- engines: {node: ^10 || ^12 || >=14}
- hasBin: true
- peerDependencies:
- postcss: ^8.1.0
-
resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
engines: {node: '>= 0.4'}
@@ -6067,8 +6159,8 @@ packages:
resolution: {integrity: sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==}
engines: {node: '>=10.2.0'}
- resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
+ resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
engines: {node: '>=10.13.0'}
@@ -6396,9 +6488,6 @@ packages:
resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
engines: {node: '>= 0.6'}
- resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
-
resolution: {integrity: sha512-R0O3Jdqbfwywpm45obP+8sTgafmdEcUoShQTAV+rB5pi+Y1Px/FYL5qLLRe5tPtBdN1J4jos7M+xN2VV2oEAbQ==}
peerDependencies:
@@ -7132,6 +7221,10 @@ packages:
resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}
hasBin: true
+ resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
+ hasBin: true
+
resolution: {integrity: sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg==}
@@ -7266,6 +7359,76 @@ packages:
resolution: {integrity: sha512-puehA3YKku3osqPlNuzGDUHq8WpwXupUg1V6NXdV38G+gr+gkBwFC8g1b/+YcIvp8gnqVIus+eJCH/eGsRmJNw==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ resolution: {integrity: sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [arm64]
+ os: [android]
+
+ resolution: {integrity: sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [arm64]
+ os: [darwin]
+
+ resolution: {integrity: sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [x64]
+ os: [darwin]
+
+ resolution: {integrity: sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [x64]
+ os: [freebsd]
+
+ resolution: {integrity: sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [arm]
+ os: [linux]
+
+ resolution: {integrity: sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [arm64]
+ os: [linux]
+
+ resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [arm64]
+ os: [linux]
+
+ resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [x64]
+ os: [linux]
+
+ resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [x64]
+ os: [linux]
+
+ resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [arm64]
+ os: [win32]
+
+ resolution: {integrity: sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==}
+ engines: {node: '>= 12.0.0'}
+ cpu: [x64]
+ os: [win32]
+
+ resolution: {integrity: sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==}
+ engines: {node: '>= 12.0.0'}
+
resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
engines: {node: '>=10'}
@@ -7297,18 +7460,9 @@ packages:
resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
- resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}
-
resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
- resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
- resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-
resolution: {integrity: sha512-1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg==}
@@ -7939,10 +8093,6 @@ packages:
resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
engines: {node: '>=0.10.0'}
- resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
- engines: {node: '>=0.10.0'}
-
resolution: {integrity: sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==}
engines: {node: '>=14.16'}
@@ -8289,6 +8439,11 @@ packages:
resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+ resolution: {integrity: sha512-ey8Ls/+Di31eqzUxC46h8MksNuGx/n0AAC8uKpwFau4RPDYLuE3EXTp8N8G2vX2N7UC/+IXeNUnlWBGGcAG+Ig==}
+ peerDependencies:
+ react: '>=16.0.0'
+
resolution: {integrity: sha512-JNricTXQxzDtRS7lCGGOB4g5DJ91eg3nozdubXze3LpcMl1oWwcFddrj++Up3jnRE6X/3gB/xz3V+ecBk/eEGA==}
engines: {node: '>=18.18'}
@@ -9200,27 +9355,25 @@ packages:
resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
- resolution: {integrity: sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==}
+ resolution: {integrity: sha512-wAQiIxAPqk0MNTPptVe/xoyWi27y+NRGnTwvn4PQnbvB9kp8QUBiGl/wsfoVBHnQxTmhXJSNt9NHTmcz9EivFA==}
engines: {node: '>=12.13.0'}
peerDependencies:
- tailwindcss: 3.x
+ tailwindcss: 4.x
resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
peerDependencies:
tailwindcss: '>=3.0.0 || insiders'
- resolution: {integrity: sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==}
- engines: {node: '>=14.0.0'}
- hasBin: true
-
resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==}
engines: {node: '>=14.0.0'}
hasBin: true
+ resolution: {integrity: sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==}
+
resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
engines: {node: '>=6'}
@@ -12048,6 +12201,11 @@ snapshots:
'@jridgewell/sourcemap-codec': 1.5.0
'@jridgewell/trace-mapping': 0.3.25
+ '@jridgewell/[email protected]':
+ dependencies:
+ '@jridgewell/gen-mapping': 0.3.13
+ '@jridgewell/trace-mapping': 0.3.30
+
'@jridgewell/[email protected]': {}
'@jridgewell/[email protected]': {}
@@ -12451,7 +12609,7 @@ snapshots:
- bufferutil
- utf-8-validate
- '@next/[email protected]': {}
+ '@next/[email protected]': {}
'@next/[email protected]': {}
@@ -14663,13 +14821,79 @@ snapshots:
typescript: 5.8.3
zod: 4.2.1
+ '@tailwindcss/[email protected]':
+ dependencies:
+ '@jridgewell/remapping': 2.3.5
+ enhanced-resolve: 5.18.3
+ jiti: 2.6.1
+ lightningcss: 1.30.2
+ magic-string: 0.30.21
+ source-map-js: 1.2.1
+ tailwindcss: 4.1.18
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optional: true
+
+ '@tailwindcss/[email protected]':
+ optionalDependencies:
+ '@tailwindcss/oxide-android-arm64': 4.1.18
+ '@tailwindcss/oxide-darwin-arm64': 4.1.18
+ '@tailwindcss/oxide-darwin-x64': 4.1.18
+ '@tailwindcss/oxide-freebsd-x64': 4.1.18
+ '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.18
+ '@tailwindcss/oxide-linux-arm64-gnu': 4.1.18
+ '@tailwindcss/oxide-linux-arm64-musl': 4.1.18
+ '@tailwindcss/oxide-linux-x64-gnu': 4.1.18
+ '@tailwindcss/oxide-linux-x64-musl': 4.1.18
+ '@tailwindcss/oxide-wasm32-wasi': 4.1.18
+ '@tailwindcss/oxide-win32-arm64-msvc': 4.1.18
+ '@tailwindcss/oxide-win32-x64-msvc': 4.1.18
+
+ '@tailwindcss/[email protected]':
+ dependencies:
+ '@alloc/quick-lru': 5.2.0
+ '@tailwindcss/node': 4.1.18
+ '@tailwindcss/oxide': 4.1.18
+ postcss: 8.5.6
+ tailwindcss: 4.1.18
+
dependencies:
- lodash.castarray: 4.4.0
- lodash.isplainobject: 4.0.6
- lodash.merge: 4.6.2
postcss-selector-parser: 6.0.10
- tailwindcss: 3.4.17
+ tailwindcss: 4.1.18
'@tanstack/[email protected]': {}
@@ -14953,6 +15177,8 @@ snapshots:
pg-protocol: 1.9.5
pg-types: 2.2.0
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -15063,7 +15289,7 @@ snapshots:
dependencies:
'@upstash/redis': 1.34.8
dependencies:
'@babel/core': 7.28.3
'@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/[email protected])
@@ -15071,7 +15297,7 @@ snapshots:
'@rolldown/pluginutils': 1.0.0-beta.30
'@types/babel__core': 7.20.5
react-refresh: 0.17.0
transitivePeerDependencies:
- supports-color
@@ -15084,13 +15310,13 @@ snapshots:
chai: 6.2.1
tinyrainbow: 3.0.3
dependencies:
'@vitest/spy': 4.0.16
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
'@vitest/[email protected]':
dependencies:
@@ -15421,16 +15647,6 @@ snapshots:
- dependencies:
- browserslist: 4.24.4
- caniuse-lite: 1.0.30001715
- fraction.js: 4.3.7
- normalize-range: 0.1.2
- picocolors: 1.1.1
- postcss: 8.5.6
- postcss-value-parser: 4.2.0
-
dependencies:
possible-typed-array-names: 1.1.0
@@ -15506,7 +15722,7 @@ snapshots:
dependencies:
@@ -15526,7 +15742,7 @@ snapshots:
prisma: 6.8.2([email protected])
react: 19.2.1
react-dom: 19.2.1([email protected])
dependencies:
@@ -16271,7 +16487,7 @@ snapshots:
- supports-color
- utf-8-validate
dependencies:
graceful-fs: 4.2.11
tapable: 2.2.1
@@ -16755,8 +16971,6 @@ snapshots:
-
dependencies:
motion-dom: 12.9.1
@@ -17744,6 +17958,8 @@ snapshots:
+
@@ -17869,6 +18085,55 @@ snapshots:
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ dependencies:
+ detect-libc: 2.1.2
+ optionalDependencies:
+ lightningcss-android-arm64: 1.30.2
+ lightningcss-darwin-arm64: 1.30.2
+ lightningcss-darwin-x64: 1.30.2
+ lightningcss-freebsd-x64: 1.30.2
+ lightningcss-linux-arm-gnueabihf: 1.30.2
+ lightningcss-linux-arm64-gnu: 1.30.2
+ lightningcss-linux-arm64-musl: 1.30.2
+ lightningcss-linux-x64-gnu: 1.30.2
+ lightningcss-linux-x64-musl: 1.30.2
+ lightningcss-win32-arm64-msvc: 1.30.2
+ lightningcss-win32-x64-msvc: 1.30.2
+
@@ -17890,14 +18155,8 @@ snapshots:
-
-
-
@@ -17952,7 +18211,7 @@ snapshots:
dependencies:
- '@jridgewell/sourcemap-codec': 1.5.0
+ '@jridgewell/sourcemap-codec': 1.5.5
@@ -18807,8 +19066,6 @@ snapshots:
-
@@ -19157,6 +19414,12 @@ snapshots:
ansi-styles: 5.2.0
react-is: 17.0.2
+ dependencies:
+ '@types/prismjs': 1.26.5
+ clsx: 2.1.1
+ react: 19.2.3
+
dependencies:
'@prisma/config': 6.8.2
@@ -20422,7 +20685,7 @@ snapshots:
dependencies:
- '@jridgewell/gen-mapping': 0.3.8
+ '@jridgewell/gen-mapping': 0.3.13
commander: 4.1.1
glob: 10.4.5
lines-and-columns: 1.2.4
@@ -20462,40 +20725,16 @@ snapshots:
dependencies:
- tailwindcss: 3.4.17
-
- dependencies:
- tailwindcss: 3.4.17
+ prism-react-renderer: 2.4.1([email protected])
+ tailwindcss: 4.1.18
+ transitivePeerDependencies:
+ - react
dependencies:
- '@alloc/quick-lru': 5.2.0
- arg: 5.0.2
- chokidar: 3.6.0
- didyoumean: 1.2.2
- dlv: 1.1.3
- fast-glob: 3.3.3
- glob-parent: 6.0.2
- is-glob: 4.0.3
- jiti: 1.21.7
- lilconfig: 3.1.3
- micromatch: 4.0.8
- normalize-path: 3.0.0
- object-hash: 3.0.0
- picocolors: 1.1.1
- postcss: 8.5.6
- postcss-import: 15.1.0([email protected])
- postcss-js: 4.0.1([email protected])
- postcss-load-config: 4.0.2([email protected])
- postcss-nested: 6.2.0([email protected])
- postcss-selector-parser: 6.1.2
- resolve: 1.22.10
- sucrase: 3.35.0
- transitivePeerDependencies:
- - ts-node
+ tailwindcss: 4.1.18
dependencies:
@@ -20524,6 +20763,8 @@ snapshots:
transitivePeerDependencies:
- ts-node
+
@@ -21008,7 +21249,7 @@ snapshots:
replace-ext: 2.0.0
teex: 1.0.1
dependencies:
esbuild: 0.27.2
fdir: 6.5.0([email protected])
@@ -21019,15 +21260,16 @@ snapshots:
optionalDependencies:
'@types/node': 20.19.27
fsevents: 2.3.3
- jiti: 2.4.2
+ jiti: 2.6.1
+ lightningcss: 1.30.2
terser: 5.39.0
tsx: 4.19.3
yaml: 2.7.1
dependencies:
'@vitest/expect': 4.0.16
'@vitest/pretty-format': 4.0.16
'@vitest/runner': 4.0.16
'@vitest/snapshot': 4.0.16
@@ -21044,7 +21286,7 @@ snapshots:
tinyexec: 1.0.2
tinyglobby: 0.2.15
tinyrainbow: 3.0.3
why-is-node-running: 2.3.0
optionalDependencies:
'@opentelemetry/api': 1.9.0
@@ -21130,7 +21372,7 @@ snapshots:
acorn: 8.14.1
browserslist: 4.24.4
chrome-trace-event: 1.0.4
- enhanced-resolve: 5.18.1
+ enhanced-resolve: 5.18.3
es-module-lexer: 1.7.0
eslint-scope: 5.1.1
events: 3.3.0