From a11bbd667a29f97f5d1240248953de04fa55f721 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 26 Jul 2022 20:09:37 +0200 Subject: [PATCH 1/3] Fix typos --- application/cmdbabstract.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index e9cb2a38a..79c8e039f 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 */ From 6ee67a2a3644b571a1bf30b9b06dc1535a64d706 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 26 Jul 2022 22:11:38 +0200 Subject: [PATCH 2/3] =?UTF-8?q?N=C2=B05108=20-=20Fix=20variable=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 9 ++++----- css/backoffice/components/_field.scss | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 720823080..75075e8cb 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)); 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 */ } From a80cfb6b0514411293453b8d45ee38d82fe1d69e Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 26 Jul 2022 22:18:21 +0200 Subject: [PATCH 3/3] =?UTF-8?q?N=C2=B05302=20-=20Code=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 75075e8cb..614a7f8e1 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -2866,7 +2866,7 @@ HTML; */ public static function IsNullOrEmptyString(?string $sString): bool { - return $sString == null || strlen($sString) == 0; + return $sString === null || strlen($sString) === 0; } /**