Skip to content

Commit a4345ff

Browse files
authored
Merge pull request #399 from connorabbas/develop
Improvements - Tailwind integration, version bumps, PopupMenuButton
2 parents bf0ec3c + a69b748 commit a4345ff

File tree

9 files changed

+362
-631
lines changed

9 files changed

+362
-631
lines changed

package-lock.json

Lines changed: 292 additions & 288 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"dependencies": {
1111
"@inertiajs/vue3": "^2.0.5",
12-
"@primeuix/themes": "^1.0.0",
12+
"@primeuix/themes": "^2.0.0",
1313
"@tailwindcss/vite": "^4.0.17",
1414
"@types/lodash-es": "^4.17.12",
1515
"@vitejs/plugin-vue": "^5.2.3",
@@ -32,7 +32,7 @@
3232
"ziggy-js": "^2.5.2"
3333
},
3434
"devDependencies": {
35-
"@primevue/auto-import-resolver": "^4.2.5",
35+
"@primevue/auto-import-resolver": "^4.5.0",
3636
"@tsconfig/node22": "^22.0.2",
3737
"@types/node": "^24.5.2",
3838
"@vitejs/plugin-vue": "^5.0.5",

resources/css/app.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
html {
22
/* font size will determine the component/utility scaling */
33
font-size: 14px;
4+
line-height: 1.15;
45
}
56

67
body {
@@ -19,4 +20,4 @@ body {
1920
.lucide {
2021
width: 16px;
2122
height: 16px;
22-
}
23+
}

resources/css/custom-preflight.css

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

resources/css/tailwind.css

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
@layer theme, base, primevue, utilities;
2-
3-
@import 'tailwindcss/theme.css' layer(theme);
4-
/* Custom Preflight implementation that plays nice with PrimeVue component styling */
5-
@import './custom-preflight.css' layer(base);
6-
@import 'tailwindcss/utilities.css' layer(utilities);
7-
@import 'tailwindcss-primeui';
1+
@import "tailwindcss";
2+
@import "tailwindcss-primeui";
83

94
@source '../../storage/framework/views/*.php';
105
@source '../../resources/views/**/*.blade.php';
@@ -28,4 +23,4 @@
2823

2924
@utility delete-menu-item {
3025
@apply text-red-500 dark:text-red-400 hover:bg-red-500/10 rounded-[var(--p-menu-item-border-radius)] transition-colors duration-[var(--p-menu-transition-duration)];
31-
}
26+
}

resources/js/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ createInertiaApp({
6363
darkModeSelector: '.dark',
6464
cssLayer: {
6565
name: 'primevue',
66-
order: 'theme, base, primevue, utilities',
66+
order: 'theme, base, primevue',
6767
},
6868
},
6969
},

0 commit comments

Comments
 (0)