Merge pull request #93 from WordPress/fix/mimic-paragraph-styles

Twenty Twenty One Blocks: Migrate Paragraph Block styles
WordPress · Dec 10, 2020 · cbcbbfa · cbcbbfa
2 parents 57f0d0e + 1b2ce36
commit cbcbbfa
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/twentytwentyone-blocks/assets/css/style-shared.css b/twentytwentyone-blocks/assets/css/style-shared.css
@@ -8,16 +8,6 @@ body {
 	-webkit-font-smoothing: antialiased;
 }
 
-h1,
-.has-huge-font-size,
-.has-gigantic-font-size {
-	font-weight: var(--wp--custom--font-weight-light);
-}
-
-h2, h3, h4, h5, h6 {
-	font-weight: normal;
-}
-
 /*
  * text-underline-offset doesn't work in Chrome at all 👎
  * But looks nice in Safari/Firefox, so let's keep it and

diff --git a/twentytwentyone-blocks/experimental-theme.json b/twentytwentyone-blocks/experimental-theme.json
@@ -136,6 +136,45 @@
 						"name": "Gigantic"
 					}
 				],
+				"fontWeights": [
+					{
+						"slug": "light",
+						"value": 300,
+						"name": "Light"
+					},
+					{
+						"slug": "normal",
+						"value": "normal",
+						"name": "Normal"
+					},
+					{
+ 						"slug": "medium",
+ 						"value": "500",
+ 						"name": "Medium"
+ 					},
+ 					{
+						"slug": "semibold",
+						"value": 600,
+						"name": "Semibold"
+					},
+					{
+						"slug": "bold",
+						"value": 700,
+						"name": "Bold"
+					}
+				],
+				"fontStyles": [
+					{
+						"slug": "normal",
+						"value": "normal",
+						"name": "Normal"
+					},
+					{
+						"slug": "italic",
+						"value": "italic",
+						"name": "Italic"
+					}
+				],
 				"fontFamilies": [
 					{
 						"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
@@ -166,7 +205,6 @@
 			},
 			"custom": {
 				"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-				"font-weight-light": 300,
 				"line-height": {
 					"body": 1.7,
 					"heading": 1.3,