iridium34/FilamentLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/laravel-12' into laravel-12

Browse Source
This commit is contained in:
iridium34
2025-12-12 00:35:18 +01:00
parent f464f3940b 395bde3fdd
commit 3d209903f9
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -54,7 +54,7 @@
], ],
"dev": [ "dev": [
"Composer\\Config::disableProcessTimeout", "Composer\\Config::disableProcessTimeout",
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite" "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"npm run dev\" --names=server,queue,logs,vite"
] ]
}, },
"extra": { "extra": {
database/seeders/BuildplateSeeder.php
+2 -2
View File
@@ -15,8 +15,8 @@ class BuildplateSeeder extends Seeder
{ {
// Create Predefined Filament Types // Create Predefined Filament Types
$buildplates = [ $buildplates = [
['name' => 'Supertrack', 'description' => 'Standard filament type.', 'manufacturer_id' => 1, 'temp_max' => 230, 'amount' => 1], ['name' => 'SuperTrack', 'description' => 'Standard BuildPlate.', 'manufacturer_id' => 1, 'temp_max' => '250'],
['name' => 'Smooth PEI', 'description' => 'Premium filament type.', 'manufacturer_id' => 1, 'temp_max' => 230, 'amount' => 1], ['name' => 'Smooth PEI', 'description' => 'Standard BuildPlate.', 'manufacturer_id' => 1, 'temp_max' => '250'],
]; ];
foreach ($buildplates as $buildplate) { foreach ($buildplates as $buildplate) {
resources/css/app.css
+6
View File
@@ -22,7 +22,13 @@
--color-jet-100: #e8e6e5; --color-jet-100: #e8e6e5;
--color-jet-200: #d3d0ce; --color-jet-200: #d3d0ce;
--color-jet-300: #b5afab; --color-jet-300: #b5afab;
--color-jet-400: #8f8781;
--color-jet-500: #746c66;
--color-jet-600: #635e57;
--color-jet-700: #53504b;
--color-jet-800: #484542;
--color-jet-900: #3f3d3a; --color-jet-900: #3f3d3a;
--color-jet-950: #33312e;
--color-pumpkin-50: #fff6ed; --color-pumpkin-50: #fff6ed;
--color-pumpkin-100: #ffebd4; --color-pumpkin-100: #ffebd4;