Merge pull request #27896 from nextcloud/backport/27854/stable21

nextcloud · Jul 13, 2021 · 7e446c3 · 7e446c3
2 parents 6b5bd9d + da127e5
commit 7e446c3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/apps/accessibility/js/accessibilityoca.js b/apps/accessibility/js/accessibilityoca.js
diff --git a/apps/accessibility/js/accessibilityoca.js.map b/apps/accessibility/js/accessibilityoca.js.map
diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php
@@ -79,6 +79,7 @@ public function injectCss(IUserSession $userSession,
 			$hash = md5(implode('-', $userValues));
 			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
 			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
+			\OCP\Util::addScript('accessibility', 'accessibilityoca');
 		}
 	}
 }
diff --git a/apps/accessibility/lib/Service/JSDataService.php b/apps/accessibility/lib/Service/JSDataService.php
@@ -61,6 +61,7 @@ public function getData() {
 		}
 
 		return [
+			'checkMedia' => $user === null,
 			'theme' => $theme,
 			'highcontrast' => $highcontrast,
 		];

diff --git a/apps/accessibility/src/accessibilityoca.js b/apps/accessibility/src/accessibilityoca.js
@@ -22,6 +22,11 @@
 import { loadState } from '@nextcloud/initial-state'
 
 OCA.Accessibility = loadState('accessibility', 'data')
+if (OCA.Accessibility.checkMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+	// Overwrite the theme for Guests based on the prefers-color-scheme
+	OCA.Accessibility.theme = 'dark'
+}
+
 if (OCA.Accessibility.theme !== false) {
 	document.body.classList.add(`theme--${OCA.Accessibility.theme}`)
 } else {

diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
@@ -52,10 +52,7 @@ <h2>{emptytext}</h2>
 							<span class="filename-parts__last">{filename2}</span>
 						</span>
 					</td>
-					<td class="filesize"
-						style="color:rgb({sizeColor}, {sizeColor}, {sizeColor})">
-						{size}
-					</td>
+					<td class="filesize">{size}</td>
 					<td class="date">{date}</td>
 				</tr>
 			</tbody>