build(deps): bump scssphp/scssphp from 1.13.0 to 2.0.0 (#18627)

* build(deps): bump scssphp/scssphp from 1.13.0 to 2.0.0 Bumps [scssphp/scssphp](https://github.com/scssphp/scssphp) from 1.13.0 to 2.0.0. - [Release notes](https://github.com/scssphp/scssphp/releases) - [Commits](scssphp/scssphp@v1.13.0...v2.0.0) --- updated-dependencies: - dependency-name: scssphp/scssphp dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Fix SCSS issues * Reduce max allowed memory for SCSS compilation --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cédric Anne <[email protected]>
glpi-project · Jan 14, 2025 · 0fa6e4c · 0fa6e4c
1 parent 2f13c37
commit 0fa6e4c
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 33 deletions.
diff --git a/composer.json b/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",

diff --git a/composer.lock b/composer.lock
diff --git a/css/includes/components/_racks.scss b/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 {

diff --git a/css/includes/components/_select2.scss b/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;
             }

diff --git a/css/legacy/includes/_styles.scss b/css/legacy/includes/_styles.scss
@@ -197,11 +197,11 @@
       }
 
       &.disabled {
+         opacity: .3;
+
          &:hover {
             opacity: .3;
          }
-
-         opacity: .3;
       }
    }
 

diff --git a/front/css.php b/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));
 }