Transition two-font themes to new structure

attar/theme.json

@@ -17,24 +17,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Inter\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Inter)",
-                    "google": "family=Inter:wght@100..900",
-                    "fontSlug": "inter"
-                },
-                {
-                    "fontFamily": "\"DM Sans\", sans-serif",
-                    "slug": "heading-font",
-                    "name": "Heading (DM Sans)",
-                    "google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700\"",
-                    "fontSlug": "dm-sans"
-                }
-            ]
-        },
         "custom": {
             "color": {
                 "foreground": "var(--wp--preset--color--foreground)",
@@ -44,5 +26,22 @@
                 "tertiary": "var(--wp--preset--color--background)"
             }
         }
+    },
+    "styles": {
+        "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|dm-sans"
+                }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|dm-sans"
+                }
+            }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|inter"
+        }
     }
 }

dorna/theme.json

@@ -34,33 +34,28 @@
                     "default": "#F0F0F0"
                 }
             ]
-        },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Lora\", serif",
-                    "slug": "body-font",
-                    "name": "Body (Lora)",
-                    "google": "family=Lora:ital,wght@0,400..700;1,400..700",
-                    "fontSlug": "lora"
-                },
-                {
-                    "fontFamily": "\"Playfair Display\", serif",
-                    "slug": "heading-font",
-                    "name": "Heading (Playfair Display)",
-                    "google": "family=Playfair+Display:ital,wght@0,400..900;1,400..900",
-                    "fontSlug": "playfair-display"
-                }
-            ]
         }
     },
     "styles": {
         "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|playfair-display"
+                }
+            },
             "core/paragraph": {
                 "color": {
                     "text": "var(--wp--preset--color--secondary)"
                 }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|playfair-display"
+                }
             }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|lora"
         }
     }
 }

farrow/theme.json

@@ -17,24 +17,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Roboto\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Roboto)",
-                    "google": "family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,800;1,900",
-                    "fontSlug": "roboto"
-                },
-                {
-                    "fontFamily": "\"Rubik\", sans-serif",
-                    "slug": "heading-font",
-                    "name": "Heading (Rubik)",
-                    "google": "family=Rubik:ital,wght@0,300..900;1,300..900",
-                    "fontSlug": "rubik"
-                }
-            ]
-        },
         "custom": {
             "color": {
                 "foreground": "var(--wp--preset--color--foreground)",
@@ -44,5 +26,22 @@
                 "tertiary": "var(--wp--preset--color--background)"
             }
         }
+    },
+    "styles": {
+        "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|rubik"
+                }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|rubik"
+                }
+            }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|roboty"
+        }
     }
 }

hari/theme.json

@@ -29,24 +29,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Source Sans Pro\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Source Sans Pro)",
-                    "google": "family=Source+Sans+Pro:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700;1,900",
-                    "fontSlug": "source-sans-pro"
-                },
-                {
-                    "fontFamily": "\"Bodoni Moda\", serif",
-                    "slug": "heading-font",
-                    "name": "Heading (Bodoni Moda)",
-                    "google": "family=Bodoni+Moda:ital,wght@0,400..900;1,400..900",
-                    "fontSlug": "bodoni-moda"
-                }
-            ]
-        },
         "custom": {
             "color": {
                 "foreground": "var(--wp--preset--color--foreground)",
@@ -56,5 +38,22 @@
                 "tertiary": "var(--wp--preset--color--tertiary)"
             }
         }
+    },
+    "styles": {
+        "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|bodoni-moda"
+                }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|bodoni-moda"
+                }
+            }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|source-sans-pro"
+        }
     }
 }

kingsley/theme.json

@@ -17,24 +17,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Overpass\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Overpass)",
-                    "google": "family=Overpass:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900",
-                    "fontSlug": "overpass"
-                },
-                {
-                    "fontFamily": "\"Bodoni Moda\", serif",
-                    "slug": "heading-font",
-                    "name": "Heading (Bodoni Moda)",
-                    "google": "family=Bodoni+Moda:ital,wght@0,400..900;1,400..900",
-                    "fontSlug": "bodoni-moda"
-                }
-            ]
-        },
         "custom": {
 			"color": {
 				"foreground": "var(--wp--preset--color--foreground)",
@@ -44,5 +26,22 @@
 				"tertiary": "var(--wp--preset--color--background)"
 			}
         }
+    },
+    "styles": {
+        "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|bodoni-moda"
+                }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|bodoni-moda"
+                }
+            }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|overpass"
+        }
     }
 }

