Merge branch 'master' into feature/support-for-file-uploads-8758
This commit is contained in:
commit
54a77b7253
|
@ -73,6 +73,6 @@ class ModuleActionController extends ActionController
|
|||
public function postDispatchXhr()
|
||||
{
|
||||
parent::postDispatchXhr();
|
||||
$this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName);
|
||||
$this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName, true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,6 @@ use RecursiveDirectoryIterator;
|
|||
use RecursiveIteratorIterator;
|
||||
use RegexIterator;
|
||||
use RecursiveRegexIterator;
|
||||
use Zend_Controller_Front;
|
||||
use Icinga\Application\Icinga;
|
||||
use lessc;
|
||||
|
||||
|
@ -31,8 +30,6 @@ class LessCompiler
|
|||
*/
|
||||
private $lessc;
|
||||
|
||||
private $baseUrl;
|
||||
|
||||
private $source;
|
||||
|
||||
/**
|
||||
|
@ -44,6 +41,17 @@ class LessCompiler
|
|||
$this->lessc = new lessc();
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable the extendend import functionality
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function disableExtendedImport()
|
||||
{
|
||||
$this->lessc->importDisabled = true;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function compress()
|
||||
{
|
||||
$this->lessc->setPreserveComments(false);
|
||||
|
|
|
@ -99,6 +99,7 @@ class StyleSheet
|
|||
}
|
||||
|
||||
$less = new LessCompiler();
|
||||
$less->disableExtendedImport();
|
||||
foreach ($lessFiles as $file) {
|
||||
$less->addFile($file);
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ label {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
input, select {
|
||||
input, select, textarea {
|
||||
box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
-webkit-box-sizing: border-box;
|
||||
|
@ -200,6 +200,14 @@ form label {
|
|||
width: 10em;
|
||||
}
|
||||
|
||||
form div.element > * {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
form dt {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
select, input[type=text], textarea {
|
||||
width: 20em;
|
||||
display: inline-block;
|
||||
|
|
Loading…
Reference in New Issue