Merge pull request #38908 from nextcloud/backport/38897/stable26

[stable26] fix(core): Do not invert app menu text color
nextcloud · Jun 26, 2023 · 78f6498 · 78f6498
2 parents 100c2e1 + 0ca3879
commit 78f6498
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/core/src/components/AppMenu.vue b/core/src/components/AppMenu.vue
@@ -147,7 +147,6 @@ $header-icon-size: 20px;
 		position: relative;
 		display: flex;
 		opacity: .7;
-		filter: var(--background-image-invert-if-bright);
 
 		&.app-menu-entry__active {
 			opacity: 1;
@@ -188,6 +187,7 @@ $header-icon-size: 20px;
 			height: $header-icon-size;
 			padding: calc((100% - $header-icon-size) / 2);
 			box-sizing: content-box;
+			filter: var(--background-image-invert-if-bright);
 		}
 
 		.app-menu-entry--label {

diff --git a/cypress/e2e/theming/admin-settings.cy.ts b/cypress/e2e/theming/admin-settings.cy.ts
@@ -167,7 +167,7 @@ describe.only('Remove the default background with a bright color', function() {
 
 	it('See the header being inverted', function() {
 		cy.waitUntil(() => cy.window().then((win) => {
-			const firstEntry = win.document.querySelector('.app-menu-main li')
+			const firstEntry = win.document.querySelector('.app-menu-main li img')
 			if (!firstEntry) {
 				return false
 			}

diff --git a/cypress/e2e/theming/user-background.cy.ts b/cypress/e2e/theming/user-background.cy.ts
@@ -162,7 +162,7 @@ describe('User select a bright custom color and remove background', function() {
 
 	it('See the header being inverted', function() {
 		cy.waitUntil(() => cy.window().then((win) => {
-			const firstEntry = win.document.querySelector('.app-menu-main li')
+			const firstEntry = win.document.querySelector('.app-menu-main li img')
 			if (!firstEntry) {
 				return false
 			}

diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map