fix: don't apply hover and focus nav item style to active item

owncloud · Sep 1, 2022 · 944e478 · 944e478
1 parent 10df928
commit 944e478
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/changelog/unreleased/enhancement-left-sidebar-hover b/changelog/unreleased/enhancement-left-sidebar-hover
@@ -4,3 +4,4 @@ We've added a hover effect to the left sidebar items.
 
 https://github.com/owncloud/web/issues/7540
 https://github.com/owncloud/web/pull/7567
+https://github.com/owncloud/web/pull/7575
diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNav.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNav.vue
@@ -142,7 +142,7 @@ export default {
     justify-content: flex-end !important;
   }
 
-  .oc-sidebar-nav li a {
+  .oc-sidebar-nav li a:not(.active) {
     &:hover,
     &:focus {
       text-decoration: none !important;

diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
@@ -9,11 +9,7 @@
       type="router-link"
       appearance="raw"
       :variation="active ? 'inverse' : 'passive'"
-      :class="[
-        'oc-sidebar-nav-item-link',
-        { active: active },
-        { 'oc-background-primary-gradient': active }
-      ]"
+      :class="['oc-sidebar-nav-item-link', { active: active }]"
       :to="target"
       :data-nav-id="index"
       :data-nav-name="navName"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ We've added a hover effect to the left sidebar items.

		https://github.com/owncloud/web/issues/7540
		https://github.com/owncloud/web/pull/7567
		https://github.com/owncloud/web/pull/7575