From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 1 Aug 2017 17:09:07 +0000 (+0100)
Subject: Use same lightness calculation as the SCSS compiler for theming
X-Git-Tag: v12.0.3RC1~92^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e0ce8a7640f7fadf27cc2a341a28337b145c7a1e;p=nextcloud-server.git

Use same lightness calculation as the SCSS compiler for theming

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 286756a4849..e5fa90cb344 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -30,6 +30,7 @@ use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
 use OCP\Files\IRootFolder;
+use Leafo\ScssPhp\Compiler;
 
 class Util {
 
@@ -95,10 +96,12 @@ class Util {
 		if (strlen($hex) !== 6) {
 			return 0;
 		}
-		$r = hexdec(substr($hex, 0, 2));
-		$g = hexdec(substr($hex, 2, 2));
-		$b = hexdec(substr($hex, 4, 2));
-		return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
+		$red = hexdec(substr($hex, 0, 2));
+		$green = hexdec(substr($hex, 2, 2));
+		$blue = hexdec(substr($hex, 4, 2));
+		$compiler = new Compiler();
+		$hsl = $compiler->toHSL($red, $green, $blue);
+		return $hsl[3]/100;
 	}
 
 	/**