Merge stable32 into main branch

.npmrc

@@ -0,0 +1,6 @@
+@telekom-ods:registry=https://artifactory.devops.telekom.de/artifactory/api/npm/one-design-system-npm/
+//artifactory.devops.telekom.de/artifactory/api/npm/one-design-system-npm/:_authToken=${JFROG_TOKEN}
+ignore-scripts=false
+foreground-scripts=true
+email = ${JFROG_EMAIL}
+always-auth = true

appinfo/info.xml

@@ -8,7 +8,7 @@
     implementing Telekom Scale branding system
     supporting refactored style system since Nextcloud V25
     </description>
-	<version>1.1.2</version>
+	<version>1.6.4</version>
 	<licence>agpl</licence>
 	<author>T-Systems International</author>
 	<namespace>NMCTheme</namespace>
@@ -20,7 +20,7 @@
 	<category>customization</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="27" max-version="30"/>
+		<nextcloud min-version="27" max-version="33"/>
 	</dependencies>
     <commands>
 		<command>OCA\NMCTheme\Command\CacheBuster</command>

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "nextmcloud/nmctheme",
-  "description": "MagentaCLOUD theme for NC25 ff.",
+  "description": "MagentaCLOUD Theme for Nextcloud",
   "type": "project",
   "license": "AGPL3",
   "authors": [

css/_mixins.scss

@@ -1,5 +1,5 @@
 @mixin darkmode-modal {
-    background-color: var(--telekom-color-background-surface);
+    background-color: var(--color-main-background);
 }
 
 @mixin color-icon-red {
@@ -13,23 +13,27 @@
 	filter: brightness(0) saturate(100%) invert(13%) sepia(85%) saturate(6096%) hue-rotate(321deg) brightness(75%) contrast(104%);
 }
 
+@mixin macaw-icon {
+	filter: brightness(0) saturate(100%) invert(67%) sepia(71%) saturate(1009%) hue-rotate(186deg) brightness(100%) contrast(93%);
+}
+
 // Scale primary button style
 @mixin primary-button {
     border: none;
-    border-radius: var(--telekom-radius-standard);
-    background-color: var(--telekom-color-primary-standard);
-    color: var(--telekom-color-text-and-icon-white-standard);
+    border-radius: var(--border-radius-pill);
+    background-color: var(--color-primary);
+    color: var(--nmc-color-text-and-icon-white);
 
     &:hover:not(:disabled) {
-        background-color: var(--telekom-color-primary-hovered);
+        background-color: var(--color-primary-hover);
     }
 
     &:active {
-        background-color: var(--telekom-color-primary-pressed);
+        background-color: var(--color-primary-pressed);
     }
 
     &:disabled {
-        background-color: var(--telekom-color-ui-disabled);
-        color: var(--telekom-color-text-and-icon-disabled);
+        background-color: var(--color-background-dark);
+        color: var(--color-text-lighter);
     }
 }

css/_variables.scss

@@ -1,3 +1,4 @@
+$breakpoint-desktop: 1325px;
 $breakpoint-mobile: 1024px;
 $breakpoint-mobile-medium: 680px;
 $breakpoint-mobile-small: 480px;

css/apps/apps.scss

@@ -2,34 +2,36 @@
 
 :root {
 	--body-container-margin: calc(var(--default-grid-baseline) * 2);
-	--body-height: calc(100% - 157px - var(--body-container-margin));
+	--body-height: calc(100% - 138px - var(--body-container-margin));
 }
 
 @media screen and (max-width: $breakpoint-mobile-small) {
-:root {
-		--body-height: calc(100% - 152px - var(--body-container-margin));
+	:root {
+		--body-height: calc(100% - 162px - var(--body-container-margin));
 	}
 }
 
 #app-navigation:not(.vue) {
 	background-color: var(--color-main-background);
+	border-right: 1px solid var(--color-border) !important;
 }
 
-#body-user,
-#body-settings,
-#body-public {
-	background-image: url('../img/telekom/mcfluffy.jpg');
-	background-size: cover;
-	background-repeat: no-repeat;
-	background-position: top center;
+/* CONTENT  --------------------------------------------------------- */
+
+// Suppress the separator border/radius that Nextcloud core draws between
+// the app-navigation and the app-content pane on wide viewports.
+.content:not(.content--legacy) .app-navigation:not(.app-navigation--close) ~ .app-content {
+	border-inline-start: none !important;
+	border-start-start-radius: 0 !important;
+	border-end-start-radius: 0 !important;
 }
 
-/* CONTENT  --------------------------------------------------------- */
-#content, #content-vue {
+#content,
+#content-vue {
 	border-radius: 0;
-	margin: 89px 16px 0;
+	margin: 73px 0 0;
 	height: var(--body-height);
-	width: calc(100% - 32px);
+	width: 100%;
 
 	@media screen and (max-width: $breakpoint-mobile-small) {
 		margin: 73px 0 0;
@@ -58,4 +60,81 @@
 			}
 		}
 	}
