Merge pull request #4333 from Automattic/skatepark-typography

Skatepark: typography settings

blockbase/inc/customizer/wp-customize-fonts.php

@@ -310,9 +310,32 @@ class GlobalStylesFontsCustomizer {
 	function get_font_family( $location, $configuration ) {
 		$variable = $configuration['settings']['custom'][ $location ]['typography']['fontFamily'];
 		$slug     = preg_replace( '/var\(--wp--preset--font-family--(.*)\)/', '$1', $variable );
+		if ( ! isset( $this->fonts[ $slug ] ) ) {
+			$this->fonts[ $slug ] = $this->build_font_from_theme_data( $slug, $location, $configuration );
+		}
 		return $this->fonts[ $slug ];
 	}
 
+	function build_font_from_theme_data( $slug, $location, $configuration ) {
+		$new_font      = array();
+		$google_fonts  = $configuration['settings']['custom']['fontsToLoadFromGoogle'];
+		$font_families = $configuration['settings']['typography']['fontFamilies']['theme'];
+		foreach ( $font_families as $font_family ) {
+			if ( $font_family['slug'] === $slug ) {
+				$new_font['fontFamily'] = $font_family['fontFamily'];
+				$new_font['name']       = $font_family['name'];
+			}
+		}
+		foreach ( $google_fonts as $google_font ) {
+			$aux = str_replace( '+', '-', $google_font );
+			if ( strripos( $aux, $slug ) !== false ) {
+				$new_font['google'] = $google_font;
+			}
+		}
+		$new_font['slug'] = $slug;
+		return $new_font;
+	}
+
 	function add_setting_and_control( $wp_customize, $name, $label, $default, $user_value ) {
 		$setting_name          = $this->section_key . $name;
 		$global_styles_setting = new WP_Customize_Global_Styles_Setting(

blockbase/theme.json

@@ -374,13 +374,6 @@
 					"width": "2px"
 				}
 			},
-			"core/heading": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -460,36 +453,57 @@
 		"elements": {
 			"h1": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "48px"
 				}
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "32px"
 				}
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
 				}
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"link": {
 				"color": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"text": "var(--wp--custom--color--primary)"
 				}
 			}

mayland-blocks/theme.json

@@ -402,13 +402,6 @@
 					"width": "2px"
 				}
 			},
-			"core/heading": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -488,36 +481,57 @@
 		"elements": {
 			"h1": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "41.47px"
 				}
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
 				}
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "24px"
 				}
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"link": {
 				"color": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"text": "var(--wp--custom--color--foreground)"
 				}
 			}

quadrat/assets/theme.css

@@ -495,11 +495,6 @@ ul ul {
 	margin-bottom: 0;
 }
 
-.wp-block-query-loop .wp-block-post-title,
-.wp-block-query .wp-block-post-title {
-	font-size: var(--wp--custom--heading--h3--font-size);
-}
-
 .wp-block-query-loop .wp-block-post-excerpt__more-text,
 .wp-block-query .wp-block-post-excerpt__more-text {
 	font-size: var(--wp--preset--font-size--tiny) !important;

quadrat/child-theme.json

@@ -165,12 +165,6 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "500"
-				},
-				"h1": {
-					"fontSize": "min(max(48px, 7vw), 80px)"
-				},
-				"h3": {
-					"fontSize": "min(max(28px, 5vw), 38px)"
 				}
 			},
 			"layout": {
@@ -312,7 +306,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--custom--heading--h1--font-size)",
+					"fontSize": "min(max(48px, 7vw), 80px)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2
 				}
@@ -360,6 +354,15 @@
 					"width": "1px 0 0 0"
 				}
 			},
+			"core/post-template": {
+				"elements": {
+					"h2": {
+						"typography": {
+							"fontSize": "min(max(28px, 5vw), 38px)"
+						}
+					}
+				}
+			},
 			"core/query-pagination": {
 				"typography": {
 					"fontSize": "18px",
@@ -380,7 +383,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontSize": "var(--wp--custom--heading--h1--font-size)",
+					"fontSize": "min(max(48px, 7vw), 80px)",
 					"lineHeight": 1.2
 				}
 			},
@@ -392,7 +395,7 @@
 			},
 			"h3": {
 				"typography": {
-					"fontSize": "var(--wp--custom--heading--h3--font-size)",
+					"fontSize": "min(max(28px, 5vw), 38px)",
 					"lineHeight": 1.2
 				}
 			},

quadrat/sass/blocks/_query.scss

