Merge pull request #2007 from nextcloud/fix/noid/appnavigation-adjustments

Adjust AppNavigation to new AppNavigationItem structure

3 files changed, 16 insertions, 18 deletions

diff --git a/src/components/AppNavigation/CalendarShare.vue b/src/components/AppNavigation/CalendarShare.vue
index b08144dd..b3239535 100644
--- a/src/components/AppNavigation/CalendarShare.vue
+++ b/src/components/AppNavigation/CalendarShare.vue
@@ -268,22 +268,20 @@ export default {
 	}
 
 	.app-navigation-entry {
-		padding-left: 0 !important;
 
-		.avatar {
-			width: 32px;
-			height: 32px;
-			background-color: var(--color-border-dark);
-			background-size: 16px;
-		}
+		&-wrapper::v-deep {
+			.app-navigation-entry {
+				padding-left: 0 !important;
 
-		&__utils {
-			.action-checkbox__label {
-				padding-right: 0 !important;
-			}
+				&__utils {
+					.action-checkbox__label {
+						padding-right: 0 !important;
+					}
 
-			.action-checkbox__label::before {
-				margin: 4px 4px 0 !important;
+					.action-checkbox__label::before {
+						margin: 4px 4px 0 !important;
+					}
+				}
 			}
 		}
 
@@ -293,6 +291,7 @@ export default {
 			.multiselect {
 				width: 100%;
 				margin: 0;
+				padding-right: 8px !important;
 				.multiselect__tags:focus-within,
 				.multiselect__tags:hover {
 					border-color: var(--color-primary-element);
diff --git a/src/components/AppNavigation/ListItemCalendar.vue b/src/components/AppNavigation/ListItemCalendar.vue
index c50d0bc3..81f50bc1 100644
--- a/src/components/AppNavigation/ListItemCalendar.vue
+++ b/src/components/AppNavigation/ListItemCalendar.vue
@@ -545,19 +545,18 @@ export default {
 $color-error: #e9322d;
 
 .list::v-deep {
-	&.active .app-navigation-entry__icon-bullet > div {
+	div.active .app-navigation-entry__icon-bullet > div {
 		height: 16px;
 		width: 16px;
 		margin: -1px;
 	}
 
-	&:not(.active) > .app-navigation-entry__utils .action-item:not(.shared) {
+	> div:not(.active) > .app-navigation-entry__utils .action-item:not(.shared) {
 		display: none;
 	}
 
 	&.list--edit {
-		.app-navigation-entry__utils,
-		.app-navigation-entry-link {
+		.app-navigation-entry {
 			display: none;
 		}
 
diff --git a/src/views/AppNavigation.vue b/src/views/AppNavigation.vue
index 8e01ea21..44472296 100644
--- a/src/views/AppNavigation.vue
+++ b/src/views/AppNavigation.vue
@@ -470,7 +470,7 @@ $color-error: #e9322d;
 
 .collection::v-deep {
 	&.collection--edit {
-		.app-navigation-entry-link {
+		.app-navigation-entry {
 			display: none;
 		}