composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 15:34:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Molkobain
2022-07-26 22:32:22 +02:00
parent ce7f251064 a80cfb6b05
commit 76062ca8b2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/cmdbabstract.class.inc.php
View File

@@ -341,7 +341,7 @@ JS
}
/**
* @param \WebPage $oPage warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page !
* @param \WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
* When writing to the page, markup will be put above the real header of the panel.
* To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned.
* @param bool $bEditMode Deprecated parameter in iTop 3.0.0, use {@see GetDisplayMode()} and ENUM_DISPLAY_MODE_* constants instead
@@ -361,7 +361,7 @@ JS
* @throws \OQLException
*
* @since 3.0.0 $bEditMode is deprecated, see param documentation above
* @since 3.0.0 changed signature : method must return header content in an array (no more writing directly to the $oPage)
* @since 3.0.0 Changed signature: Method must return header content in an array (no more writing directly to the $oPage)
*
* @noinspection PhpUnusedParameterInspection
*/

11
application/utils.inc.php
View File

@@ -1945,18 +1945,17 @@ class utils
$oSass = new Compiler();
$oSass->setOutputStyle(OutputStyle::COMPRESSED);
// Setting our variables
$aCssVariable = [];
foreach ($aVariables as $entry=>$value) {
$aCssVariable[$entry] = ValueConverter::parseValue($value);
$aScssVariables = [];
foreach ($aVariables as $entry => $value) {
$aScssVariables[$entry] = ValueConverter::parseValue($value);
}
$oSass->addVariables($aCssVariable);
$oSass->addVariables($aScssVariables);
// Setting our imports paths
$oSass->setImportPaths($aImportPaths);
// Temporary disabling max exec time while compiling
$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
set_time_limit(0);
// Compiling SASS
//checkImportResolutions
$sCss = $oSass->compileString($sSassContent);
set_time_limit(intval($iCurrentMaxExecTime));
@@ -2857,7 +2856,7 @@ HTML;
*/
public static function IsNullOrEmptyString(?string $sString): bool
{
return $sString == null || strlen($sString) == 0;
return $sString === null || strlen($sString) === 0;
}
/**

1
css/backoffice/components/_field.scss
View File

@@ -94,6 +94,7 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
max-width: 145px;
width: 30%;
}
.ibo-field--value {
margin-top: $ibo-field--value--margin-top--for-large; /* Mostly used to have a clear separation from elements in .ibo-field--comments */
}