diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index efc31737b..958517221 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -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 */ diff --git a/application/utils.inc.php b/application/utils.inc.php index 99abff2e9..529ec535c 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -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; } /** diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss index f86e7db85..736a756b3 100644 --- a/css/backoffice/components/_field.scss +++ b/css/backoffice/components/_field.scss @@ -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 */ }