@@ -1,8 +1,5 @@
 .wp-block-query-loop,
 .wp-block-query {
-	.wp-block-post-title {
-		font-size: var(--wp--custom--heading--h3--font-size);
-	}
 
 	// Important is necessary to override any other font size rules applied to the exerpt.
 	.wp-block-post-excerpt__more-text {

quadrat/theme.json

@@ -235,12 +235,6 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "500",
 					"lineHeight": 1.125
-				},
-				"h1": {
-					"fontSize": "min(max(48px, 7vw), 80px)"
-				},
-				"h3": {
-					"fontSize": "min(max(28px, 5vw), 38px)"
 				}
 			},
 			"latest-posts": {
@@ -446,13 +440,6 @@
 					"lineHeight": "1.6"
 				}
 			},
-			"core/heading": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "18px"
@@ -461,7 +448,7 @@
 			"core/post-title": {
 				"typography": {
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
-					"fontSize": "var(--wp--custom--heading--h1--font-size)",
+					"fontSize": "min(max(48px, 7vw), 80px)",
 					"lineHeight": 1.2,
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
 				}
@@ -550,6 +537,15 @@
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
 			},
+			"core/post-template": {
+				"elements": {
+					"h2": {
+						"typography": {
+							"fontSize": "min(max(28px, 5vw), 38px)"
+						}
+					}
+				}
+			},
 			"core/query-pagination": {
 				"typography": {
 					"fontSize": "18px",
@@ -564,42 +560,57 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontSize": "var(--wp--custom--heading--h1--font-size)",
-					"lineHeight": 1.2
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.2,
+					"fontSize": "min(max(48px, 7vw), 80px)"
 				}
 			},
 			"h2": {
 				"typography": {
-					"fontSize": "min(max(36px, 6vw), 65px)",
-					"lineHeight": 1.2
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.2,
+					"fontSize": "min(max(36px, 6vw), 65px)"
 				}
 			},
 			"h3": {
 				"typography": {
-					"fontSize": "var(--wp--custom--heading--h3--font-size)",
-					"lineHeight": 1.2
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.2,
+					"fontSize": "min(max(28px, 5vw), 38px)"
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontSize": "20px",
-					"lineHeight": 1.4
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.4,
+					"fontSize": "20px"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "18px",
-					"lineHeight": 1.4
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.4,
+					"fontSize": "18px"
 				}
 			},
 			"h6": {
 				"typography": {
-					"fontSize": "16px",
-					"lineHeight": 1.4
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": 1.4,
+					"fontSize": "16px"
 				}
 			},
 			"link": {
 				"color": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"text": "var(--wp--custom--color--foreground)"
 				}
 			}

seedlet-blocks/theme.json

@@ -431,13 +431,6 @@
 					"width": "2px"
 				}
 			},
-			"core/heading": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -522,36 +515,57 @@
 		"elements": {
 			"h1": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "48px"
 				}
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "32px"
 				}
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
 				}
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"link": {
 				"color": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"text": "var(--wp--custom--color--primary)"
 				}
 			}

skatepark/child-theme.json

@@ -16,13 +16,126 @@
 			]
 		},
 		"custom": {
+			"body": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"lineHeight": 1.6
+				}
+			},
 			"color": {
 				"foreground": "var(--wp--preset--color--primary)",
 				"background": "var(--wp--preset--color--background)",
 				"primary": "var(--wp--preset--color--primary)",
 				"secondary": "var(--wp--preset--color--primary)",
 				"selection": "var(--wp--preset--color--primary)"
+			},
+			"fontsToLoadFromGoogle": [
+				"family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
+			],
+			"heading": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"fontWeight": "700"
+				}
+			},
+			"line-height": {
+				"body": 1.6
 			}
