Skip to content

Commit fcb4335

Browse files
authored
Merge pull request #33 from connorabbas/develop
Menu improvements
2 parents ec308d5 + 57f23ff commit fcb4335

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

resources/js/Components/PrimeVue/LinksMenuBar.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ defineExpose({
2121
class="p-menubar-item-link"
2222
:class="{
2323
'font-bold text-primary': item.active,
24+
'text-muted-color': root && !item.active,
2425
}"
2526
custom
2627
>
@@ -37,6 +38,9 @@ defineExpose({
3738
:target="item.target"
3839
v-bind="props.action"
3940
class="p-menubar-item-link"
41+
:class="{
42+
'text-muted-color': root,
43+
}"
4044
>
4145
<span
4246
v-show="item.icon"
@@ -47,11 +51,8 @@ defineExpose({
4751
<i
4852
v-if="hasSubmenu"
4953
:class="[
50-
'pi pi-angle-down',
51-
{
52-
'pi-angle-down ml-2': root,
53-
'pi-angle-right ml-auto': !root,
54-
},
54+
'pi text-muted-color',
55+
root ? 'pi-angle-down text-xs' : 'pi-angle-right',
5556
]"
5657
></i>
5758
</a>

resources/js/Components/PrimeVue/LinksPanelMenu.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
}"
1717
>
18-
<template #item="{ item }">
18+
<template #item="{ item, active }">
1919
<!-- add if using 'nora' preset theme -->
2020
<!-- hover:text-primary-100 hover:dark:text-primary-950 -->
2121
<Link
@@ -48,7 +48,13 @@
4848
class="p-panelmenu-item-icon mr-2"
4949
/>
5050
<span>{{ item.label }}</span>
51-
<span v-if="item.items" class="pi pi-angle-down ml-auto" />
51+
<span
52+
v-if="item.items"
53+
:class="[
54+
'pi text-muted-color ml-auto',
55+
active ? 'pi-angle-down' : 'pi-angle-right',
56+
]"
57+
/>
5258
</a>
5359
</template>
5460
</PanelMenu>

resources/js/Layouts/AuthenticatedLayout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ watchEffect(() => {
134134
<span class="text-base">
135135
{{ $page.props.auth.user.name }}
136136
</span>
137-
<i class="pi pi-angle-down ml-1"></i>
137+
<i class="pi pi-angle-down"></i>
138138
</Button>
139139
</div>
140140
</div>

0 commit comments

Comments
 (0)