Skip to content

Commit db73ddd

Browse files
hotlonghotlong
authored
Merge pull request #90 from objectstack-ai/copilot/fix-page-style-issues
2 parents 4688a21 + 424a028 commit db73ddd

File tree

14 files changed

+277
-497
lines changed

14 files changed

+277
-497
lines changed

‎apps/site/app/global.css‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';
2+
@import 'fumadocs-ui/style.css';
3+
4+
@theme {
5+
/* Colors - using CSS custom properties */
6+
--color-background: hsl(var(--background));
7+
--color-foreground: hsl(var(--foreground));
8+
--color-card: hsl(var(--card));
9+
--color-card-foreground: hsl(var(--card-foreground));
10+
--color-popover: hsl(var(--popover));
11+
--color-popover-foreground: hsl(var(--popover-foreground));
12+
--color-primary: hsl(var(--primary));
13+
--color-primary-foreground: hsl(var(--primary-foreground));
14+
--color-secondary: hsl(var(--secondary));
15+
--color-secondary-foreground: hsl(var(--secondary-foreground));
16+
--color-muted: hsl(var(--muted));
17+
--color-muted-foreground: hsl(var(--muted-foreground));
18+
--color-accent: hsl(var(--accent));
19+
--color-accent-foreground: hsl(var(--accent-foreground));
20+
--color-destructive: hsl(var(--destructive));
21+
--color-destructive-foreground: hsl(var(--destructive-foreground));
22+
--color-border: hsl(var(--border));
23+
--color-input: hsl(var(--input));
24+
--color-ring: hsl(var(--ring));
25+
}
426

527
@layer base {
628
:root {
@@ -47,3 +69,5 @@
4769
--ring: 212.7 26.8% 83.9%;
4870
}
4971
}
72+
73+
@plugin "@tailwindcss/typography";

‎apps/site/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"@types/node": "^22.10.6",
2626
"@types/react": "^19.0.11",
2727
"@types/react-dom": "^19.0.5",
28-
"autoprefixer": "^10.4.20",
2928
"postcss": "^8.4.49",
3029
"tailwindcss": "^4.1.0",
3130
"typescript": "^5.6.3"

‎apps/site/postcss.config.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export default {
22
plugins: {
33
'@tailwindcss/postcss': {},
4-
autoprefixer: {},
54
},
65
};

‎apps/site/tailwind.config.ts‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,6 @@ const config: Config = {
1010
'./mdx-components.{ts,tsx}',
1111
'./node_modules/fumadocs-ui/dist/**/*.js',
1212
],
13-
theme: {
14-
extend: {
15-
colors: {
16-
background: 'hsl(var(--background))',
17-
foreground: 'hsl(var(--foreground))',
18-
card: 'hsl(var(--card))',
19-
'card-foreground': 'hsl(var(--card-foreground))',
20-
popover: 'hsl(var(--popover))',
21-
'popover-foreground': 'hsl(var(--popover-foreground))',
22-
primary: 'hsl(var(--primary))',
23-
'primary-foreground': 'hsl(var(--primary-foreground))',
24-
secondary: 'hsl(var(--secondary))',
25-
'secondary-foreground': 'hsl(var(--secondary-foreground))',
26-
muted: 'hsl(var(--muted))',
27-
'muted-foreground': 'hsl(var(--muted-foreground))',
28-
accent: 'hsl(var(--accent))',
29-
'accent-foreground': 'hsl(var(--accent-foreground))',
30-
destructive: 'hsl(var(--destructive))',
31-
'destructive-foreground': 'hsl(var(--destructive-foreground))',
32-
border: 'hsl(var(--border))',
33-
input: 'hsl(var(--input))',
34-
ring: 'hsl(var(--ring))',
35-
},
36-
typography: {
37-
DEFAULT: {
38-
css: {
39-
maxWidth: 'none',
40-
},
41-
},
42-
},
43-
},
44-
},
45-
plugins: [require('@tailwindcss/typography')],
4613
};
4714

4815
export default config;

‎apps/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
},
2929
"devDependencies": {
3030
"@eslint/js": "^9.17.0",
31+
"@tailwindcss/postcss": "^4.1.18",
3132
"@types/react": "^19.0.11",
3233
"@types/react-dom": "^19.0.5",
3334
"@vitejs/plugin-react": "^4.3.4",
34-
"autoprefixer": "^10.4.20",
3535
"eslint": "^9.17.0",
3636
"eslint-plugin-react-hooks": "^5.0.0",
3737
"eslint-plugin-react-refresh": "^0.4.16",
3838
"globals": "^15.14.0",
3939
"postcss": "^8.4.49",
40-
"tailwindcss": "^3.4.17",
40+
"tailwindcss": "^4.1.18",
4141
"tailwindcss-animate": "^1.0.7",
4242
"typescript": "~5.6.2",
4343
"typescript-eslint": "^8.18.2",

‎apps/web/postcss.config.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export default {
22
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
3+
'@tailwindcss/postcss': {},
54
},
65
}

