Commit c03ffba8 authored by Shudrum's avatar Shudrum

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

parents 79fbebd4 18724f63
......@@ -1859,6 +1859,9 @@ class ToolsCore
public static function getBrightness($hex)
{
if (Tools::strtolower($hex) == 'transparent')
return '129';
$hex = str_replace('#', '', $hex);
$r = hexdec(substr($hex, 0, 2));
$g = hexdec(substr($hex, 2, 2));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment