Skip to content

Commit 6e6b593

Browse files
committed
migrate tailwindcss config
1 parent 3977c54 commit 6e6b593

File tree

8 files changed

+20
-242
lines changed

8 files changed

+20
-242
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"private": true,
33
"type": "module",
44
"scripts": {
5-
"dev": "vite --https",
5+
"dev": "vite",
66
"build": "vite build",
7+
"preview": "vite preview",
78
"lint": "eslint *.js resources",
89
"format": "prettier --write '**/*.{js,vue,css,scss,json,yml,md}'",
910
"postinstall": "husky install",
@@ -18,8 +19,6 @@
1819
"@sentry/vue": "^8.51.0",
1920
"@simplewebauthn/browser": "^13.1.0",
2021
"@tailwindcss/forms": "^0.5.10",
21-
"@tailwindcss/postcss": "^4.0.0",
22-
"@tailwindcss/typography": "^0.5.16",
2322
"@vitejs/plugin-basic-ssl": "^1.2.0",
2423
"@vitejs/plugin-vue": "^5.2.1",
2524
"ant-design-vue": "^4.2.6",
@@ -34,8 +33,6 @@
3433
"lint-staged": "^15.4.3",
3534
"lodash": "^4.17.21",
3635
"mitt": "^3.0.1",
37-
"postcss": "^8.5.1",
38-
"postcss-import": "^16.1.0",
3936
"prettier": "^3.4.2",
4037
"prettier-plugin-tailwindcss": "^0.6.11",
4138
"sass": "^1.83.4",
@@ -61,5 +58,8 @@
6158
"vendor/bin/pint"
6259
]
6360
},
64-
"packageManager": "[email protected]"
61+
"packageManager": "[email protected]",
62+
"dependencies": {
63+
"@tailwindcss/vite": "^4.0.0"
64+
}
6565
}

postcss.config.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

resources/css/app.css

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,11 @@
1-
@import 'charts.css' layer(base);
2-
@import 'ant-design-vue/dist/reset.css' layer(base);
3-
41
@import 'tailwindcss';
2+
@import 'charts.css/dist/charts.css' layer(base);
3+
@plugin '@tailwindcss/forms';
54

6-
@config '../../tailwind.config.js';
7-
8-
/*
9-
The default border color has changed to `currentColor` in Tailwind CSS v4,
10-
so we've added these compatibility styles to make sure everything still
11-
looks the same as it did with Tailwind CSS v3.
12-
13-
If we ever want to remove these styles, we need to add an explicit border
14-
color utility to any element that depends on these defaults.
15-
*/
16-
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
24-
}
5+
@custom-variant dark (&:where(.dark, .dark *));
256

26-
body {
27-
color: #343a4b;
7+
@theme {
8+
--default-font-family: Nunito, var(--font-sans);
289
}
2910

3011
.icon-breadcrumb {

resources/views/app.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@vite(['resources/js/app.js', "resources/js/Pages/{$page['component']}.vue"])
2424
@inertiaHead
2525
</head>
26-
<body class="font-sans antialiased bg-white dark:bg-gray-800 dark:text-gray-300">
26+
<body class="font-sans antialiased bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300">
2727
@inertia
2828
</body>
2929
</html>

scripts/ci/package.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ ln -s $ROOT/eslint.config.js $package/
5050
ln -s $ROOT/jsconfig.json $package/
5151
ln -s $ROOT/LICENSE.md $package/
5252
ln -s $ROOT/package.json $package/
53-
ln -s $ROOT/postcss.config.js $package/
5453
ln -s $ROOT/README.md $package/
5554
ln -s $ROOT/SECURITY.md $package/
56-
ln -s $ROOT/tailwind.config.js $package/
5755
ln -s $ROOT/vite.config.js $package/
5856
ln -s $ROOT/yarn.lock $package/
5957
ln -s $ROOT/.devcontainer $package/

tailwind.config.js

Lines changed: 0 additions & 65 deletions
This file was deleted.

vite.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import laravel from 'laravel-vite-plugin';
33
import vue from '@vitejs/plugin-vue';
44
import basicSsl from '@vitejs/plugin-basic-ssl';
55
import i18n from 'laravel-vue-i18n/vite';
6+
import tailwindcss from '@tailwindcss/vite';
67

78
export default defineConfig(({ mode }) => {
89
// Load env file based on `mode` in the current working directory.
@@ -22,6 +23,7 @@ export default defineConfig(({ mode }) => {
2223
},
2324
},
2425
}),
26+
tailwindcss(),
2527
i18n(),
2628
basicSsl(),
2729
],

0 commit comments

Comments
 (0)