Blockbase 3

appleton/theme.json

@@ -28,6 +28,7 @@
 			}
 		},
 		"typography": {
+			"fontFamily": "var:preset|font-family|inter",
 			"fontStyle": "normal",
 			"fontWeight": "400",
 			"fontSize": "var:preset|font-size|small"
@@ -74,24 +75,6 @@
 					"name": "Tertiary"
 				}
 			]
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Inter\", sans-serif",
-					"slug": "body-font",
-					"name": "Body (Inter)",
-					"google": "family=Inter:[email protected]",
-					"fontSlug": "inter"
-				},
-				{
-					"fontFamily": "\"Inter\", sans-serif",
-					"slug": "heading-font",
-					"name": "Heading (Inter)",
-					"google": "family=Inter:[email protected]",
-					"fontSlug": "inter"
-				}
-			]
 		}
 	}
 }

arbutus/block-templates/single.html

@@ -18,7 +18,7 @@
 <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:post-comments /--></div>
+<!-- wp:pattern {"slug":"blockbase/comments"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->

arbutus/theme.json

@@ -45,24 +45,6 @@
 			"gap": {
 				"vertical": "min(40px, 5vw)"
 			}
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Roboto\", sans-serif",
-					"fontSlug": "roboto",
-					"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"
-				},
-				{
-					"fontFamily": "\"Roboto\", sans-serif",
-					"fontSlug": "roboto",
-					"slug": "heading-font",
-					"name": "Headings (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"
-				}
-			]
 		}
 	},
 	"styles": {
@@ -82,6 +64,9 @@
 					"fontSize": "48px"
 				}
 			}
+		},
+		"typography": {
+			"fontFamily": "var:preset|font-family|roboto"
 		}
 	}
 }

attar/theme.json

@@ -17,24 +17,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Inter\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Inter)",
-                    "google": "family=Inter:[email protected]",
-                    "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"
+        }
     }
 }

bennett/theme.json

@@ -17,24 +17,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Rubik\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Rubik)",
-                    "google": "family=Rubik:ital,wght@0,300..900;1,300..900",
-                    "fontSlug": "rubik"
-                },
-                {
-                    "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,10 @@
                 "tertiary": "var(--wp--preset--color--background)"
             }
         }
+    },
+    "styles": {
+        "typography": {
+			"fontFamily": "var:preset|font-family|rubik"
+        }
     }
 }

blockbase/assets/fonts/arvo/OFL.txt

@@ -0,0 +1,93 @@
+Copyright (c) 2010-2013, Anton Koovit ([email protected]), with Reserved Font Name 'Arvo'
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

blockbase/assets/fonts/arvo/font-face.css

@@ -0,0 +1,35 @@
+/* latin */
+@font-face {
+	font-family: 'Arvo';
+	font-style: italic;
+	font-weight: 400;
+	src: url(./Arvo-Italic.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* latin */
+@font-face {
+	font-family: 'Arvo';
+	font-style: italic;
+	font-weight: 700;
+	src: url(./Arvo-BoldItalic.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* latin */
+@font-face {
+	font-family: 'Arvo';
+	font-style: normal;
+	font-weight: 400;
+	src: url(./Arvo-Regular.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* latin */
+@font-face {
+	font-family: 'Arvo';
+	font-style: normal;
+	font-weight: 700;
+	src: url(./Arvo-Bold.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}

blockbase/assets/fonts/bodoni-moda/font-face.css

@@ -0,0 +1,32 @@
+/* latin-ext */
+@font-face {
+  font-family: 'Bodoni Moda';
+  font-style: italic;
+  font-weight: 400 900;
+  src: url(./bodoni-moda-latin-ext-400-900-italic.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Bodoni Moda';
+  font-style: italic;
+  font-weight: 400 900;
+  src: url(./bodoni-moda-400-900-italic.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Bodoni Moda';
+  font-style: normal;
+  font-weight: 400 900;
+  src: url(./bodoni-moda-latin-ext-400-900.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Bodoni Moda';
+  font-style: normal;
+  font-weight: 400 900;
+  src: url(./bodoni-moda-400-900.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}

blockbase/assets/fonts/cabin/font-face.css

@@ -0,0 +1,54 @@
+/* vietnamese */
+@font-face {
+	font-family: 'Cabin';
+	font-style: italic;
+	font-weight: 400 700;
+	font-stretch: 100%;
+	src: url(./cabin-vietnamese-400-700-italic.woff2) format('woff2');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+      }
+      /* latin-ext */
+      @font-face {
+	font-family: 'Cabin';
+	font-style: italic;
+	font-weight: 400 700;
+	font-stretch: 100%;
+	src: url(./cabin-latin-ext-400-700-italic.woff2) format('woff2');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+      }
+      /* latin */
+      @font-face {
+	font-family: 'Cabin';
+	font-style: italic;
+	font-weight: 400 700;
+	font-stretch: 100%;
+	src: url(./cabin-400-700-italic.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+      }
+      /* vietnamese */
+      @font-face {
+	font-family: 'Cabin';
+	font-style: normal;
+	font-weight: 400 700;
+	font-stretch: 100%;
+	src: url(./cabin-vietnamese-400-700.woff2) format('woff2');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+      }
+      /* latin-ext */
+      @font-face {
+	font-family: 'Cabin';
+	font-style: normal;
+	font-weight: 400 700;
+	font-stretch: 100%;
+	src: url(./cabin-latin-ext-400-700.woff2) format('woff2');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+      }
+      /* latin */
+      @font-face {
+	font-family: 'Cabin';
+	font-style: normal;
+	font-weight: 400 700;
+	font-stretch: 100%;
+	src: url(./cabin-400-700.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+      }