Merge pull request #12030 from alexanderson1993/v7-template-css-config

Use Tailwind v4's CSS-based config
remix-run · Sep 24, 2024 · ba4be6b · ba4be6b
2 parents f89e18c + f5d3d6e
commit ba4be6b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/contributors.yml b/contributors.yml
@@ -15,6 +15,7 @@
 - alany411
 - alberto
 - alexandernanberg
+- alexanderson1993
 - alexlbr
 - AmRo045
 - amsal

diff --git a/templates/basic/app/app.css b/templates/basic/app/app.css
@@ -1,5 +1,9 @@
 @import "tailwindcss";
 
+@theme {
+  --font-family-sans: 'Inter', ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+}
+
 html,
 body {
   @apply bg-white dark:bg-gray-950;

diff --git a/templates/basic/tailwind.config.ts b/templates/basic/tailwind.config.ts