From 49b650029a596b8f6bacc9c11918a1f607f8ac54 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Thu, 16 Jun 2022 23:29:46 +0200 Subject: [PATCH] :package: Update redistributes --- .../common/css/datacenter-view.scss | 5 +++-- .../console/applicationuiextension.class.inc.php | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dist/molkobain-datacenter-view/molkobain-datacenter-view/common/css/datacenter-view.scss b/dist/molkobain-datacenter-view/molkobain-datacenter-view/common/css/datacenter-view.scss index 9bd602c..78ae397 100644 --- a/dist/molkobain-datacenter-view/molkobain-datacenter-view/common/css/datacenter-view.scss +++ b/dist/molkobain-datacenter-view/molkobain-datacenter-view/common/css/datacenter-view.scss @@ -6,8 +6,9 @@ * Use of this extension is bound by the license you purchased. A license grants you a non-exclusive and non-transferable right to use and incorporate the item in your personal or commercial projects. There are several licenses available (see https://www.molkobain.com/usage-licenses/ for more informations) */ -@import '../env-production/molkobain-handy-framework/asset/css/toolbox.scss'; -@import '../env-production/molkobain-datacenter-view/common/css/variables.scss'; +/* Paths relative to the current environment so it works in any of them, but the env. folder path MUST be passed to the SCSS compiler */ +@import 'molkobain-handy-framework/asset/css/toolbox.scss'; +@import 'molkobain-datacenter-view/common/css/variables.scss'; .molkobain-datacenter-view{ /* Reset for admin console mostly */ diff --git a/dist/molkobain-datacenter-view/molkobain-datacenter-view/console/applicationuiextension.class.inc.php b/dist/molkobain-datacenter-view/molkobain-datacenter-view/console/applicationuiextension.class.inc.php index f59f5db..dcf45a0 100644 --- a/dist/molkobain-datacenter-view/molkobain-datacenter-view/console/applicationuiextension.class.inc.php +++ b/dist/molkobain-datacenter-view/molkobain-datacenter-view/console/applicationuiextension.class.inc.php @@ -69,7 +69,10 @@ public function OnDisplayRelations($oObject, WebPage $oPage, $bEditMode = false) } else { $sPortalCssBaseRelPath = 'datamodels/2.x/itop-portal-base/portal/web/css/'; } - $aScssImportPaths = array(APPROOT.$sPortalCssBaseRelPath); + $aScssImportPaths = [ + APPROOT.$sPortalCssBaseRelPath, + MODULESROOT, // For imports of modules files + ]; $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().utils::GetCSSFromSASS($sModuleCssBaseRelPath.'datacenter-view.scss', $aScssImportPaths)); // Add content in an async tab