diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-08 10:40:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 10:40:37 +0200 |
| commit | bcea6a041fcb9c0057e0aa571366750798e735f6 (patch) | |
| tree | 718d6562fadeb6dfb22694d09e16e2c933a449ea | |
| parent | 3313c682bffa7d105c2c510bb521575a15d75099 (diff) | |
| parent | e0ce8a7640f7fadf27cc2a341a28337b145c7a1e (diff) | |
| download | nextcloud-server-bcea6a041fcb9c0057e0aa571366750798e735f6.tar.gz nextcloud-server-bcea6a041fcb9c0057e0aa571366750798e735f6.zip | |
Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction
[stable12] Use same lightness calculation as the SCSS compiler for theming
| -rw-r--r-- | apps/theming/lib/Util.php | 11 |
1 files changed, 7 insertions, 4 deletions
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; } /** |