marl/theme.json

@@ -23,24 +23,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Fira Sans\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Fira Sans)",
-                    "google": "family=Fira+Sans:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400;1,500;1,600;1,700",
-                    "fontSlug": "fira-sans"
-                },
-                {
-                    "fontFamily": "\"EB Garamond\", serif",
-                    "slug": "heading-font",
-                    "name": "Heading (EB Garamond)",
-                    "google": "family=EB+Garamond:ital,wght@0,400..800;1,400..800",
-                    "fontSlug": "eb-garamond"
-                }
-            ]
-        },
         "custom": {
             "color": {
                 "foreground": "var(--wp--preset--color--foreground)",
@@ -50,5 +32,22 @@
                 "tertiary": "var(--wp--preset--color--tertiary)"
             }
         }
+    },
+    "styles": {
+        "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|eb-garamond"
+                }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|eb-garamond"
+                }
+            }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|fira-sans"
+        }
     }
 }

russell/theme.json

@@ -39,22 +39,6 @@
         "typography": {
             "customFontSize": true,
             "customLineHeight": true,
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"DM Sans\", sans-serif",
-                    "fontSlug": "dm-sans",
-                    "slug": "body-font",
-                    "name": "Body (DM Sans)",
-                    "google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-                },
-                {
-                    "fontFamily": "\"Libre Baskerville\", serif",
-                    "fontSlug": "libre-baskerville",
-                    "slug": "heading-font",
-                    "name": "Headings (Libre Baskerville)",
-                    "google": "family=Libre+Baskerville:ital,wght@0,400;0,700;1,400"
-                }
-            ],
             "fontSizes": [
                 {
                     "name": "Small",
@@ -81,11 +65,20 @@
     },
     "styles": {
         "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|libre-baskerville"
+                }
+            },
             "core/post-title": {
                 "typography": {
+			        "fontFamily": "var:preset|font-family|libre-baskerville",
                     "fontSize": "var(--wp--preset--font-size--x-large)"
                 }
             }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|dm-sans"
         }
     }
 }

seedlet-blocks/theme.json

@@ -135,22 +135,6 @@
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "'Fira Sans', Helvetica, Arial, sans-serif",
-					"fontSlug": "fira-sans",
-					"slug": "body-font",
-					"name": "Body (Fira Sans)",
-					"google": "family=Fira+Sans:ital,wght@0,100..900;1,100..900"
-				},
-				{
-					"fontFamily": "'Playfair Display', Georgia, Times, serif",
-					"fontSlug": "playfair-display",
-					"slug": "heading-font",
-					"name": "Heading (Playfair Display)",
-					"google": "family=Playfair+Display:ital,wght@0,400..900;1,400..900"
-				}
-			],
 			"fontSizes": [
 				{
 					"name": "Small",
@@ -181,9 +165,15 @@
 	},
 	"styles": {
 		"blocks": {
+			"core/heading": {
+  		              "typography": {
+				        "fontFamily": "var:preset|font-family|playfair-display"
+ 	                	}
+            		},
 			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--x-large)"
+					"fontSize": "var(--wp--preset--font-size--x-large)",
+			        	"fontFamily": "var:preset|font-family|playfair-display"
 				}
 			},
 			"core/pullquote": {
@@ -217,6 +207,10 @@
 					"fontSize": "3.4375rem"
 				}
 			}
-		}
+            
+        	},
+        	"typography": {
+			"fontFamily": "var:preset|font-family|fira-sans"
+ 	       }
 	}
 }

winkel/theme.json

@@ -29,23 +29,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (System Font)",
-                    "fontSlug": "system-font"
-                },
-                {
-                    "fontFamily": "\"Libre Baskerville\", serif",
-                    "slug": "heading-font",
-                    "name": "Heading (Libre Baskerville)",
-                    "google": "family=Libre+Baskerville:ital,wght@0,400;0,700;1,400",
-                    "fontSlug": "libre-baskerville"
-                }
-            ]
-        },
         "custom": {
             "color": {
                 "foreground": "var(--wp--preset--color--foreground)",
@@ -62,11 +45,21 @@
     },
     "styles": {
         "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|libre-baskerville"
+                }
+            },
             "core/paragraph": {
                 "color": {
                     "text": "var(--wp--preset--color--primary)"
                 }
             },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|libre-baskerville"
+                }
+            },
             "core/navigation": {
                 "typography": {
                     "fontSize": "var(--wp--preset--font-size--small)"
@@ -79,4 +72,4 @@
             }
         }
     }
-}
+}