+
+	.app-navigation-caption {
+		display: none !important;
+	}
+
+	.app-navigation-personal,
+	.app-navigation-administration {
+
+		> ul {
+			gap: 0.25rem !important;
+			padding: 4rem 1.5rem 0.5rem !important;
+
+			> li {
+				border-radius: var(--border-radius-pill);
+
+				&[data-section-type="personal"]
+				{
+					display: none;
+
+					&[data-section-id="account"],
+					&[data-section-id="sessions"],
+					&[data-section-id="appearance"] {
+						display: inline-flex;
+					}
+				}
+
+				> a {
+					font-weight: 700;
+					padding: 0 12px 0 14px;
+
+					img {
+						margin-bottom: -5px;
+						height: 22px;
+						width: 22px;
+					}
+				}
+
+				&:hover {
+
+					> a {
+						background-color: transparent !important;
+						color: var(--color-primary-hover);
+
+						img {
+							filter: var(--nmc-color-icon-hovered);
+						}
+					}
+				}
+
+				&.active {
+					background-color: transparent !important;
+					color: var(--color-primary);
+
+					> a {
+						background-color: transparent !important;
+						color: var(--color-primary);
+
+						&:first-child > img {
+							filter: var(--nmc-color-icon);
+						}
+					}
+
+					&::before {
+						content: "";
+						position: absolute;
+						left: 0;
+						top: 50%;
+						transform: translateY(-50%);
+						height: 24px;
+						width: 4px;
+						background-color: var(--color-primary);
+						border-radius: 4px;
+					}
+				}
+			}
+		}
+	}
 }

css/apps/files-right-click.scss

@@ -17,6 +17,14 @@
 							display: none;
 						}
 					}
+
+					&.files-list__row-action--submenu {
+						button {
+							svg {
+								display: inline;
+							}
+						}
+					}
 				}
 
 				&[data-cy-files-list-row-action="details"],
@@ -96,6 +104,34 @@
 						background-image: var(--icon-restore-dark);
 					}
 				}
+
+				&[data-cy-files-list-row-action="convert"] {
+					span.icon-vue {
+						background-image: var(--icon-refresh-dark);
+
+						&.icon-vue--directional {
+							background-image: var(--icon-right-condensed-dark);
+						}
+					}
+				}
+
+				&[data-cy-files-list-row-action="menu-back"] {
+					span.arrow-left-icon {
+						background-image: var(--icon-left-condensed-dark);
+					}
+				}
+
+				&[data-cy-files-list-row-action="accept-share"] {
+					span.icon-vue {
+						background-image: var(--icon-check-dark);
+					}
+				}
+
+				&[data-cy-files-list-row-action="reject-share"] {
+					span.icon-vue {
+						background-image: var(--icon-close-dark);
+					}
+				}
 			}
 		}
 	}
@@ -112,6 +148,12 @@ body .icon-starred:hover {
 
 body .favorite-marker-icon {
 	background-image: var(--icon-starred-yellow);
+	height: 20px;
+	width: 20px;
+
+	svg {
+		display: none;
+	}
 }
 
 body .icon-rename {