Skip to content
This repository was archived by the owner on Sep 24, 2024. It is now read-only.

Commit 2459a5c

Browse files
authored
Merge pull request #108 from selemondev/fix-vertical-nagivation
fix(app): #125 UVerticalNavigation component's theme
2 parents 518cb4a + 64cdbe1 commit 2459a5c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

packages/nuxt-ui-vue/src/App.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<script setup lang='ts'>
2-
1+
<script setup lang="ts">
32
</script>
43

54
<template>

packages/nuxt-ui-vue/src/components/navigation/VerticalNavigation/UVerticalNavigation.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default defineComponent({
5050
v-slot="{ isActive }"
5151
:key="index"
5252
v-bind="omit(link, ['label', 'icon', 'iconClass', 'avatar', 'badge', 'click'])"
53-
:to="link.to"
53+
:to="link.to ? link.to : ''"
5454
:class="[variant.verticalNavigationBase, variant.padding, variant.width, variant.ring, variant.rounded, variant.font, variant.size]"
5555
:active-class="variant.active"
5656
:inactive-class="variant.inactive"

packages/nuxt-ui-vue/src/theme/nuxtLabsTheme.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@ export default {
15421542
UVerticalNavigation: {
15431543
base: {
15441544
root: 'relative',
1545-
verticalNavigationBase: 'group relative flex items-center gap-2 focus:outline-none focus-visible:outline-none dark:focus-visible:outline-none focus-visible:before:ring-inset focus-visible:before:ring-1 focus-visible:before:ring-green-500 dark:focus-visible:before:ring-green-400 before:absolute before:inset-px before:rounded-md disabled:cursor-not-allowed disabled:opacity-75',
1545+
verticalNavigationBase: 'group relative flex items-center gap-2 focus:outline-none focus-visible:outline-none hover:bg-gray-100 dark:hover:bg-gray-800 before:inset-px before:rounded-md disabled:cursor-not-allowed disabled:opacity-75',
15461546
ring: 'focus-visible:ring-inset focus-visible:ring-2 focus-visible:ring-green-500 dark:focus-visible:ring-green-400',
15471547
padding: 'px-3 py-1.5',
15481548
width: 'w-full',
@@ -1553,12 +1553,12 @@ export default {
15531553
inactive: 'text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white hover:before:bg-gray-50 dark:hover:before:bg-gray-800/50',
15541554
label: 'truncate relative',
15551555
iconBase: 'flex-shrink-0 w-4 h-4',
1556-
iconActive: 'text-red-700 dark:text-red-200',
1557-
iconInactive: 'text-red-400 dark:text-red-500 group-hover:text-red-700 dark:group-hover:text-red-200',
1556+
iconActive: 'text-gray-700 dark:text-gray-200',
1557+
iconInactive: 'text-gray-400 dark:text-gray-500 group-hover:text-gray-700 dark:group-hover:text-gray-200',
15581558
avatarBase: 'flex-shrink-0',
15591559
avatarSize: '3xs',
15601560
badgeBase: 'relative ms-auto inline-block py-0.5 px-2 text-xs rounded-md -me-1 -my-0.5',
1561-
badgeActive: 'bg-red-500 dark:bg-red-900',
1561+
badgeActive: 'bg-white dark:bg-gray-900',
15621562
badgeInActive: 'bg-gray-100 dark:bg-gray-800 text-gray-900 dark:text-white group-hover:bg-white dark:group-hover:bg-gray-900',
15631563
},
15641564

0 commit comments

Comments
 (0)