Skip to content

Commit b2f28fd

Browse files
committed
Refactor alert component styles and add CSS loading
- Updated the alert component's Blade template to streamline class assignments and improve structure. - Introduced Alpine.js data attributes for enhanced interactivity. - Added a dedicated CSS file for the alert component to be loaded on request in the service provider.
1 parent 0de6ed3 commit b2f28fd

File tree

7 files changed

+64
-40
lines changed

7 files changed

+64
-40
lines changed

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
"type": "module",
44
"scripts": {
55
"dev:code-editor-css": "npx tailwindcss -c ./tailwind-code-editor.config.js -i ./resources/css/components/code-editor.css -o ./resources/dist/components/code-editor.css --watch",
6+
"dev:alert-css": "npx tailwindcss -i ./resources/css/components/alert.css -o ./resources/dist/components/alert.css --watch",
67
"dev:main-css": "npx tailwindcss -i ./resources/css/index.css -o ./resources/dist/inspirecms.css --postcss --watch",
7-
"dev:styles": "npm run dev:main-css && npm run dev:code-editor-css",
8+
"dev:styles": "npm run dev:main-css && npm run dev:code-editor-css && npm run dev:alert-css",
89
"dev:scripts": "node ./bin/build.js --dev",
910
"build:code-editor-css": "npx tailwindcss -c ./tailwind-code-editor.config.js -i ./resources/css/components/code-editor.css -o ./resources/dist/components/code-editor.css --postcss --minify",
11+
"build:alert-css": "npx tailwindcss -i ./resources/css/components/alert.css -o ./resources/dist/components/alert.css --postcss --minify",
1012
"build:main-css": "npx tailwindcss -i ./resources/css/index.css -o ./resources/dist/inspirecms.css --postcss --minify",
11-
"build:styles": "npm run build:main-css && npm run build:code-editor-css",
13+
"build:styles": "npm run build:main-css && npm run build:code-editor-css && npm run build:alert-css",
1214
"build:scripts": "node ./bin/build.js",
1315
"purge": "filament-purge -i resources/dist/inspirecms.css -o resources/dist/inspirecms.css -v 3.x",
1416
"dev": "npm run dev:styles && npm run dev:scripts",

resources/css/alerts.css

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
.alert-dialog {
2-
@apply border-l-4 px-4;
3-
4-
.alert-dialog-icon {
5-
@apply w-6 h-6;
6-
}
7-
.alert-dialog-content-ctn {
8-
@apply ml-4;
9-
}
10-
.alert-dialog-content {
11-
@apply text-sm;
12-
}
13-
}
14-
151
.fi-body {
162
.top-alert.alert-dialog {
173
@apply sticky top-0 z-20;

resources/css/components/alert.css

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.alert-dialog {
2+
@apply px-4;
3+
4+
background-color: rgb(var(--c-50));
5+
&:is(.dark *) {
6+
background-color: rgb(var(--c-900));
7+
}
8+
9+
.alert-dialog-body {
10+
@apply flex items-center h-full truncate;
11+
12+
.alert-dialog-icon-ctn {
13+
@apply flex-shrink-0;
14+
15+
svg {
16+
@apply w-6 h-6;
17+
color: rgb(var(--c-400));
18+
19+
&:is(.dark *) {
20+
color: rgb(var(--c-200));
21+
}
22+
}
23+
}
24+
.alert-dialog-content-ctn {
25+
@apply ml-4 text-sm;
26+
color: rgb(var(--c-700));
27+
28+
&:is(.dark *) {
29+
color: rgb(var(--c-400));
30+
}
31+
}
32+
}
33+
}
34+
35+
.alert-dialog-sm {
36+
@apply py-2;
37+
}
38+
.alert-dialog-md {
39+
@apply py-3;
40+
}
41+
.alert-dialog-lg {
42+
@apply py-4;
43+
}

resources/dist/components/alert.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/dist/inspirecms.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/views/components/alert/index.blade.php

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
11
<div {{
22
$attributes->class([
3-
'alert-dialog',
4-
'py-2' => $size == 'sm',
5-
'py-3' => $size == 'md',
6-
'py-4' => $size == 'lg',
7-
'border-custom-400 bg-custom-50 dark:bg-custom-900/95' => $color != 'gray',
8-
'border-gray-400 bg-gray-50 dark:bg-gray-900/95' => $color == 'gray',
3+
'alert-dialog px-4 bg-custom-50 dark:bg-custom-900',
4+
"alert-dialog-{$size}" => in_array($size, ['sm', 'md', 'lg']),
5+
'py-2' => $size === 'sm',
6+
'py-3' => $size === 'md',
7+
'py-4' => $size === 'lg',
98
])->style(\Filament\Support\get_color_css_variables(
109
$color,
1110
shades: [50, 200, 400, 700, 900],
1211
))
13-
}}>
14-
<div class="flex items-center h-full truncate">
15-
<div class="flex-shrink-0">
16-
<x-filament::icon
17-
:icon="$icon"
18-
@class([
19-
'alert-dialog-icon',
20-
'text-custom-400 dark:text-custom-200/80' => $color != 'gray',
21-
'text-gray-400 dark:text-gray-200/80' => $color == 'gray',
22-
])
23-
/>
12+
}}
13+
x-data="{}"
14+
x-load-css="[@js(\Filament\Support\Facades\FilamentAsset::getStyleHref('filament-alert', package: 'solution-forest/inspirecms'))]"
15+
>
16+
<div class="alert-dialog-body flex items-center h-full truncate">
17+
<div class="alert-dialog-icon-ctn">
18+
<x-filament::icon :icon="$icon" class="w-6 h-6 text-custom-400 text-custom-200" />
2419
</div>
25-
<div class="alert-dialog-content-ctn">
26-
<p @class([
27-
'alert-dialog-content',
28-
'text-custom-700 dark:text-custom-400' => $color != 'gray',
29-
'text-gray-700 dark:text-gray-400' => $color == 'gray',
30-
])>
20+
<div class="alert-dialog-content-ctn ml-4 text-sm text-custom-700 dark:text-custom-400">
21+
<p>
3122
{{ $message }}
3223
</p>
3324
</div>

src/InspireCmsServiceProvider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ protected function getAssets(): array
202202
Js::make('inspirecms', __DIR__ . '/../resources/dist/inspirecms.js'),
203203
Css::make('filament-code-editor', __DIR__ . '/../resources/dist/components/code-editor.css')->loadedOnRequest(),
204204
AlpineComponent::make('filament-code-editor', __DIR__ . '/../resources/dist/components/code-editor.js')->loadedOnRequest(),
205+
Css::make('filament-alert', __DIR__ . '/../resources/dist/components/alert.css')->loadedOnRequest(),
205206
];
206207
}
207208

0 commit comments

Comments
 (0)