Skip to content

Commit

Permalink
chore(tailwind): update tailwind config
Browse files Browse the repository at this point in the history
  • Loading branch information
felixhoffmnn committed Oct 10, 2024
1 parent 7dbba2b commit ddb488f
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 70 deletions.
4 changes: 3 additions & 1 deletion astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export default defineConfig({
remarkPlugins: [remarkMath],
},
integrations: [
tailwind(),
tailwind({
applyBaseStyles: false,
}),
sitemap(),
react(),
icon({
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@
"react-dom": "^18.3.1",
"remark-math": "^6.0.0",
"sharp": "^0.32.6",
"tailwind-merge": "^2.5.2",
"tailwindcss": "^3.4.10",
"tailwindcss-animate": "^1.0.7"
"tailwind-merge": "^2.5.3",
"tailwindcss": "^3.4.13"
},
"devDependencies": {
"@biomejs/biome": "1.9.3",
"@mermaid-js/mermaid-cli": "^10.9.1",
"@tailwindcss/typography": "^0.5.14",
"@tailwindcss/typography": "^0.5.15",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"globals": "^15.9.0",
Expand All @@ -49,6 +48,7 @@
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-tailwindcss": "^0.6.8",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.5.4"
},
"lint-staged": {
Expand Down
4 changes: 1 addition & 3 deletions src/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@
}
body {
@apply bg-background text-foreground;
font-feature-settings:
"rlig" 1,
"calt" 1;
font-feature-settings: "rlig" 1, "calt" 1;
}
}
62 changes: 0 additions & 62 deletions tailwind.config.js

This file was deleted.

64 changes: 64 additions & 0 deletions tailwind.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// tailwind.config.js
import defaultTheme from "tailwindcss/defaultTheme";

/** @type {import('tailwindcss').Config} */
export default {
darkMode: "selector",
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
theme: {
extend: {
container: {
center: true,
padding: "1.5rem",
screens: {
"2xl": "1400px",
},
},
colors: {
border: "hsl(var(--border))",
input: "hsl(var(--input))",
ring: "hsl(var(--ring))",
background: "hsl(var(--background))",
foreground: "hsl(var(--foreground))",
primary: {
DEFAULT: "hsl(var(--primary))",
foreground: "hsl(var(--primary-foreground))",
},
secondary: {
DEFAULT: "hsl(var(--secondary))",
foreground: "hsl(var(--secondary-foreground))",
},
destructive: {
DEFAULT: "hsl(var(--destructive))",
foreground: "hsl(var(--destructive-foreground))",
},
muted: {
DEFAULT: "hsl(var(--muted))",
foreground: "hsl(var(--muted-foreground))",
},
accent: {
DEFAULT: "hsl(var(--accent))",
foreground: "hsl(var(--accent-foreground))",
},
popover: {
DEFAULT: "hsl(var(--popover))",
foreground: "hsl(var(--popover-foreground))",
},
card: {
DEFAULT: "hsl(var(--card))",
foreground: "hsl(var(--card-foreground))",
},
},
borderRadius: {
lg: "var(--radius)",
md: "calc(var(--radius) - 2px)",
sm: "calc(var(--radius) - 4px)",
},
fontFamily: {
inter: ["Inter", ...defaultTheme.fontFamily.sans],
outfit: ["Outfit", ...defaultTheme.fontFamily.sans],
},
},
},
plugins: [require("tailwindcss-animate"), require("@tailwindcss/typography")],
};

0 comments on commit ddb488f

Please sign in to comment.