From 3474d73caed3947caca5458d607fd3d58d98b5ab Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 4 Aug 2017 15:38:56 +0200 Subject: Revert "[stable12] theming lightness correction" --- apps/theming/lib/Util.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php index e5fa90cb344..286756a4849 100644 --- a/apps/theming/lib/Util.php +++ b/apps/theming/lib/Util.php @@ -30,7 +30,6 @@ use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\IConfig; use OCP\Files\IRootFolder; -use Leafo\ScssPhp\Compiler; class Util { @@ -96,12 +95,10 @@ class Util { if (strlen($hex) !== 6) { return 0; } - $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; + $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; } /** -- cgit v1.2.3