Move body from typography to general, disable declaration-property-un…

…it-allowed-list, T-13959
digitoimistodude · Oct 25, 2024 · b79facd · b79facd
1 parent 527df33
commit b79facd
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 76 deletions.
diff --git a/.stylelintrc b/.stylelintrc
@@ -170,24 +170,6 @@
         ]
       }
     ],
-    "declaration-property-unit-allowed-list": [
-      {
-        "font-size": [
-          "rem",
-          "em",
-          "px"
-        ],
-        "/^animation/": [
-          "ms",
-          "s"
-        ],
-        "line-height": [
-          "px",
-          "%",
-          ""
-        ]
-      }
-    ],
     "a11y/font-size-is-readable": [
       true,
       {
@@ -224,4 +206,4 @@
       "background"
     ]
   }
-}
+}
diff --git a/css/dev/global.css b/css/dev/global.css
diff --git a/css/dev/gutenberg-editor-styles.css b/css/dev/gutenberg-editor-styles.css
diff --git a/css/prod/global.css b/css/prod/global.css
diff --git a/css/prod/gutenberg-editor-styles.css b/css/prod/gutenberg-editor-styles.css
diff --git a/sass/layout/_general.scss b/sass/layout/_general.scss
@@ -2,6 +2,26 @@
 // that apply everywhere throughout the website. Add more
 // always repeating elements right below.
 
+// Set root size for rems
+:root {
+  font-size: 62.5%;
+}
+
+// Body
+.is-root-container,
+.acf-block-preview .block,
+body {
+  color: var(--color-paragraph);
+  font-family: var(--font-paragraph);
+  font-size: var(--font-size-paragraph);
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  font-weight: var(--font-weight-paragraph);
+  line-height: var(--line-height-paragraph);
+  // stylelint-disable-next-line value-keyword-case
+  text-rendering: geometricPrecision;
+}
+
 // Default structural element
 .block {
   background-color: var(--color-white);

diff --git a/sass/layout/_typography.scss b/sass/layout/_typography.scss
@@ -1,28 +1,3 @@
-// stylelint-disable declaration-property-unit-allowed-list
-// Everything around fonts, font size definitions and typeset
-// presets. No modular scale, but a sophisticated viewport
-// based responsive mixin can be found in _helpers.scss
-
-// Set root size for rems
-:root {
-  font-size: 62.5%;
-}
-
-// Typography settings
-.is-root-container,
-.acf-block-preview .block,
-body {
-  color: var(--color-paragraph);
-  font-family: var(--font-paragraph);
-  font-size: var(--font-size-paragraph);
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  font-weight: var(--font-weight-paragraph);
-  line-height: var(--line-height-paragraph);
-  // stylelint-disable-next-line value-keyword-case
-  text-rendering: geometricPrecision;
-}
-
 // Heading defaults
 h1,
 h2,