Skip to content

fix: further navbar adjustments for mobile icon placement #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2022
Merged

fix: further navbar adjustments for mobile icon placement #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion resources/views/navbar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ class="overflow-y-auto fixed inset-0 z-30 opacity-75 bg-theme-secondary-900 {{ $
@isset($mobile)
{{ $mobile }}
@else
@include('ark::navbar.items.mobile', ['mobilePositionClass' => $mobilePositionClass ?? null])
@include('ark::navbar.items.mobile', [
'mobilePositionClass' => $mobilePositionClass ?? null,
'mobileDropdownItemColor' => 'text-theme-secondary-900 hover:text-theme-secondary-900 dark:text-theme-secondary-200 dark:hover:text-theme-secondary-200',
'mobileDropdownActiveItemColor' => 'dark:bg-theme-secondary-800 dark:text-theme-secondary-200 text-theme-secondary-900 bg-theme-primary-100',
])
@endisset
</nav>
</header>
3 changes: 3 additions & 0 deletions resources/views/navbar/items/mobile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ class="mb-4 ml-8 border-l border-theme-secondary-200"
:name="$navItem['label']"
:params="$navItem['params'] ?? []"
:icon="isset($navItem['icon']) ? $navItem['icon'] : false"
icon-alignment="left"
icon-colors="text-theme-secondary-900 dark:text-theme-secondary-200 group-hover:text-theme-secondary-900"
active-icon-colors="text-theme-secondary-900 dark:text-theme-secondary-200"
:attrs="$navItem['attributes'] ?? []"
:rounded="false"
:item-class="$mobileDropdownItemColor"
Expand Down
10 changes: 6 additions & 4 deletions resources/views/sidebar-link.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
'attrs' => [],
'itemClass' => 'text-theme-secondary-900 hover:text-theme-primary-600 dark:text-theme-secondary-200 dark:hover:text-theme-primary-600',
'activeItemClass' => 'dark:bg-theme-secondary-800 dark:text-theme-secondary-200 text-theme-primary-600 bg-theme-primary-100',
'iconColors' => 'text-theme-primary-300 dark:text-theme-secondary-600 group-hover:text-theme-primary-600',
'activeIconColors' => 'text-theme-primary-600 dark:text-theme-secondary-200',
])

@php
Expand Down Expand Up @@ -50,8 +52,8 @@
<x-ark-icon
:class="Arr::toCssClasses([
'mr-1 flex-shrink-0 transition-default',
'text-theme-primary-600 dark:text-theme-secondary-200' => $isCurrent || $active,
'text-theme-primary-300 dark:text-theme-secondary-600 group-hover:text-theme-primary-600' => ! $isCurrent || $active,
$activeIconColors => $isCurrent || $active,
$iconColors => ! $isCurrent || $active,
])"
:name="$icon"
/>
Expand All @@ -63,8 +65,8 @@
<x-ark-icon
:class="Arr::toCssClasses([
'flex-shrink-0 transition-default',
'text-theme-primary-600 dark:text-theme-secondary-200' => $isCurrent || $active,
'text-theme-primary-300 dark:text-theme-secondary-600 group-hover:text-theme-primary-600' => ! $isCurrent || $active,
$activeIconColors => $isCurrent || $active,
$iconColors => ! $isCurrent || $active,
])"
:name="$icon"
/>
Expand Down