Merge pull request #47693 from nextcloud/backport/47617/stable30

[stable30] fix(css): make scrollbar visible again

Author: AndyScherzinger

apps/theming/css/default.css

@@ -22,7 +22,7 @@
   --color-text-light: var(--color-main-text);
   /** @deprecated use `--color-text-maxcontrast` instead */
   --color-text-lighter: var(--color-text-maxcontrast);
-  --color-scrollbar: rgba(34,34,34, .15);
+  --color-scrollbar: var(--color-border-maxcontrast) transparent;
   --color-error: #DB0606;
   --color-error-rgb: 219,6,6;
   --color-error-hover: #df2525;

apps/theming/lib/Themes/DarkHighContrastTheme.php

@@ -89,7 +89,7 @@ public function getCSSVariables(): array {
 				'--color-info-hover' => $this->util->lighten($colorInfo, 10),
 				'--color-info-text' => $this->util->lighten($colorInfo, 20),
 
-				'--color-scrollbar' => $this->util->lighten($colorMainBackground, 35),
+				'--color-scrollbar' => 'auto',
 
 				// used for the icon loading animation
 				'--color-loading-light' => '#000000',

apps/theming/lib/Themes/DarkTheme.php

@@ -66,8 +66,6 @@ public function getCSSVariables(): array {
 				'--color-main-background-rgb' => $colorMainBackgroundRGB,
 				'--color-main-background-blur' => 'rgba(var(--color-main-background-rgb), .85)',
 
-				'--color-scrollbar' => $this->util->lighten($colorMainBackground, 15),
-
 				'--color-background-hover' => $this->util->lighten($colorMainBackground, 4),
 				'--color-background-dark' => $this->util->lighten($colorMainBackground, 7),
 				'--color-background-darker' => $this->util->lighten($colorMainBackground, 14),

apps/theming/lib/Themes/DefaultTheme.php

@@ -126,7 +126,7 @@ public function getCSSVariables(): array {
 			'--color-text-light' => 'var(--color-main-text)', // deprecated
 			'--color-text-lighter' => 'var(--color-text-maxcontrast)', // deprecated
 
-			'--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
+			'--color-scrollbar' => 'var(--color-border-maxcontrast) transparent',
 
 			// error/warning/success/info feedback colours
 			'--color-error' => $colorError,

apps/theming/lib/Themes/HighContrastTheme.php

@@ -94,7 +94,7 @@ public function getCSSVariables(): array {
 
 				'--color-favorite' => '#936B06',
 
-				'--color-scrollbar' => $this->util->darken($colorMainBackground, 25),
+				'--color-scrollbar' => 'auto',
 
 				// used for the icon loading animation
 				'--color-loading-light' => '#dddddd',

core/css/server.css

@@ -20,8 +20,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr
 	font-family: inherit;
 	vertical-align: baseline;
 	cursor: default;
-	scrollbar-color: var(--color-border-dark) transparent;
-	scrollbar-width: thin;
+	scrollbar-color: var(--color-scrollbar);
 }
 
 .js-focus-visible :focus:not(.focus-visible) {