Do not use mixin for font-sizes

WordPress · Dec 14, 2021 · 669f4f0 · 669f4f0
1 parent 3234772
commit 669f4f0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/packages/base-styles/_mixins.scss b/packages/base-styles/_mixins.scss
@@ -538,13 +538,3 @@
 	}
 	/* stylelint-enable function-comma-space-after */
 }
-
-// Deprecated from UI, kept for back-compatibility
-@mixin font-sizes-deprecated() {
-	.has-normal-font-size {
-		font-size: var(--wp--preset--font-size--normal);
-	}
-	.has-huge-font-size {
-		font-size: var(--wp--preset--font-size--huge);
-	}
-}
diff --git a/packages/block-library/src/common.scss b/packages/block-library/src/common.scss
@@ -8,7 +8,6 @@
 	@include gradient-colors-deprecated();
 	--wp--preset--font-size--normal: 16px;
 	--wp--preset--font-size--huge: 42px;
-	@include font-sizes-deprecated();
 }
 
 // Font sizes (not used now, kept because of backward compatibility).
@@ -20,6 +19,14 @@
 	font-size: 2.625em;
 }
 
+.has-normal-font-size {
+	font-size: var(--wp--preset--font-size--normal);
+}
+
+.has-huge-font-size {
+	font-size: var(--wp--preset--font-size--huge);
+}
+
 // Text alignments.
 .has-text-align-center {
 	text-align: center;

diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss
@@ -52,7 +52,6 @@
 	@include gradient-colors-deprecated();
 	--wp--preset--font-size--normal: 16px;
 	--wp--preset--font-size--huge: 42px;
-	@include font-sizes-deprecated();
 }
 
 // Font sizes (not used now, kept because of backward compatibility).
@@ -67,6 +66,14 @@
 	font-size: 42px;
 }
 
+.editor-styles-wrapper .has-normal-font-size {
+	font-size: var(--wp--preset--font-size--normal);
+}
+
+.editor-styles-wrapper .has-huge-font-size {
+	font-size: var(--wp--preset--font-size--huge);
+}
+
 /**
  * Editor Normalization Styles
  *