Skip to content

Tailwind v4 upgrade #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kentcdodds wants to merge 1 commit into from
Closed

Tailwind v4 upgrade #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions app/routes/_app+/_marketing+/tailwind-preset.ts
View file
Open in desktop

This file was deleted.

259 changes: 203 additions & 56 deletions app/styles/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,230 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';
@import 'tw-animate-css';

@layer base {
:root {
/* --font-sans: here if you have one */
/* --font-mono: here if you got it... */
@custom-variant dark (&:is(.dark *));

/* prefixed with foreground because it should look good on the background */
--foreground-destructive: 345 82.7% 40.8%;
:root {
/* --font-sans: here if you have one */
/* --font-mono: here if you got it... */

--background: 0 0% 100%;
--foreground: 222.2 84% 4.9%;
/* prefixed with foreground because it should look good on the background */
--foreground-destructive: 345 82.7% 40.8%;

--muted: 210 40% 93%;
--muted-foreground: 215.4 16.3% 30%;
--background: 0 0% 100%;
--foreground: 222.2 84% 4.9%;

--muted-secondary: 210 40% 93%;
--muted-secondary-foreground: 215.4 9.3% 41%;
--muted: 210 40% 93%;
--muted-foreground: 215.4 16.3% 30%;

--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--muted-secondary: 210 40% 93%;
--muted-secondary-foreground: 215.4 9.3% 41%;

--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;

--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--input-invalid: 0 84.2% 60.2%;
--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;

--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;
--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--input-invalid: 0 84.2% 60.2%;

--secondary: 210 20% 83%;
--secondary-foreground: 222.2 47.4% 11.2%;
--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;

--accent: 210 40% 90%;
--accent-foreground: 222.2 47.4% 11.2%;
--secondary: 210 20% 83%;
--secondary-foreground: 222.2 47.4% 11.2%;

--destructive: 0 70% 50%;
--destructive-foreground: 210 40% 98%;
--accent: 210 40% 90%;
--accent-foreground: 222.2 47.4% 11.2%;

--ring: 215 20.2% 65.1%;
--destructive: 0 70% 50%;
--destructive-foreground: 210 40% 98%;

--radius: 0.5rem;
}
--ring: 215 20.2% 65.1%;

--radius: 0.5rem;
}

.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;

/* prefixed with foreground because it should look good on the background */
--foreground-destructive: -4 84% 60%;

--muted: 217.2 32.6% 12%;
--muted-foreground: 215 20.2% 65.1%;

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--input-invalid: 0 62.8% 30.6%;

--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;

--secondary: 217.2 20% 24%;
--secondary-foreground: 210 40% 98%;

.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;
--accent: 217.2 32.6% 10%;
--accent-foreground: 210 40% 98%;

/* prefixed with foreground because it should look good on the background */
--foreground-destructive: -4 84% 60%;
--destructive: 0 60% 40%;
--destructive-foreground: 0 85.7% 97.3%;

--muted: 217.2 32.6% 12%;
--muted-foreground: 215 20.2% 65.1%;
--ring: 217.2 32.6% 60%;
}

