Skip to content

Commit eac4f36

Browse files
atmonshiatmonshi
authored
Merge pull request #22 from lara-zeus/refix-bg
fix backgrounds colors and improve UI
2 parents c1ef218 + 05e8d53 commit eac4f36

File tree

9 files changed

+158
-52
lines changed

9 files changed

+158
-52
lines changed

‎resources/views/components/accordion/index.blade.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
this.activeAccordion = (this.activeAccordion == id) ? '' : id
88
}
99
}"
10-
class="fi-accordion rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 relative w-full mx-auto divide-y divide-gray-200 dark:divide-white/5"
10+
class="fi-accordion rounded-xl shadow-sm
11+
bg-white dark:bg-gray-900
12+
ring-1 ring-gray-950/10 dark:ring-white/10
13+
divide-y divide-gray-300 dark:divide-white/10
14+
"
1115
>
12-
{{ $slot }}
16+
<div class="p-2">
17+
{{ $slot }}
18+
</div>
1319
</div>

‎resources/views/components/accordion/item.blade.php

+9-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
setActiveAccordion($id('accordion'));
2323
})
2424
"
25-
class="fi-accordion-item group"
25+
:class="{
26+
'bg-gray-100 dark:bg-gray-800': activeAccordion == id,
27+
'bg-white dark:bg-gray-900': activeAccordion != id,
28+
}"
29+
class="fi-accordion-item group first:rounded-t-xl last:rounded-b-xl"
2630
>
2731
<button
2832
type="button"
@@ -39,7 +43,7 @@ class="flex gap-2 font-medium items-center justify-center text-gray-500 group-ho
3943
@if ($icon !== null)
4044
<x-filament::icon
4145
:icon="$icon"
42-
class="fi-accordion-item-icon h-5 w-5 shrink-0 transition duration-75"
46+
class="fi-accordion-item-icon h-5 w-5 group-hover:text-primary-600"
4347
/>
4448
@endif
4549

@@ -61,7 +65,8 @@ class="w-4 h-4"
6165
/>
6266
</span>
6367
</button>
64-
<div x-show="activeAccordion == id" x-collapse x-cloak>
65-
{{ $slot }}
68+
<div
69+
x-show="activeAccordion == id" x-collapse x-cloak>
70+
<div class="p-4 bg-white dark:bg-gray-900">{{ $slot }}</div>
6671
</div>
6772
</div>

‎resources/views/forms/accordion.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<div class="p-4">
1+
<div class="px-4 py-2">
22
{{ $getChildComponentContainer() }}
33
</div>

‎resources/views/forms/accordions.blade.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
$attributes
1010
->merge([
1111
'id' => $getId(),
12-
'wire:key' => "{$this->getId()}.{$getStatePath()}." . Accordions::class . '.container',
12+
'wire:key' => "{$this->getId()}.{$getStatePath()}." . 'accordions.container',
1313
], escape: false)
1414
->merge($getExtraAttributes(), escape: false)
1515
->merge($getExtraAlpineAttributes(), escape: false)
16-
->class([
17-
'rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10',
18-
])
1916
}}
2017
>
2118
<x-zeus-accordion::accordion :activeAccordion="$getActiveAccordion">

‎resources/views/infolists/accordion.blade.php

-3
This file was deleted.

‎resources/views/infolists/accordions.blade.php

-36
This file was deleted.

‎src/Infolists/Accordion.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Accordion extends Component
1313
use HasBadge;
1414
use HasIcon;
1515

16-
protected string $view = 'zeus-accordion::infolists.accordion';
16+
protected string $view = 'zeus-accordion::forms.accordion';
1717

1818
final public function __construct(string $label)
1919
{

‎src/Infolists/Accordions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Accordions extends Component
1212
use CanBeIsolated;
1313
use Concerns\HasExtraAlpineAttributes;
1414

15-
protected string $view = 'zeus-accordion::infolists.accordions';
15+
protected string $view = 'zeus-accordion::forms.accordions';
1616

1717
protected int | Closure $activeAccordion = 1;
1818

‎tailwind.config.js

+137
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
const colors = require('tailwindcss/colors')
2+
3+
const plugin = require('tailwindcss/plugin')
4+
5+
module.exports = {
6+
presets: [preset],
7+
content: [
8+
//App
9+
'./resources/views/**/*.blade.php',
10+
'./vendor/lara-zeus/core/resources/views/**/*.blade.php',
11+
'./vendor/lara-zeus/core/src/CoreServiceProvider.php',
12+
'./vendor/awcodes/preset-color-picker/resources/**/*.blade.php',
13+
14+
'./vendor/lara-zeus/wind/resources/views/**/*.blade.php',
15+
'./vendor/lara-zeus/wind/src/Filament/Resources/LetterResource.php',
16+
'./vendor/lara-zeus/wind/src/Livewire/ContactsForm.php',
17+
18+
'./vendor/lara-zeus/replies/resources/views/**/*.blade.php',
19+
20+
'./vendor/lara-zeus/sky/resources/views/**/*.blade.php',
21+
'./vendor/lara-zeus/sky/src/Models/PostStatus.php',
22+
23+
'./vendor/lara-zeus/bolt/resources/views/**/*.blade.php',
24+
25+
'./vendor/lara-zeus/thunder/resources/views/**/*.blade.php',
26+
'./vendor/lara-zeus/thunder/src/Models/TicketsStatus.php',
27+
'./vendor/lara-zeus/thunder/src/Filament/Resources/TicketResource.php',
28+
29+
'./vendor/lara-zeus/athena/resources/views/**/*.blade.php',
30+
31+
'./vendor/lara-zeus/artemis/resources/views/**/*.blade.php',
32+
33+
'./vendor/lara-zeus/quantity/resources/views/**/*.blade.php',
34+
35+
'./vendor/lara-zeus/dynamic-dashboard/resources/views/**/*.blade.php',
36+
'./vendor/lara-zeus/dynamic-dashboard/src/Models/Columns.php',
37+
38+
'./vendor/lara-zeus/rhea/resources/views/**/*.blade.php',
39+
40+
// hermes
41+
'./vendor/lara-zeus/hermes/resources/views/**/*.blade.php',
42+
43+
// Bolt Pro
44+
'./vendor/lara-zeus/bolt-pro/resources/views/**/*.blade.php',
45+
'./vendor/sawirricardo/filament-nouislider/resources/views/forms/components/nouislider.blade.php',
46+
47+
// matrix-choice
48+
'./vendor/lara-zeus/matrix-choice/resources/views/**/*.blade.php',
49+
'./vendor/lara-zeus/accordion/resources/views/**/*.blade.php',
50+
'./vendor/lara-zeus/list-group/resources/views/**/*.blade.php',
51+
52+
// helen
53+
'./vendor/lara-zeus/helen/resources/views/**/*.blade.php',
54+
'./vendor/lara-zeus/helen/src/Filament/Resources/LinksResource.php',
55+
'./vendor/lara-zeus/helen/src/Facades/Helen.php',
56+
57+
// filament
58+
'./app/Filament/**/*.php',
59+
'./resources/views/filament/**/*.blade.php',
60+
'./vendor/filament/**/*.blade.php',
61+
62+
'./vendor/awcodes/recently/resources/**/*.blade.php',
63+
'./vendor/awcodes/filament-tiptap-editor/resources/**/*.blade.php',
64+
'./vendor/awcodes/filament-versions/resources/**/*.blade.php',
65+
'./vendor/awcodes/filament-quick-create/resources/**/*.blade.php',
66+
'./vendor/awcodes/overlook/resources/**/*.blade.php',
67+
'./vendor/ryangjchandler/filament-navigation/resources/**/*.blade.php',
68+
'./vendor/wire-elements/spotlight/resources/views/spotlight.blade.php',
69+
'./vendor/awcodes/filament-curator/resources/**/*.blade.php',
70+
'./vendor/archilex/filament-filter-sets/**/*.php',
71+
'./vendor/bezhansalleh/filament-panel-switch/resources/views/panel-switch-menu.blade.php',
72+
'./vendor/jaocero/radio-deck/resources/views/**/*.blade.php',
73+
'./vendor/jaocero/activity-timeline/resources/views/**/*.blade.php',
74+
],
75+
darkMode: 'class',
76+
theme: {
77+
extend: {
78+
colors: {
79+
primary: {
80+
DEFAULT: '#45B39D',
81+
50: '#C6E9E2',
82+
100: '#B8E4DB',
83+
200: '#9AD8CC',
84+
300: '#7DCDBD',
85+
400: '#5FC1AE',
86+
500: '#45B39D',
87+
600: '#358B79',
88+
700: '#266256',
89+
800: '#163A32',
90+
900: '#07110F',
91+
950: '#000000'
92+
},
93+
secondary: {
94+
DEFAULT: '#F1948A',
95+
50: '#FDF2F0',
96+
100: '#FCE7E5',
97+
200: '#F9D2CE',
98+
300: '#F6BEB8',
99+
400: '#F4A9A1',
100+
500: '#F1948A',
101+
600: '#EB6658',
102+
700: '#E53826',
103+
800: '#BC2717',
104+
900: '#8A1C11',
105+
950: '#71170E'
106+
},
107+
danger: colors.red,
108+
success: colors.green,
109+
warning: colors.yellow,
110+
info: colors.blue,
111+
}
112+
},
113+
},
114+
plugins: [
115+
plugin(function ({addUtilities, addComponents, e, config}) {
116+
const sketchyBorders = {
117+
'.border-sketchy-sm': {
118+
borderRadius: '255px 25px 225px 25px/25px 225px 25px 255px',
119+
transition: 'all 0.3s ease-in-out'
120+
},
121+
'.border-sketchy-md': {
122+
borderRadius: '25px 55px 10px 45px/85px 20px 55px 20px',
123+
transition: 'all 0.3s ease-in-out'
124+
},
125+
'.border-sketchy-lg': {
126+
borderRadius: '5px 55px 25px 25px/85px 20px 55px 20px',
127+
transition: 'all 0.3s ease-in-out'
128+
},
129+
}
130+
131+
addUtilities(sketchyBorders, {
132+
variants: ['responsive', 'hover'],
133+
})
134+
}),
135+
require('tailwindcss-debug-screens'),
136+
],
137+
}

0 commit comments

Comments
 (0)