Merge pull request #34567 from nextcloud/backport/34545/stable25

[stable25] Disable translucency on high contrast themes
nextcloud · Oct 13, 2022 · 1360771 · 1360771
2 parents 3993829 + 5e2c5e5
commit 1360771
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/apps/theming/lib/Themes/DarkHighContrastTheme.php b/apps/theming/lib/Themes/DarkHighContrastTheme.php
@@ -56,13 +56,15 @@ public function getCSSVariables(): array {
 
 		$colorMainText = '#ffffff';
 		$colorMainBackground = '#000000';
+		$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground)); 
 
 		return array_merge(
 			$defaultVariables,
 			$this->generatePrimaryVariables($colorMainBackground, $colorMainText),
 			[
 				'--color-main-background' => $colorMainBackground,
-				'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .1)',
+				'--color-main-background-rgb' => $colorMainBackgroundRGB,
+				'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), 1)',
 				'--color-main-text' => $colorMainText,
 
 				'--color-background-dark' => $this->util->lighten($colorMainBackground, 30),

diff --git a/apps/theming/lib/Themes/HighContrastTheme.php b/apps/theming/lib/Themes/HighContrastTheme.php
@@ -56,13 +56,15 @@ public function getCSSVariables(): array {
 
 		$colorMainText = '#000000';
 		$colorMainBackground = '#ffffff';
+		$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground)); 
 
 		return array_merge(
 			$defaultVariables,
 			$this->generatePrimaryVariables($colorMainBackground, $colorMainText),
 			[
 				'--color-main-background' => $colorMainBackground,
-				'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), .1)',
+				'--color-main-background-rgb' => $colorMainBackgroundRGB,
+				'--color-main-background-translucent' => 'rgba(var(--color-main-background-rgb), 1)',
 				'--color-main-text' => $colorMainText,
 
 				'--color-background-dark' => $this->util->darken($colorMainBackground, 30),