@theme inline {
--radius-sm: calc(var(--radius) - 4px);
--radius-md: calc(var(--radius) - 2px);
--radius-lg: var(--radius);
--color-background: hsl(var(--background));
--color-foreground: hsl(var(--foreground));
--color-card: hsl(var(--card));
--color-card-foreground: hsl(var(--card-foreground));
--color-popover: hsl(var(--popover));
--color-popover-foreground: hsl(var(--popover-foreground));
--color-primary: hsl(var(--primary));
--color-primary-foreground: hsl(var(--primary-foreground));
--color-secondary: hsl(var(--secondary));
--color-secondary-foreground: hsl(var(--secondary-foreground));
--color-muted: hsl(var(--muted));
--color-muted-foreground: hsl(var(--muted-foreground));
--color-muted-secondary: hsl(var(--muted-secondary));
--color-muted-secondary-foreground: hsl(var(--muted-secondary-foreground));
--color-accent: hsl(var(--accent));
--color-accent-foreground: hsl(var(--accent-foreground));
--color-border: hsl(var(--border));
--color-input: hsl(var(--input));
--color-input-invalid: hsl(var(--input-invalid));
--color-ring: hsl(var(--ring));
--color-ring-invalid: hsl(var(--foreground-destructive));
--color-destructive: hsl(var(--destructive));
--color-destructive-foreground: hsl(var(--destructive-foreground));
--color-foreground-destructive: hsl(var(--foreground-destructive));
}

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
@theme {
--text-mega: 5rem;
--text-mega--line-height: 5.25rem;
--text-mega--font-weight: 700;
--text-h1: 3.5rem;
--text-h1--line-height: 3.875rem;
--text-h1--font-weight: 700;
--text-h2: 2.5rem;
--text-h2--line-height: 3rem;
--text-h2--font-weight: 700;
--text-h3: 2rem;
--text-h3--line-height: 2.25rem;
--text-h3--font-weight: 700;
--text-h4: 1.75rem;
--text-h4--line-height: 2.25rem;
--text-h4--font-weight: 700;
--text-h5: 1.5rem;
--text-h5--line-height: 2rem;
--text-h5--font-weight: 700;
--text-h6: 1rem;
--text-h6--line-height: 1.25rem;
--text-h6--font-weight: 700;
--text-body-2xl: 2rem;
--text-body-2xl--line-height: 2.25rem;
--text-body-xl: 1.75rem;
--text-body-xl--line-height: 2.25rem;
--text-body-lg: 1.5rem;
--text-body-lg--line-height: 2rem;
--text-body-md: 1.25rem;
--text-body-md--line-height: 1.75rem;
--text-body-sm: 1rem;
--text-body-sm--line-height: 1.25rem;
--text-body-xs: 0.875rem;
--text-body-xs--line-height: 1.125rem;
--text-body-2xs: 0.75rem;
--text-body-2xs--line-height: 1rem;
--text-caption: 1.125rem;
--text-caption--line-height: 1.5rem;
--text-caption--font-weight: 600;
--text-button: 0.75rem;
--text-button--line-height: 1rem;
--text-button--font-weight: 700;
--animate-roll-reveal: roll-reveal 0.4s cubic-bezier(0.22, 1.28, 0.54, 0.99);
--animate-slide-left: slide-left 0.3s ease-out;
--animate-slide-top: slide-top 0.3s ease-out;
--animate-caret-blink: caret-blink 1.25s ease-out infinite;

@keyframes roll-reveal {
from {
transform: rotate(12deg) scale(0);
opacity: 0;
}

to {
transform: rotate(0deg) scale(1);
opacity: 1;
}
}

@keyframes slide-left {
from {
transform: translateX(20px);
opacity: 0;
}

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;
to {
transform: translateX(0px);
opacity: 1;
}
}

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--input-invalid: 0 62.8% 30.6%;
@keyframes slide-top {
from {
transform: translateY(20px);
opacity: 0;
}

--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;
to {
transform: translateY(0px);
opacity: 1;
}
}

--secondary: 217.2 20% 24%;
--secondary-foreground: 210 40% 98%;
@keyframes caret-blink {
0%,
70%,
100% {
opacity: 1;
}

20%,
50% {
opacity: 0;
}
}
}

--accent: 217.2 32.6% 10%;
--accent-foreground: 210 40% 98%;
@utility container {
margin-inline: auto;
padding-inline: 2rem;

--destructive: 0 60% 40%;
--destructive-foreground: 0 85.7% 97.3%;
@media (width >=1400px) {
& {
max-width: 1400px;
}
}
}

--ring: 217.2 32.6% 60%;
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: hsl(var(--border));
}
}
4 changes: 1 addition & 3 deletions app/utils/extended-theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { type Config } from 'tailwindcss'

export const extendedTheme = {
colors: {
border: 'hsl(var(--border))',
Expand Down Expand Up @@ -103,4 +101,4 @@ export const extendedTheme = {
animation: {
'caret-blink': 'caret-blink 1.25s ease-out infinite',
},
} satisfies Config['theme']
}
2 changes: 1 addition & 1 deletion components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"style": "default",
"rsc": false,
"tailwind": {
"config": "tailwind.config.ts",
"config": "",
"css": "app/styles/tailwind.css",
"baseColor": "slate",
"cssVariables": true
Expand Down
Loading
Loading