+		},
+		"typography": {
+			"customFontSize": true,
+			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "\"Red Hat Display\", sans-serif",
+					"slug": "red-hat-display",
+					"name": "Red Hat Display"
+				}
+			],
+			"fontSizes": [
+				{
+					"name": "Tiny",
+					"size": "14px",
+					"slug": "tiny"
+				},
+				{
+					"name": "Extra Small",
+					"size": "16px",
+					"slug": "small"
+				},
+				{
+					"name": "Small",
+					"size": "20px",
+					"slug": "normal"
+				},
+				{
+					"name": "Medium",
+					"size": "24px",
+					"slug": "large"
+				},
+				{
+					"name": "Large",
+					"size": "min(max(28px, 5vw), 36px)",
+					"slug": "extra-large"
+				},
+				{
+					"name": "Extra Large",
+					"size": "min(max(36px, 5vw), 48px)",
+					"slug": "huge"
+				}
+			]
+		}
+	},
+	"styles": {
+		"elements": {
+			"h1": {
+				"typography": {
+					"fontSize": "min(max(48px, 7vw), 72px)",
+					"lineHeight": 1.2,
+					"fontWeight": "700"
+				}
+			},
+			"h2": {
+				"typography": {
+					"fontSize": "min(max(36px, 5vw), 64px)",
+					"lineHeight": 1.2,
+					"fontWeight": "900"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontSize": "min(max(30px, 5vw), 48px)",
+					"lineHeight": 1.4,
+					"fontWeight": "900"
+				}
+			},
+			"h4": {
+				"typography": {
+					"fontSize": "20px",
+					"lineHeight": 1.3,
+					"fontWeight": "900",
+					"textTransform": "uppercase"
+				}
+			},
+			"h5": {
+				"typography": {
+					"fontSize": "16px",
+					"lineHeight": 1.3,
+					"fontWeight": "900",
+					"textTransform": "uppercase"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontSize": "14px",
+					"lineHeight": 1.3,
+					"fontWeight": "900",
+					"textTransform": "uppercase"
+				}
+			}
+		},
+		"typography": {
+			"fontWeight": "400"
 		}
 	}
 }

skatepark/sass/base/_text.scss

@@ -1,5 +1,4 @@
 // Text selection text color
-
 ::selection {
 	color: var(--wp--preset--color--background);
 }

skatepark/theme.json

@@ -165,14 +165,14 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--system-font)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"lineHeight": 1.6
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--system-font)",
-					"fontWeight": 400,
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"fontWeight": "700",
 					"lineHeight": 1.125
 				}
 			},
@@ -183,6 +183,9 @@
 					}
 				}
 			},
+			"layout": {
+				"contentSize": "620px"
+			},
 			"list": {
 				"spacing": {
 					"padding": {
@@ -268,6 +271,12 @@
 					"textAlign": "center",
 					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
+			},
+			"fontsToLoadFromGoogle": [
+				"family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
+			],
+			"line-height": {
+				"body": 1.6
 			}
 		},
 		"layout": {
@@ -289,9 +298,9 @@
 			"customLineHeight": true,
 			"fontFamilies": [
 				{
-					"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
+					"fontFamily": "\"Red Hat Display\", sans-serif",
+					"slug": "red-hat-display",
+					"name": "Red Hat Display"
 				}
 			],
 			"fontSizes": [
@@ -301,23 +310,28 @@
 					"slug": "tiny"
 				},
 				{
-					"name": "Small",
+					"name": "Extra Small",
 					"size": "16px",
 					"slug": "small"
 				},
 				{
-					"name": "Normal",
-					"size": "18px",
+					"name": "Small",
+					"size": "20px",
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "24px",
 					"slug": "large"
 				},
 				{
-					"name": "Huge",
-					"size": "28px",
+					"name": "Large",
+					"size": "min(max(28px, 5vw), 36px)",
+					"slug": "extra-large"
+				},
+				{
+					"name": "Extra Large",
+					"size": "min(max(36px, 5vw), 48px)",
 					"slug": "huge"
 				}
 			]
@@ -356,13 +370,6 @@
 					"width": "2px"
 				}
 			},
-			"core/heading": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -442,36 +449,60 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontSize": "48px"
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "700",
+					"lineHeight": 1.2,
+					"fontSize": "min(max(48px, 7vw), 72px)"
 				}
 			},
 			"h2": {
 				"typography": {
-					"fontSize": "32px"
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "900",
+					"lineHeight": 1.2,
+					"fontSize": "min(max(36px, 5vw), 64px)"
 				}
 			},
 			"h3": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)"
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "900",
+					"lineHeight": 1.4,
+					"fontSize": "min(max(30px, 5vw), 48px)"
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "900",
+					"lineHeight": 1.3,
+					"fontSize": "20px",
+					"textTransform": "uppercase"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "900",
+					"lineHeight": 1.3,
+					"fontSize": "16px",
+					"textTransform": "uppercase"
 				}
 			},
 			"h6": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "900",
+					"lineHeight": 1.3,
+					"fontSize": "14px",
+					"textTransform": "uppercase"
 				}
 			},
 			"link": {
 				"color": {
+					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"text": "var(--wp--custom--color--primary)"
 				}
 			}
@@ -479,7 +510,8 @@
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--custom--body--typography--font-family)",
-			"fontSize": "var(--wp--preset--font-size--normal)"
+			"fontSize": "var(--wp--preset--font-size--normal)",
+			"fontWeight": "400"
 		}
 	}
 }