mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightness-correction 

Revert "[stable12] theming lightness correction"
This commit is contained in:
Lukas Reschke 2017-08-04 15:39:15 +02:00 committed by GitHub
parent 9b57d33631 3474d73cae
commit b500f8fbe9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/theming/lib/Util.php
View File

@ -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;
}
/**