Skip to content
Snippets Groups Projects
Commit 4d1ff830 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

LESS now factors in media parameters from theme.config.php for live compiling.

parent f58e15c8
No related merge requests found
......@@ -177,6 +177,9 @@ class LessCompiler
*/
protected function compileFile($theme, $less)
{
$parts = explode(':', $less);
$less = $parts[0];
$finalOutDir = $this->basePath . '/themes/' . $theme . '/css/';
list($fileName, ) = explode('.', $less);
$finalFile = $finalOutDir . $fileName . '.css';
......
......@@ -89,7 +89,7 @@ class HeadLink extends \Zend\View\Helper\HeadLink
*
* @return void
*/
public function addLessStylesheet($file)
public function addLessStylesheet($file, $media, $conditionalStylesheet)
{
$relPath = 'less/' . $file;
$urlHelper = $this->getView()->plugin('url');
......@@ -119,7 +119,9 @@ class HeadLink extends \Zend\View\Helper\HeadLink
'output' => str_replace('.less', '.css', $file)
)
);
$this->prependStylesheet($cssDirectory . $css_file_name);
$this->prependStylesheet(
$cssDirectory . $css_file_name, $media, $conditionalStylesheet
);
} catch (\Exception $e) {
error_log($e->getMessage());
list($fileName, ) = explode('.', $file);
......
......@@ -112,7 +112,12 @@ class HeadThemeResources extends \Zend\View\Helper\AbstractHelper
// Compile and load LESS (make sure we prepend them in the appropriate order
// theme resources should load before extras added by individual templates):
foreach (array_reverse($this->container->getLessCss()) as $current) {
$headLink()->addLessStylesheet($current);
$parts = explode(':', $current);
$headLink()->addLessStylesheet(
trim($parts[0]),
isset($parts[1]) ? trim($parts[1]) : 'all',
isset($parts[2]) ? trim($parts[2]) : false
);
}
// If we have a favicon, load it now:
......
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