Merge branch '8.1' into 8.2

neos · Nov 13, 2023 · 9c38a83 · 9c38a83
2 parents d13b16a + af08f0f
commit 9c38a83
Show file tree

Hide file tree

Showing 19 changed files with 60,707 additions and 3,045 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/JavaScript/Main.min.js b/Neos.Neos/Resources/Public/JavaScript/Main.min.js
diff --git a/Neos.Neos/Resources/Public/JavaScript/Main.min.js.map b/Neos.Neos/Resources/Public/JavaScript/Main.min.js.map
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