diff --git a/bun.lockb b/bun.lockb index 9fb639b..94f308a 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index c03f879..86f8367 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dev": "bun run --watch src/index.tsx", "hot": "bun run --hot src/index.tsx", "format": "eslint --fix .", - "build": "postcss ./src/main.css -o ./public/generated.css", + "build": "bunx @tailwindcss/cli -i ./src/main.css -o ./public/generated.css", "lint": "run-p 'lint:*'", "lint:tsc": "tsc --noEmit", "lint:knip": "knip", @@ -29,6 +29,8 @@ "@eslint/js": "^9.18.0", "@ianvs/prettier-plugin-sort-imports": "^4.4.1", "@kitajs/ts-html-plugin": "^4.1.1", + "@tailwindcss/cli": "^4.0.3", + "@tailwindcss/postcss": "^4.0.3", "@total-typescript/ts-reset": "^0.6.1", "@types/bun": "^1.2.0", "@types/eslint-plugin-tailwindcss": "^3.17.0", @@ -47,8 +49,8 @@ "postcss": "^8.5.1", "postcss-cli": "^11.0.0", "prettier": "^3.4.2", - "tailwind-scrollbar": "^3.1.0", - "tailwindcss": "^3.4.17", + "tailwind-scrollbar": "^4.0.0", + "tailwindcss": "^4.0.0", "typescript": "^5.7.3", "typescript-eslint": "^8.21.0" } diff --git a/postcss.config.js b/postcss.config.js index 1915b6a..5ba0f7a 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,8 +1,5 @@ -import autoprefixer from "autoprefixer"; -import cssnano from "cssnano"; -import tailwind from "tailwindcss"; -import tailwindConfig from "./tailwind.config.js"; - export default { - plugins: [autoprefixer, tailwind(tailwindConfig), cssnano], -}; + plugins: { + "@tailwindcss/postcss": {}, + }, +}; \ No newline at end of file diff --git a/src/components/base.tsx b/src/components/base.tsx index b5e6c00..9f3db2e 100644 --- a/src/components/base.tsx +++ b/src/components/base.tsx @@ -1,40 +1,40 @@ -import { Html } from "@elysiajs/html"; - -export const BaseHtml = ({ - children, - title = "ConvertX", - webroot = "", -}: { - children: JSX.Element; - title?: string; - webroot?: string; -}) => ( - - - - - - {title} - - - - - - - {children} - -); +import { Html } from "@elysiajs/html"; + +export const BaseHtml = ({ + children, + title = "ConvertX", + webroot = "", +}: { + children: JSX.Element; + title?: string; + webroot?: string; +}) => ( + + + + + + {title} + + + + + + + {children} + +); diff --git a/src/components/header.tsx b/src/components/header.tsx index 20167a6..7d2eef0 100644 --- a/src/components/header.tsx +++ b/src/components/header.tsx @@ -74,7 +74,7 @@ export const Header = ({ return (
-