Merge pull request #42401 from nextcloud/fix/app-menu-colors

fix: Ensure app menu entries and dashboard welcome message have enough contrast
nextcloud · Dec 20, 2023 · 4f7ed47 · 4f7ed47
2 parents 2d13ab5 + de57e51
commit 4f7ed47
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue
@@ -465,7 +465,8 @@ export default {
 	background-attachment: fixed;
 
 	> h2 {
-		color: var(--color-primary-element-text);
+		// this is shown directly on the background which has `color-primary`, so we need `color-primary-text`
+		color: var(--color-primary-text);
 		text-align: center;
 		font-size: 32px;
 		line-height: 130%;

diff --git a/core/src/components/AppMenu.vue b/core/src/components/AppMenu.vue
@@ -160,7 +160,7 @@ $header-icon-size: 20px;
 				width: 12px;
 				height: 5px;
 				border-radius: 3px;
-				background-color: var(--color-primary-element-text);
+				background-color: var(--color-primary-text);
 				left: 50%;
 				bottom: 6px;
 				display: block;
@@ -177,7 +177,8 @@ $header-icon-size: 20px;
 			width: calc(100% - 4px);
 			height: calc(100% - 4px);
 			margin: 2px;
-			color: var(--color-primary-element-text);
+			// this is shown directly on the background which has `color-primary`, so we need `color-primary-text`
+			color: var(--color-primary-text);
 			position: relative;
 		}
 
@@ -194,7 +195,8 @@ $header-icon-size: 20px;
 			opacity: 0;
 			position: absolute;
 			font-size: 12px;
-			color: var(--color-primary-element-text);
+			// this is shown directly on the background which has `color-primary`, so we need `color-primary-text`
+			color: var(--color-primary-text);
 			text-align: center;
 			left: 50%;
 			top: 45%;

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
diff --git a/dist/dashboard-main.js b/dist/dashboard-main.js
diff --git a/dist/dashboard-main.js.map b/dist/dashboard-main.js.map