merge in 3.x

This commit is contained in:
Adam Weston
2022-11-20 09:15:29 -05:00
parent 6797c323d2
commit 8e365eb4a7
7 changed files with 1 additions and 104 deletions
-2
View File
@@ -8,7 +8,6 @@ use Filament\SpatieLaravelTranslatablePluginServiceProvider;
use Filament\Support\SupportServiceProvider;
use Filament\Tables\TablesServiceProvider;
use Filament\Tests\AdminFilamentProvider;
use Filament\Theme\ThemeServiceProvider;
use Filament\Widgets\WidgetsServiceProvider;
use Livewire\LivewireServiceProvider;
use Orchestra\Testbench\Concerns\CreatesApplication;
@@ -35,6 +34,5 @@ $app->register(SpatieLaravelTranslatablePluginServiceProvider::class);
$app->register(SupportServiceProvider::class);
$app->register(TablesServiceProvider::class);
$app->register(WidgetsServiceProvider::class);
$app->register(ThemeServiceProvider::class);
return $app;
+1 -2
View File
@@ -57,8 +57,7 @@
"Filament\\Tables\\": "packages/tables/src",
"Filament\\Tests\\": "tests/src",
"Filament\\Tests\\Database\\Factories\\": "tests/database/factories",
"Filament\\Widgets\\": "packages/widgets/src",
"Filament\\Theme\\": "packages/theme/src"
"Filament\\Widgets\\": "packages/widgets/src"
}
},
"config": {
-31
View File
@@ -1,31 +0,0 @@
{
"name": "filament/theme",
"description": "Custom theme for Filament.",
"license": "MIT",
"homepage": "https://github.com/filamentphp/filament",
"support": {
"issues": "https://github.com/filamentphp/filament/issues",
"source": "https://github.com/filamentphp/filament"
},
"require": {
"php": "^8.0",
"spatie/laravel-package-tools": "^1.9"
},
"autoload": {
"psr-4": {
"Filament\\Theme\\": "src"
}
},
"extra": {
"laravel": {
"providers": [
"Filament\\Theme\\ThemeServiceProvider"
]
}
},
"config": {
"sort-packages": true
},
"minimum-stability": "dev",
"prefer-stable": true
}
-42
View File
@@ -1,42 +0,0 @@
@import '../../../forms/dist/index.css';
@import 'tippy.js/dist/tippy.css';
@import 'tippy.js/themes/light.css';
@tailwind base;
@tailwind components;
@tailwind utilities;
@layer components {
.filament-card-layout {
@apply relative bg-no-repeat;
background-image: radial-gradient(
circle at top,
theme('colors.primary.100'),
theme('colors.white') 50%
);
}
.dark .filament-card-layout {
background-image: radial-gradient(
circle at top,
theme('colors.primary.800'),
theme('colors.gray.800'),
theme('colors.gray.900') 100%
);
}
.filament-card-layout .filament-card-layout-card::before {
@apply absolute inset-x-0 mx-auto h-px w-2/3 bg-gradient-to-r from-gray-200 via-primary-400 to-gray-200 dark:from-gray-700 dark:via-primary-400 dark:to-gray-700;
content: '';
z-index: 1;
top: -1px;
}
.filament-sidebar-header::before {
@apply pointer-events-none absolute inset-x-0 mx-auto h-px w-full bg-gradient-to-r from-black/5 via-primary-400 to-gray-200 dark:from-gray-700 dark:via-primary-400 dark:to-gray-700;
content: '';
z-index: 1;
bottom: -1px;
}
}
File diff suppressed because one or more lines are too long
@@ -1,17 +0,0 @@
<?php
namespace Filament\Theme;
use Filament\Support\PluginServiceProvider;
use Spatie\LaravelPackageTools\Package;
class ThemeServiceProvider extends PluginServiceProvider
{
public static string $name = 'filament-theme';
public function configurePackage(Package $package): void
{
$package->name(static::$name)
->hasAssets();
}
}
-8
View File
@@ -1,8 +0,0 @@
const preset = require('../app/filament-preset')
module.exports = {
presets: [
preset
],
content: preset.content
}