Merge branch 'main' into remove-empty-test-set

composer.json

@@ -66,7 +66,7 @@
         "sabre/http": "^5.1",
         "sabre/uri": "^2.3",
         "sabre/vobject": "^4.5",
-        "scssphp/scssphp": "^1.13",
+        "scssphp/scssphp": "^2.0",
         "sebastian/diff": "^6.0",
         "simplepie/simplepie": "^1.8",
         "symfony/cache": "^6.4",

css/helpdesk_home.scss

@@ -102,8 +102,8 @@ header {
 
 .search-banner {
     background:
-        url('/pics/serfservice-portal-header-1.svg') no-repeat bottom right,
-        url('/pics/serfservice-portal-header-2.svg') no-repeat bottom left
+        url('../pics/serfservice-portal-header-1.svg') no-repeat bottom right,
+        url('../pics/serfservice-portal-header-2.svg') no-repeat bottom left
     ;
     background-color: var(--glpi-helpdesk-header);
     padding-top:150px;

css/includes/components/_racks.scss

@@ -428,6 +428,18 @@ ul.indexes {
 }
 
 .grid-rack {
+    width: 217px;
+    background:
+        var(--tblr-body-bg) repeating-linear-gradient(
+            transparent,
+            transparent 21px,
+            var(--tblr-bg-surface-tertiary) 21px,
+            var(--tblr-bg-surface-tertiary) 42px
+        );
+    z-index: 1;
+    border: 1px solid var(--tblr-border-color);
+    float: left;
+
     *,
     ::before,
     ::after {
@@ -441,18 +453,6 @@ ul.indexes {
             width: 100%;
         }
     }
-
-    width: 217px;
-    background:
-        var(--tblr-body-bg) repeating-linear-gradient(
-            transparent,
-            transparent 21px,
-            var(--tblr-bg-surface-tertiary) 21px,
-            var(--tblr-bg-surface-tertiary) 42px
-        );
-    z-index: 1;
-    border: 1px solid var(--tblr-border-color);
-    float: left;
 }
 
 .virtual_pdu_space {

css/includes/components/_select2.scss

@@ -112,13 +112,13 @@
             min-height: $input-height;
 
             .form-select-sm + & {
-                @include font-size($input-font-size-sm * 0.875);
+                @include font-size(calc(#{$input-font-size-sm} * 0.875));
 
                 min-height: $input-height-sm;
             }
 
             .form-select-lg + & {
-                @include font-size($input-font-size-lg * 0.875);
+                @include font-size(calc(#{$input-font-size-lg} * 0.875));
 
                 min-height: $input-height-lg;
             }

css/legacy/includes/_styles.scss

@@ -197,11 +197,11 @@
       }
 
       &.disabled {
+         opacity: .3;
+
          &:hover {
             opacity: .3;
          }
-
-         opacity: .3;
       }
    }
 

front/css.php

@@ -36,9 +36,9 @@
 use Glpi\Application\ErrorHandler;
 use Glpi\UI\ThemeManager;
 
-// Main CSS compilation requires about 140MB of memory on PHP 7.4 (110MB on PHP 8.2).
+// Main CSS compilation requires about 70MB of memory.
 // Ensure to have enough memory to not reach memory limit.
-$max_memory = 192;
+$max_memory = 96;
 if (Toolbox::getMemoryLimit() < ($max_memory * 1024 * 1024)) {
     ini_set('memory_limit', sprintf('%dM', $max_memory));
 }

src/Html.php

@@ -1130,7 +1130,6 @@ public static function includeHeader(
 
             if (in_array('gridstack', $jslibs)) {
                 $tpl_vars['css_files'][] = ['path' => 'lib/gridstack.css'];
-                $tpl_vars['css_files'][] = ['path' => 'css/standalone/gridstack-grids.scss'];
                 Html::requireJs('gridstack');
             }
 

tests/bootstrap.php

@@ -82,7 +82,6 @@
 include_once __DIR__ . '/GLPITestCase.php';
 include_once __DIR__ . '/DbTestCase.php';
 include_once __DIR__ . '/FrontBaseClass.php';
-include_once __DIR__ . '/HLAPITestCase.php';
 include_once __DIR__ . '/RuleBuilder.php';
 include_once __DIR__ . '/functional/Glpi/ContentTemplates/Parameters/AbstractParameters.php';