tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LessCompiler: Put required assets into a module's css block 

We have to include these there otherwise mixins from assets
can't be used.
This commit is contained in:
Johannes Meyer 2019-10-01 15:27:51 +02:00
parent f4c43ecafb
commit 52d830170f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/Icinga/Web/LessCompiler.php
View File

@ -172,19 +172,17 @@ class LessCompiler
$this->source .= file_get_contents($lessFile);
}
$requireCss = '';
foreach ($this->moduleRequires as $requiredFile => $modules) {
$containers = array_map(function ($name) {
return '.icinga-module.module-' . $name;
}, $modules);
$requireCss .= join(',', $containers) . ' {' . file_get_contents($requiredFile) . '}';
}
$this->source .= $requireCss;
$moduleCss = '';
foreach ($this->moduleLessFiles as $moduleName => $moduleLessFiles) {
$moduleCss .= '.icinga-module.module-' . $moduleName . ' {';
// TODO: Import these. (https://github.com/leafo/lessphp/issues/515)
foreach ($this->moduleRequires as $requiredFile => $modules) {
if (in_array($moduleName, $modules, true)) {
$moduleCss .= file_get_contents($requiredFile);
}
}
foreach ($moduleLessFiles as $moduleLessFile) {
$moduleCss .= file_get_contents($moduleLessFile);
}