Skip to content

Commit 5a4f817

Browse files
committed
Integrate @objectql/ui and enhance Tailwind config
Added @objectql/ui CSS import to main.tsx and updated Tailwind configuration to include custom color palette, container settings, border radius, and accordion animations. Integrated tailwindcss-animate plugin and expanded content paths for better compatibility with @objectql/ui components. Updated dependencies in package.json accordingly.
1 parent d488d81 commit 5a4f817

File tree

4 files changed

+100
-13
lines changed

4 files changed

+100
-13
lines changed

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/client/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"preview": "vite preview"
1212
},
1313
"dependencies": {
14-
"react": "^18.3.1",
15-
"react-dom": "^18.3.1",
1614
"@objectql/ui": "*",
17-
"lucide-react": "^0.344.0",
1815
"clsx": "^2.1.0",
16+
"lucide-react": "^0.344.0",
17+
"react": "^18.3.1",
18+
"react-dom": "^18.3.1",
1919
"tailwind-merge": "^2.2.1"
2020
},
2121
"devDependencies": {
@@ -30,6 +30,7 @@
3030
"globals": "^15.14.0",
3131
"postcss": "^8.4.49",
3232
"tailwindcss": "^3.4.17",
33+
"tailwindcss-animate": "^1.0.7",
3334
"typescript": "~5.6.2",
3435
"typescript-eslint": "^8.18.2",
3536
"vite": "^6.0.5"

packages/client/src/main.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import ReactDOM from 'react-dom/client'
33
import App from './App'
4+
import '@objectql/ui/dist/index.css'
45
import './index.css'
56

67
ReactDOM.createRoot(document.getElementById('root')!).render(

packages/client/tailwind.config.js

Lines changed: 94 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,96 @@
1+
import tailwindcssAnimate from "tailwindcss-animate"
2+
13
/** @type {import('tailwindcss').Config} */
24
export default {
3-
content: [
4-
"./index.html",
5-
"./src/**/*.{js,ts,jsx,tsx}",
6-
"../ui/src/**/*.{js,ts,jsx,tsx}"
7-
],
8-
theme: {
9-
extend: {},
10-
},
11-
plugins: [],
12-
}
5+
darkMode: ["class"],
6+
content: [
7+
"./index.html",
8+
"./src/**/*.{js,ts,jsx,tsx}",
9+
"../ui/src/**/*.{js,ts,jsx,tsx}",
10+
"../../node_modules/@objectql/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+
}

0 commit comments

Comments
 (0)