Skip to content

Commit e968d61

Browse files
Seme30Seme30
authored
Merge branch 'dev' into update-dependency-tailwindcss-to-v4
2 parents 2ec3fe8 + f8792d9 commit e968d61

File tree

3 files changed

+142
-59
lines changed

3 files changed

+142
-59
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"url": "github:atlas-bi/website"
6060
},
6161
"scripts": {
62-
"build": "ELEVENTY_PRODUCTION=true eleventy && NODE_ENV=production tailwindcss -i src/static/styles/global.css -o _site/static/css/style.css --minify && npm run updateSearch",
63-
"build:ci": "ELEVENTY_PRODUCTION=true eleventy && NODE_ENV=production tailwindcss -i src/static/styles/global.css -o _site/static/css/style.css --minify",
62+
"build": "ELEVENTY_PRODUCTION=true eleventy && NODE_ENV=production npx @tailwindcss/cli -i src/static/styles/global.css -c tailwind.config.js -o _site/static/css/style.css --minify && npm run updateSearch",
63+
"build:ci": "ELEVENTY_PRODUCTION=true eleventy && NODE_ENV=production npx @tailwindcss/cli -i src/static/styles/global.css -c tailwind.config.js -o _site/static/css/style.css --minify",
6464
"start": "run-p 11ty:start tailwind:process",
6565
"11ty:start": "ELEVENTY_PRODUCTION=true eleventy --serve --watch",
6666
"updateSearch": "dotenv node ./src/search/update-algolia-index.js",
@@ -72,7 +72,7 @@
7272
"format:prettier": "prettier --config .prettierrc \"src/**/*.{ts,css,less,scss,js,json,md,yaml,html}\" --write",
7373
"format:djlint": "djlint src -e njk --reformat --quiet --warn",
7474
"commit": "git add . && npm run pre-commit && cz --no-verify",
75-
"tailwind:process": "tailwindcss -i src/static/styles/global.css -o _site/static/css/style.css --watch"
75+
"tailwind:process": "npx @tailwindcss/cli -i src/static/styles/global.css -c tailwind.config.js -o _site/static/css/style.css --watch"
7676
},
7777
"lint-staged": {
7878
"src/**/*.{ts,css,less,scss,js,json,md,yaml,html}": [

‎src/static/styles/global.css‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,7 @@
11
@import "tailwindcss";
2-
3-
/* stylelint-disable at-rule-no-unknown */
42
@plugin "@tailwindcss/typography";
53
@plugin "tailwindcss-animate";
64
@plugin "tailwindcss-animated";
7-
@source "../../**/*.{html,njk,md,svg,js}";
8-
9-
@theme {
10-
11-
--color-border: hsl(var(--border));
12-
--color-input: hsl(var(--input));
13-
--color-ring: hsl(var(--ring));
14-
--color-background: hsl(var(--background));
15-
--color-foreground: hsl(var(--foreground));
16-
17-
--color-primary: hsl(var(--primary));
18-
--color-primary-foreground: hsl(var(--primary-foreground));
19-
20-
--color-secondary: hsl(var(--secondary));
21-
--color-secondary-foreground: hsl(var(--secondary-foreground));
22-
23-
--color-destructive: hsl(var(--destructive));
24-
--color-destructive-foreground: hsl(var(--destructive-foreground));
25-
26-
--color-muted: hsl(var(--muted));
27-
--color-muted-foreground: hsl(var(--muted-foreground));
28-
29-
--color-accent: hsl(var(--accent));
30-
--color-accent-foreground: hsl(var(--accent-foreground));
31-
32-
--color-popover: hsl(var(--popover));
33-
--color-popover-foreground: hsl(var(--popover-foreground));
34-
35-
--color-card: hsl(var(--card));
36-
--color-card-foreground: hsl(var(--card-foreground));
37-
38-
--radius-lg: var(--radius);
39-
--radius-md: calc(var(--radius) - 2px);
40-
--radius-sm: calc(var(--radius) - 4px);
41-
42-
--animate-accordion-down: accordion-down 0.2s ease-out;
43-
--animate-accordion-up: accordion-up 0.2s ease-out;
44-
45-
@keyframes accordion-down {
46-
from { height: 0; }
47-
to { height: var(--radix-accordion-content-height); }
48-
}
49-
@keyframes accordion-up {
50-
from { height: var(--radix-accordion-content-height); }
51-
to { height: 0; }
52-
}
53-
}
54-
55-
@utility container {
56-
margin-inline: auto;
57-
padding-inline: 2rem;
58-
}
59-
60-
/* stylelint-enable at-rule-no-unknown */
615

626
@layer base {
637
:root {

‎tailwind.config.js‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
const colors = require('tailwindcss/colors');
2+
3+
/** @type {import('tailwindcss').Config} */
4+
module.exports = {
5+
content: ['./src/**/*.{html,njk,md,svg,js}'],
6+
safelist: [
7+
'w-4',
8+
'h-4',
9+
'w-5',
10+
'h-5',
11+
'mt-8',
12+
'rounded',
13+
'rounded-lg',
14+
'text-3xl',
15+
'sm:text-4xl',
16+
'font-extrabold',
17+
'text-slate-900',
18+
'tracking-tight',
19+
'dark:text-slate-200',
20+
'group',
21+
'flex',
22+
'whitespace-pre-wrap',
23+
'-ml-4',
24+
'pl-4',
25+
'absolute',
26+
'-ml-7',
27+
'flex',
28+
'items-center',
29+
'opacity-0',
30+
'border-0',
31+
'group-hover:opacity-100',
32+
'text-blue-400',
33+
'hover:text-blue-800',
34+
'transition-colors',
35+
'no-underline',
36+
'bg-slate-200',
37+
'py-1',
38+
'-my-1',
39+
'border-b',
40+
'hover:text-slate-900',
41+
'dark:hover:text-slate-400',
42+
'text-sky-500',
43+
'hover:text-sky-600',
44+
'overflow-hidden',
45+
'relative',
46+
'w-full',
47+
'rounded-lg',
48+
'border',
49+
'p-4',
50+
'[&>svg]:absolute',
51+
'[&>svg]:text-foreground',
52+
'[&>svg]:left-4',
53+
'[&>svg]:top-4',
54+
'[&>svg+div]:translate-y-[-3px]',
55+
'[&:has(svg)]:pl-11',
56+
'bg-background',
57+
'text-foreground',
58+
'mb-1',
59+
'font-medium',
60+
'leading-none',
61+
'tracking-tight',
62+
'text-sm',
63+
'[&_p]:leading-relaxed',
64+
'mt-0',
65+
'bg-slate-900/80',
66+
],
67+
theme: {
68+
container: {
69+
center: true,
70+
padding: '2rem',
71+
screens: {
72+
'2xl': '1400px',
73+
},
74+
},
75+
extend: {
76+
colors: {
77+
slate: colors.slate,
78+
sky: colors.sky,
79+
border: 'hsl(var(--border))',
80+
input: 'hsl(var(--input))',
81+
ring: 'hsl(var(--ring))',
82+
background: 'hsl(var(--background))',
83+
foreground: 'hsl(var(--foreground))',
84+
primary: {
85+
DEFAULT: 'hsl(var(--primary))',
86+
foreground: 'hsl(var(--primary-foreground))',
87+
},
88+
secondary: {
89+
DEFAULT: 'hsl(var(--secondary))',
90+
foreground: 'hsl(var(--secondary-foreground))',
91+
},
92+
destructive: {
93+
DEFAULT: 'hsl(var(--destructive))',
94+
foreground: 'hsl(var(--destructive-foreground))',
95+
},
96+
muted: {
97+
DEFAULT: 'hsl(var(--muted))',
98+
foreground: 'hsl(var(--muted-foreground))',
99+
},
100+
accent: {
101+
DEFAULT: 'hsl(var(--accent))',
102+
foreground: 'hsl(var(--accent-foreground))',
103+
},
104+
popover: {
105+
DEFAULT: 'hsl(var(--popover))',
106+
foreground: 'hsl(var(--popover-foreground))',
107+
},
108+
card: {
109+
DEFAULT: 'hsl(var(--card))',
110+
foreground: 'hsl(var(--card-foreground))',
111+
},
112+
},
113+
borderRadius: {
114+
lg: 'var(--radius)',
115+
md: 'calc(var(--radius) - 2px)',
116+
sm: 'calc(var(--radius) - 4px)',
117+
},
118+
keyframes: {
119+
'accordion-down': {
120+
from: { height: 0 },
121+
to: { height: 'var(--radix-accordion-content-height)' },
122+
},
123+
'accordion-up': {
124+
from: { height: 'var(--radix-accordion-content-height)' },
125+
to: { height: 0 },
126+
},
127+
},
128+
animation: {
129+
'accordion-down': 'accordion-down 0.2s ease-out',
130+
'accordion-up': 'accordion-up 0.2s ease-out',
131+
},
132+
},
133+
},
134+
plugins: [
135+
require('tailwindcss-animated'),
136+
require('tailwindcss-animate'),
137+
require('@tailwindcss/typography'),
138+
],
139+
};

0 commit comments

Comments
 (0)