From 3693dee3d46dfff1a933112b6cb6dd90f3846594 Mon Sep 17 00:00:00 2001 From: Oreolek Date: Thu, 26 Sep 2013 12:37:54 +0700 Subject: [PATCH 1/5] Userguide compliance --- classes/Less/Core.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/classes/Less/Core.php b/classes/Less/Core.php index 56396b7..c3c94c3 100644 --- a/classes/Less/Core.php +++ b/classes/Less/Core.php @@ -1,5 +1,10 @@ Date: Sun, 1 Dec 2013 10:14:45 +0700 Subject: [PATCH 2/5] path for lessphp and compiler update --- classes/Less/Core.php | 2 +- vendor/lessphp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Less/Core.php b/classes/Less/Core.php index c3c94c3..75d8846 100644 --- a/classes/Less/Core.php +++ b/classes/Less/Core.php @@ -183,7 +183,7 @@ public static function _compile($filename) { if (Kohana::$config->load('less.vendor_internal') === TRUE) { - require_once '../vendor/lessphp/lessc.inc.php'; + require_once '../../vendor/lessphp/lessc.inc.php'; $less = new lessc($filename); try diff --git a/vendor/lessphp b/vendor/lessphp index c26bc93..bc4f33b 160000 --- a/vendor/lessphp +++ b/vendor/lessphp @@ -1 +1 @@ -Subproject commit c26bc93eb07014b422251a92d94fd40a915fd199 +Subproject commit bc4f33b4bfc889018ebe53611050729641b82dc6 From aaffc1b4eaf878e975f8ce9933cf4b34e72b42e3 Mon Sep 17 00:00:00 2001 From: Oreolek Date: Fri, 17 Jan 2014 12:57:46 +0700 Subject: [PATCH 3/5] Compress LESS files on external compiling --- classes/Less/Core.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/classes/Less/Core.php b/classes/Less/Core.php index 75d8846..d5a077c 100644 --- a/classes/Less/Core.php +++ b/classes/Less/Core.php @@ -55,7 +55,7 @@ public static function compile($array = '', $media = 'screen') $config = Kohana::$config->load('less'); // if compression is allowed - if ($config['compress']) + if ($config['compress'] AND $config['vendor_internal']) { return HTML::style(self::_combine($stylesheets), array('media' => $media)); } @@ -197,7 +197,12 @@ public static function _compile($filename) exit($ex->getMessage()); } } else { - $compiled = shell_exec('lessc ' . $filename); + $command ='lessc '; + if (Kohana::$config->load('less')->get('compress')) + { + $command = 'lessc --clean-css '; + } + $compiled = shell_exec($command . $filename); if (is_null($compiled)) exit($compiled); $compressed = self::_compress($compiled); file_put_contents($filename, $compressed); @@ -218,7 +223,12 @@ public static function _ccompile($original, $compiled) return lessc::ccompile($original, $compiled); } else { if (!is_file($compiled) || filemtime($original) > filemtime($compiled)) { - return (int) shell_exec('lessc ' . $original . ' >' . $compiled); + $command ='lessc '; + if (Kohana::$config->load('less')->get('compress')) + { + $command = 'lessc --clean-css '; + } + return (int) shell_exec($command . $original . ' >' . $compiled); } else { return true; } From 19e61497e200316d66be75ae8ae0b2074761769b Mon Sep 17 00:00:00 2001 From: Oreolek Date: Fri, 21 Feb 2014 13:51:53 +0700 Subject: [PATCH 4/5] Option to return style filename, not HTML tag --- classes/Less/Core.php | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/classes/Less/Core.php b/classes/Less/Core.php index d5a077c..f08a4ad 100644 --- a/classes/Less/Core.php +++ b/classes/Less/Core.php @@ -16,9 +16,11 @@ class Less_Core * @param mixed array of css paths or single path * @param string value of media css type * @param boolean allow compression + * @param boolean return HTML style tag or file paths * @return string link tag pointing to the css paths + * @return array array of css paths */ - public static function compile($array = '', $media = 'screen') + public static function compile($array = '', $media = 'screen', $html = TRUE) { if (is_string($array)) { @@ -64,10 +66,25 @@ public static function compile($array = '', $media = 'screen') foreach ($stylesheets as $file) { $filename = self::_get_filename($file, $config['path']); - array_push($assets, HTML::style($filename, array('media' => $media))); + if ($html) + { + $style = HTML::style($filename, array('media' => $media)); + } + else + { + $style = $filename; + } + array_push($assets, $style); } - return implode("\n", $assets); + if ($html) + { + return implode("\n", $assets); + } + else + { + return $assets; + } } /** From 86105891a8de20d167a441b4eb7457ff095f7770 Mon Sep 17 00:00:00 2001 From: Oreolek Date: Sun, 2 Mar 2014 17:17:34 +0700 Subject: [PATCH 5/5] compress more --- classes/Less/Core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Less/Core.php b/classes/Less/Core.php index f08a4ad..4cf3c1d 100644 --- a/classes/Less/Core.php +++ b/classes/Less/Core.php @@ -217,7 +217,7 @@ public static function _compile($filename) $command ='lessc '; if (Kohana::$config->load('less')->get('compress')) { - $command = 'lessc --clean-css '; + $command = 'lessc -x --clean-css '; } $compiled = shell_exec($command . $filename); if (is_null($compiled)) exit($compiled);