Skip to content

Commit e73f392

Browse files
Merge pull request #2 from hexadog/develop
Develop
2 parents 66e7cf1 + 5dded0e commit e73f392

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

resources/views/components/children.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<x-menus-divider :item="$item" class="py-2 px-16 border-0 bg-gray-500 text-gray-500 h-px" />
55
@else
66
@if($item->isActive())
7-
<x-menus-item :item="$item" class="py-2 px-16 block text-sm text-gray-600 hover:bg-blue-500 hover:text-white bg-gray-200 text-gray-700 border-r-4 border-gray-700" />
7+
<x-menus-item :item="$item" class="w-full inline-flex items-center py-3 px-6 text-sm font-semibold text-gray-800 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 dark:text-gray-100 border-l-4 border-purple-700" />
88
@else
9-
<x-menus-item :item="$item" class="py-2 px-16 block text-sm text-gray-600 hover:bg-blue-500 hover:text-white" />
9+
<x-menus-item :item="$item" class="w-full inline-flex items-center py-3 px-6 text-sm font-semibold text-gray-800 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 dark:text-gray-100" />
1010
@endif
1111
@endif
1212
@endforeach

resources/views/components/header.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<div x-data="{ open: false }">
1+
<div x-data="{ open: {{ $item->isActive() ? 'true' : 'false' }} }">
22
@if($item->haschildren())
33
<button @click="open = !open" {{ $attributes->merge($item->attributes) }}>
44
<span class="flex items-center">
55
<x-menus-icon class="h-5 w-5" :item="$item" />
6-
<span class="mx-4 font-medium">{{ $item->title }}</span>
6+
<span class="mx-4">{{ $item->title }}</span>
77
</span>
88

99
<span>

resources/views/components/icon.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
@isset($slot)
33
{{ $slot }}
44
@else
5-
<i class="{{ $icon }}"></i>
5+
{{ $icon }}
66
@endif
77
</div>

resources/views/components/item.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@if($item->haschildren())
2-
<div x-data="{ open: false }" {{ $attributes->merge($item->attributes) }}>
3-
<button @click="open = !open">
2+
<div x-data="{ open: {{ $item->isActive() ? 'true' : 'false' }} }" {{ $attributes->merge($item->attributes) }}>
3+
<button @click="open = !open" class="flex justify-between items-center">
44
<span class="flex items-center">
55
<x-menus-icon class="h-5 w-5" :item="$item" />
6-
<span class="mx-4 font-medium">{{ $item->title }}</span>
6+
<span class="mx-4">{{ $item->title }}</span>
77
</span>
88

99
<span>
@@ -19,6 +19,6 @@
1919
@else
2020
<a {{ $attributes->merge($item->attributes)->merge(['href' => $item->getUrl()]) }}>
2121
<x-menus-icon class="h-5 w-5" :item="$item" />
22-
<span class="mx-4 font-medium">{{ $item->title }}</span>
22+
<span class="mx-4">{{ $item->title }}</span>
2323
</a>
2424
@endif

resources/views/components/menu.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<x-menus-divider :item="$item" class="border-0 bg-gray-500 text-gray-500 h-px" />
55
@else
66
@if($item->isActive())
7-
<x-menus-item :item="$item" class="w-full flex justify-between items-center py-3 px-6 text-gray-600 cursor-pointer hover:bg-gray-100 hover:text-gray-700 focus:outline-none bg-gray-200 text-gray-700 border-r-4 border-gray-700" />
7+
<x-menus-item :item="$item" class="w-full inline-flex items-center py-3 px-6 text-sm font-semibold text-gray-800 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 dark:text-gray-100 border-l-4 border-purple-700" />
88
@else
9-
<x-menus-item :item="$item" class="w-full flex justify-between items-center py-3 px-6 text-gray-600 cursor-pointer hover:bg-gray-100 hover:text-gray-700 focus:outline-none" />
9+
<x-menus-item :item="$item" class="w-full inline-flex items-center py-3 px-6 text-sm font-semibold text-gray-800 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 dark:text-gray-100" />
1010
@endif
1111
@endif
1212
@endforeach

0 commit comments

Comments
 (0)