Skip to content

Commit 378aab9

Browse files
authored
refactor: change icon placement in navbar (#495)
1 parent bdf3f2a commit 378aab9

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@
125125
"spatie/laravel-permission": "Needed for nova permissions & roles",
126126
"vyuldashev/nova-permission": "Needed for nova permissions & roles"
127127
}
128-
}
128+
}

resources/views/navbar/items/desktop.blade.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
aria-controls="{{ $menuDropdownId }}"
6060
x-bind:aria-expanded="openDropdown === '{{ $navItem['label'] }}'"
6161
>
62-
<span :class="{ 'text-theme-primary-600': openDropdown === '{{ $navItem['label'] }}' }">
62+
<span class="flex justify-center items-center" :class="{ 'text-theme-primary-600': openDropdown === '{{ $navItem['label'] }}' }">
6363
<span class="sr-only">
6464
<span x-show="openDropdown !== '{{ $navItem['label'] }}'">
6565
@lang('ui::actions.open')
@@ -70,7 +70,13 @@
7070
</span>
7171
</span>
7272

73-
{{ $navItem['label'] }}
73+
@if (array_key_exists('icon', $navItem))
74+
<x-ark-icon :name="$navItem['icon']" />
75+
@endif
76+
77+
<span @class(['ml-2' => array_key_exists('icon', $navItem)])>
78+
{{ $navItem['label'] }}
79+
</span>
7480
</span>
7581

7682
<x-ark-chevron-toggle
@@ -125,7 +131,7 @@ class="ml-2"
125131
@endforeach
126132
@endif
127133
@class([
128-
'inline-flex items-center px-1 pt-px font-semibold leading-5 border-b-2 space-x-3 focus:outline-none transition duration-150 ease-in-out h-full',
134+
'inline-flex items-center px-1 pt-px font-semibold leading-5 border-b-2 space-x-2 focus:outline-none transition duration-150 ease-in-out h-full',
129135
'focus-visible:border-b-0 focus-visible:pt-0 focus-visible:-mt-px' => $isCurrentRoute && ! $inverted,
130136
'focus-visible:rounded' => ! $isCurrentRoute && ! $inverted,
131137
'focus-visible:pt-0 focus-visible:-mt-px' => $isCurrentRoute && $inverted,
@@ -143,11 +149,11 @@ class="ml-2"
143149
@click="openDropdown = null;"
144150
dusk='navbar-{{ Str::slug($navItem['label']) }}'
145151
>
146-
<span>{{ $navItem['label'] }}</span>
147-
148152
@if (array_key_exists('icon', $navItem))
149-
<x-ark-icon class="text-theme-primary-600" size="sm" :name="$navItem['icon']" />
153+
<x-ark-icon :name="$navItem['icon']" />
150154
@endif
155+
156+
<span>{{ $navItem['label'] }}</span>
151157
</a>
152158
@endisset
153159
@endforeach

0 commit comments

Comments
 (0)