‎apps/web/src/index.css‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';

‎apps/web/tailwind.config.js‎

Lines changed: 5 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,7 @@
1-
import tailwindcssAnimate from "tailwindcss-animate"
2-
31
/** @type {import('tailwindcss').Config} */
42
export default {
5-
darkMode: ["class"],
6-
content: [
7-
"./index.html",
8-
"./src/**/*.{js,ts,jsx,tsx}",
9-
"../ui/src/**/*.{js,ts,jsx,tsx}",
10-
"../../node_modules/@objectos/ui/dist/**/*.{js,mjs}"
11-
],
12-
theme: {
13-
container: {
14-
center: true,
15-
padding: '2rem',
16-
screens: {
17-
'2xl': '1400px'
18-
}
19-
},
20-
extend: {
21-
colors: {
22-
border: 'hsl(var(--border))',
23-
input: 'hsl(var(--input))',
24-
ring: 'hsl(var(--ring))',
25-
background: 'hsl(var(--background))',
26-
foreground: 'hsl(var(--foreground))',
27-
primary: {
28-
DEFAULT: 'hsl(var(--primary))',
29-
foreground: 'hsl(var(--primary-foreground))'
30-
},
31-
secondary: {
32-
DEFAULT: 'hsl(var(--secondary))',
33-
foreground: 'hsl(var(--secondary-foreground))'
34-
},
35-
destructive: {
36-
DEFAULT: 'hsl(var(--destructive))',
37-
foreground: 'hsl(var(--destructive-foreground))'
38-
},
39-
muted: {
40-
DEFAULT: 'hsl(var(--muted))',
41-
foreground: 'hsl(var(--muted-foreground))'
42-
},
43-
accent: {
44-
DEFAULT: 'hsl(var(--accent))',
45-
foreground: 'hsl(var(--accent-foreground))'
46-
},
47-
popover: {
48-
DEFAULT: 'hsl(var(--popover))',
49-
foreground: 'hsl(var(--popover-foreground))'
50-
},
51-
card: {
52-
DEFAULT: 'hsl(var(--card))',
53-
foreground: 'hsl(var(--card-foreground))'
54-
},
55-
sidebar: {
56-
DEFAULT: 'hsl(var(--sidebar-background))',
57-
foreground: 'hsl(var(--sidebar-foreground))',
58-
primary: 'hsl(var(--sidebar-primary))',
59-
'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
60-
accent: 'hsl(var(--sidebar-accent))',
61-
'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
62-
border: 'hsl(var(--sidebar-border))',
63-
ring: 'hsl(var(--sidebar-ring))'
64-
}
65-
},
66-
borderRadius: {
67-
lg: 'var(--radius)',
68-
md: 'calc(var(--radius) - 2px)',
69-
sm: 'calc(var(--radius) - 4px)'
70-
},
71-
keyframes: {
72-
'accordion-down': {
73-
from: {
74-
height: '0'
75-
},
76-
to: {
77-
height: 'var(--radix-accordion-content-height)'
78-
}
79-
},
80-
'accordion-up': {
81-
from: {
82-
height: 'var(--radix-accordion-content-height)'
83-
},
84-
to: {
85-
height: '0'
86-
}
87-
}
88-
},
89-
animation: {
90-
'accordion-down': 'accordion-down 0.2s ease-out',
91-
'accordion-up': 'accordion-up 0.2s ease-out'
92-
}
93-
}
94-
},
95-
plugins: [tailwindcssAnimate],
96-
}
3+
content: [
4+
"./index.html",
5+
"./src/**/*.{js,ts,jsx,tsx}",
6+
],
7+
}

‎packages/ui/package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"dist"
1111
],
1212
"scripts": {
13-
"build": "tsup",
13+
"build": "npm run build:css && tsup",
14+
"build:css": "postcss src/styles.css -o dist/index.css",
1415
"dev": "tsup --watch",
1516
"lint": "eslint src/**",
1617
"test": "vitest run",
@@ -23,16 +24,17 @@
2324
"react-dom": ">=18"
2425
},
2526
"devDependencies": {
27+
"@tailwindcss/postcss": "^4.1.18",
2628
"@testing-library/jest-dom": "^6.9.1",
2729
"@testing-library/react": "^16.3.1",
2830
"@types/react": "^19.0.11",
2931
"@types/react-dom": "^19.0.5",
30-
"autoprefixer": "^10.4.0",
3132
"jsdom": "^27.4.0",
3233
"postcss": "^8.4.0",
34+
"postcss-cli": "^11.0.0",
3335
"react": "^18.2.0",
3436
"react-dom": "^18.2.0",
35-
"tailwindcss": "^3.4.0",
37+
"tailwindcss": "^4.1.18",
3638
"tsup": "^8.0.0",
3739
"typescript": "^5.0.0",
3840
"vitest": "^4.0.16"

‎packages/ui/postcss.config.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
22
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
3+
'@tailwindcss/postcss': {},
54
},
65
}

0 commit comments

Comments
 (0)