Merge pull request #4691 from neos/task/fix-73-neos-neos-css-build

TASK: Adjust neos/neos css build to work on apple silicon
neos · Nov 13, 2023 · 407721f · 407721f
2 parents b1d7a0d + 7d2b36a
commit 407721f
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 1,264 deletions.
diff --git a/Neos.Neos/Resources/Private/Styles/Typeplate/_Typeplate.scss b/Neos.Neos/Resources/Private/Styles/Typeplate/_Typeplate.scss
@@ -1,3 +1,4 @@
+@use 'sass:math';
 /*!
  *
 .||..||..||..||..||..||..||..||..||..||..||..||..||..||..||..||..||..||..||.
@@ -496,11 +497,13 @@ $dropcap-bg: transparent !default;
 // -------------------------------------//
 
 html {
+  font-weight: $font-weight;
+  font-size: math.percentage($font-size / 100);
+  line-height: $line-height;
   @if $custom-font-family {
-    font: $font-weight #{$font-size}%/#{$line-height} $custom-font-family,
-      $font-family;
+    font-family: $custom-font-family, $font-family;
   } @else {
-    font: $font-weight #{$font-size}%/#{$line-height} $font-family;
+    font-family: $font-family;
   }
 }
 

diff --git a/Neos.Neos/Resources/Public/Styles/Error.css b/Neos.Neos/Resources/Public/Styles/Error.css
diff --git a/Neos.Neos/Resources/Public/Styles/Error.css.map b/Neos.Neos/Resources/Public/Styles/Error.css.map
diff --git a/Neos.Neos/Resources/Public/Styles/Lite.css b/Neos.Neos/Resources/Public/Styles/Lite.css
diff --git a/Neos.Neos/Resources/Public/Styles/Lite.css.map b/Neos.Neos/Resources/Public/Styles/Lite.css.map
diff --git a/Neos.Neos/Resources/Public/Styles/Login.css b/Neos.Neos/Resources/Public/Styles/Login.css
diff --git a/Neos.Neos/Resources/Public/Styles/Login.css.map b/Neos.Neos/Resources/Public/Styles/Login.css.map
diff --git a/Neos.Neos/Resources/Public/Styles/Main.css b/Neos.Neos/Resources/Public/Styles/Main.css
diff --git a/Neos.Neos/Resources/Public/Styles/Main.css.map b/Neos.Neos/Resources/Public/Styles/Main.css.map
diff --git a/Neos.Neos/Resources/Public/Styles/Minimal.css b/Neos.Neos/Resources/Public/Styles/Minimal.css
diff --git a/Neos.Neos/Resources/Public/Styles/Minimal.css.map b/Neos.Neos/Resources/Public/Styles/Minimal.css.map
diff --git a/Neos.Neos/Resources/Public/Styles/RawContentMode.css b/Neos.Neos/Resources/Public/Styles/RawContentMode.css
diff --git a/Neos.Neos/Resources/Public/Styles/RawContentMode.css.map b/Neos.Neos/Resources/Public/Styles/RawContentMode.css.map
diff --git a/Neos.Neos/Resources/Public/Styles/Welcome.css b/Neos.Neos/Resources/Public/Styles/Welcome.css
diff --git a/Neos.Neos/Resources/Public/Styles/Welcome.css.map b/Neos.Neos/Resources/Public/Styles/Welcome.css.map
diff --git a/Neos.Neos/package.json b/Neos.Neos/package.json
@@ -21,7 +21,7 @@
     "file-loader": "^6.2.0",
     "ignore-emit-webpack-plugin": "^2.0.6",
     "mini-css-extract-plugin": "^1.3.9",
-    "node-sass": "^7.0.3",
+    "node-sass": "npm:sass",
     "sass-loader": "^11.0.1",
     "style-loader": "^2.0.0",
     "terser-webpack-plugin": "^5.1.1",