Selaa lähdekoodia

Blockbase: Update font size names (#4711)

* Blockbase: Update font size names
* Add overrides to geologist and quadrat
* Add a tiny custom variable to blockbase
* update templates to use new variable
* update block patterns
* update the post-meta font sizes
* Add a medium font size and make huge bigger
* replace font sizes in patterns with explict pixel values

Co-authored-by: Jeffrey Pearce <jeffikus@automattic.com>
Ben Dwyer 3 vuotta sitten
vanhempi
commit
347903e0f7
42 muutettua tiedostoa jossa 269 lisäystä ja 292 poistoa
  1. 1 1
      blockbase/404.php
  2. 2 2
      blockbase/block-template-parts/footer.html
  3. 4 4
      blockbase/block-template-parts/post-meta.html
  4. 25 16
      blockbase/theme.json
  5. 2 2
      geologist/assets/theme.css
  6. 2 2
      geologist/block-template-parts/header.html
  7. 4 4
      geologist/block-template-parts/post-meta.html
  8. 14 23
      geologist/child-theme.json
  9. 3 3
      geologist/sass/blocks/_navigation.scss
  10. 2 2
      geologist/sass/blocks/_query.scss
  11. 21 23
      geologist/theme.json
  12. 0 1
      mayland-blocks/block-template-parts/header.html
  13. 14 5
      mayland-blocks/theme.json
  14. 3 3
      quadrat/assets/theme.css
  15. 1 1
      quadrat/block-template-parts/header.html
  16. 1 1
      quadrat/block-templates/index.html
  17. 2 2
      quadrat/block-templates/single.html
  18. 14 23
      quadrat/child-theme.json
  19. 16 9
      quadrat/inc/patterns/headlines-and-buttons.php
  20. 2 2
      quadrat/inc/patterns/listen-to-the-podcast.php
  21. 3 3
      quadrat/inc/patterns/query-diamond.php
  22. 3 3
      quadrat/sass/blocks/_navigation.scss
  23. 2 2
      quadrat/sass/blocks/_query.scss
  24. 1 1
      quadrat/sass/templates/_meta.scss
  25. 21 23
      quadrat/theme.json
  26. 3 3
      seedlet-blocks/assets/theme.css
  27. 4 4
      seedlet-blocks/block-template-parts/post-meta.html
  28. 0 5
      seedlet-blocks/child-theme.json
  29. 2 2
      seedlet-blocks/sass/blocks/_post-comments.scss
  30. 1 1
      seedlet-blocks/sass/theme.scss
  31. 14 10
      seedlet-blocks/theme.json
  32. 6 7
      skatepark/block-template-parts/footer.html
  33. 1 1
      skatepark/block-templates/index.html
  34. 3 3
      skatepark/block-templates/single.html
  35. 5 7
      skatepark/child-theme.json
  36. 1 1
      skatepark/inc/patterns/blog-posts.php
  37. 10 10
      skatepark/inc/patterns/pre-footer.php
  38. 14 10
      skatepark/theme.json
  39. 6 15
      videomaker/block-template-parts/footer.html
  40. 4 4
      videomaker/block-template-parts/post-meta.html
  41. 11 18
      videomaker/child-theme.json
  42. 21 30
      videomaker/theme.json

+ 1 - 1
blockbase/404.php

@@ -8,7 +8,7 @@
 get_header();
 ?>
 	<main class="container-404">
-		<h1 class="has-text-align-center has-large-font-size"><?php _e( 'Oops! That page can&rsquo;t be found.', 'blockbase' ); ?></h1>
+		<h1 class="has-text-align-center has-medium-font-size"><?php _e( 'Oops! That page can&rsquo;t be found.', 'blockbase' ); ?></h1>
 
 		<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'blockbase' ); ?></p>
 

+ 2 - 2
blockbase/block-template-parts/footer.html

@@ -1,7 +1,7 @@
 <!-- wp:group -->
 <div class="wp-block-group">
-	<!-- wp:paragraph {"align":"center","fontSize":"tiny"} -->
-	<p class="has-text-align-center has-tiny-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+	<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
+	<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny);">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
 	<!-- /wp:paragraph -->
 </div>
 <!-- /wp:group -->

+ 4 - 4
blockbase/block-template-parts/post-meta.html

@@ -1,8 +1,8 @@
 <!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
 <div class="wp-block-group post-meta">
-    <!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"tiny"} /-->
-    <!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
-    <!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
-    <!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /-->
+    <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 </div>
 <!-- /wp:group -->

+ 25 - 16
blockbase/theme.json

@@ -146,6 +146,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "14px"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"border": {
@@ -157,7 +160,7 @@
 				"checkbox": {
 					"checked": {
 						"content": "\"\\2715\"",
-						"fontSize": "14px",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"position": {
 							"left": "3px",
 							"top": "3px"
@@ -191,7 +194,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "normal",
 						"letterSpacing": "normal",
 						"textTransform": "none"
@@ -262,7 +265,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "italic"
 					},
@@ -279,7 +282,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "italic",
 						"fontWeight": "400"
 					}
@@ -296,7 +299,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -334,11 +337,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "14px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "16px",
@@ -350,13 +348,18 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "24px",
+					"slug": "medium"
+				},
+				{
+					"name": "Large",
+					"size": "28px",
 					"slug": "large"
 				},
 				{
 					"name": "Huge",
-					"size": "28px",
+					"size": "32px",
 					"slug": "huge"
 				}
 			]
@@ -413,7 +416,7 @@
 			"core/post-title": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--system-font)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
@@ -433,7 +436,7 @@
 				},
 				"typography": {
 					"fontStyle": "italic",
-					"fontSize": "var(--wp--preset--font-size--huge)"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				},
 				"spacing": {
 					"padding": {
@@ -466,6 +469,12 @@
 					"style": "solid",
 					"width": "0 0 0 1px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "var(--wp--custom--gap--horizontal)"
@@ -515,7 +524,7 @@
 					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--huge)"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				},
 				"spacing": {
 					"margin": {
@@ -529,7 +538,7 @@
 					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				},
 				"spacing": {
 					"margin": {

+ 2 - 2
geologist/assets/theme.css

@@ -165,7 +165,7 @@ ul ul {
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link.has-child .wp-block-navigation-link__container .wp-block-pages-list__item__link,
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link.has-child .wp-block-navigation-link__container .wp-block-navigation-link__content {
 	padding: 0;
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 	line-height: 40px;
 }
 
@@ -225,7 +225,7 @@ ul ul {
 
 .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;
+	font-size: var(--wp--custom--font-sizes--tiny) !important;
 }
 
 .wp-block-query-pagination {

+ 2 - 2
geologist/block-template-parts/header.html

@@ -2,7 +2,7 @@
 <header class="wp-block-group site-header" style="padding-bottom:90px">
 	<!-- wp:site-logo /-->
 	<!-- wp:site-title /-->
-	<!-- wp:site-tagline {"fontSize":"tiny"} /-->
+	<!-- wp:site-tagline {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"20px"},"margin":{"right":"auto"}},"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
 </header>
-<!-- /wp:group -->
+<!-- /wp:group -->

+ 4 - 4
geologist/block-template-parts/post-meta.html

@@ -1,8 +1,8 @@
 <!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
 <div class="wp-block-group post-meta">
-    <!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"tiny"} /-->
-    <!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
-    <!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
-    <!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /-->
+    <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 </div>
 <!-- /wp:group -->

+ 14 - 23
geologist/child-theme.json

@@ -127,6 +127,9 @@
 				},
 				"padding": "20px"
 			},
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"body": {
 				"typography": {
 					"lineHeight": 1.7
@@ -156,20 +159,19 @@
 					}
 				}
 			},
-			"quote": {
+			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontStyle": "normal",
-						"fontWeight": "400"
+						"fontWeight": 400
 					}
 				}
 			},
-			"pullquote": {
+			"quote": {
 				"citation": {
 					"typography": {
 						"fontStyle": "normal",
-						"fontWeight": 400
+						"fontWeight": "400"
 					}
 				}
 			}
@@ -190,11 +192,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "16px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "18px",
@@ -206,14 +203,14 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "22px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
-					"name": "Extra Large",
+					"name": "Large",
 					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				{
 					"name": "Huge",
@@ -277,12 +274,6 @@
 				"border": {
 					"width": "0px"
 				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontWeight": "400"
-					}
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
@@ -297,7 +288,7 @@
 			"core/pullquote": {
 				"typography": {
 					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--extra-large)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"fontWeight": "500",
 					"lineHeight": "1.4"
 				},
@@ -317,7 +308,7 @@
 				"elements": {
 					"h2": {
 						"typography": {
-							"fontSize": "var(--wp--preset--font-size--extra-large)"
+							"fontSize": "var(--wp--preset--font-size--large)"
 						}
 					}
 				}
@@ -357,7 +348,7 @@
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--extra-large)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"lineHeight": 1.2
 				}
 			},

+ 3 - 3
geologist/sass/blocks/_navigation.scss

@@ -9,8 +9,8 @@
 			text-decoration: underline;
 		}
 	}
-	&:not(.has-background) { 
-		.wp-block-navigation__container { 
+	&:not(.has-background) {
+		.wp-block-navigation__container {
 			.submenu-container,
 			.wp-block-navigation-link__container {
 				background-color: var(--wp--custom--color--background);
@@ -45,7 +45,7 @@
 						.wp-block-pages-list__item__link,
 						.wp-block-navigation-link__content {
 							padding: 0;
-							font-size: var(--wp--preset--font-size--tiny);
+							font-size: var(--wp--custom--font-sizes--tiny);
 							line-height: 40px;
 						}
 					}

+ 2 - 2
geologist/sass/blocks/_query.scss

@@ -3,6 +3,6 @@
 
 	// Important is necessary to override any other font size rules applied to the exerpt.
 	.wp-block-post-excerpt__more-text {
-		font-size: var(--wp--preset--font-size--tiny) !important;
+		font-size: var(--wp--custom--font-sizes--tiny) !important;
 	}
-}
+}

+ 21 - 23
geologist/theme.json

@@ -166,6 +166,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"form": {
 				"padding": "20px",
 				"border": {
@@ -177,7 +180,7 @@
 				"checkbox": {
 					"checked": {
 						"content": "\"\\2715\"",
-						"fontSize": "14px",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"position": {
 							"left": "3px",
 							"top": "3px"
@@ -211,7 +214,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "normal",
 						"letterSpacing": "normal",
 						"textTransform": "none"
@@ -282,7 +285,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": 400
@@ -300,7 +303,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
@@ -317,7 +320,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -359,11 +362,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "16px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "18px",
@@ -375,14 +373,14 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "22px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
-					"name": "Extra Large",
+					"name": "Large",
 					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				{
 					"name": "Huge",
@@ -470,7 +468,7 @@
 				},
 				"typography": {
 					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--extra-large)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"fontWeight": "500",
 					"lineHeight": "1.4"
 				},
@@ -509,6 +507,12 @@
 					"style": "solid",
 					"width": "0px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
@@ -519,12 +523,6 @@
 					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontWeight": "400"
-					}
 				}
 			},
 			"core/navigation-link": {
@@ -542,7 +540,7 @@
 				"elements": {
 					"h2": {
 						"typography": {
-							"fontSize": "var(--wp--preset--font-size--extra-large)"
+							"fontSize": "var(--wp--preset--font-size--large)"
 						}
 					}
 				}
@@ -592,7 +590,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
-					"fontSize": "var(--wp--preset--font-size--extra-large)"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				},
 				"spacing": {
 					"margin": {

+ 0 - 1
mayland-blocks/block-template-parts/header.html

@@ -7,4 +7,3 @@
 <!-- /wp:navigation -->
 </div>
 <!-- /wp:group -->
-	

+ 14 - 5
mayland-blocks/theme.json

@@ -154,6 +154,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "14px"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"border": {
@@ -165,7 +168,7 @@
 				"checkbox": {
 					"checked": {
 						"content": "\"\\2715\"",
-						"fontSize": "14px",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"position": {
 							"left": "3px",
 							"top": "3px"
@@ -199,7 +202,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "normal",
 						"letterSpacing": "normal",
 						"textTransform": "none"
@@ -270,7 +273,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "italic"
 					},
@@ -287,7 +290,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "italic",
 						"fontWeight": "400"
 					}
@@ -304,7 +307,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -495,6 +498,12 @@
 					"style": "solid",
 					"width": "0 0 0 1px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "var(--wp--custom--gap--horizontal)"

+ 3 - 3
quadrat/assets/theme.css

@@ -301,7 +301,7 @@ ul ul {
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link.has-child .wp-block-navigation-link__container .wp-block-pages-list__item__link,
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link.has-child .wp-block-navigation-link__container .wp-block-navigation-link__content {
 	padding: 0;
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 	line-height: 40px;
 }
 
@@ -361,7 +361,7 @@ ul ul {
 
 .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;
+	font-size: var(--wp--custom--font-sizes--tiny) !important;
 }
 
 .wp-block-query-pagination {
@@ -547,7 +547,7 @@ textarea:focus {
 
 .post-meta > * > * {
 	color: var(--wp--custom--color--foreground);
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 }
 
 .post-meta .wp-block-post-author__content {

+ 1 - 1
quadrat/block-template-parts/header.html

@@ -2,7 +2,7 @@
 <header class="wp-block-group site-header" style="padding-bottom:170px">
 	<!-- wp:site-logo /-->
 	<!-- wp:site-title /-->
-	<!-- wp:site-tagline {"fontSize":"tiny"} /-->
+	<!-- wp:site-tagline {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"20px"},"margin":{"right":"auto"}},"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
 </header>
 <!-- /wp:group -->

+ 1 - 1
quadrat/block-templates/index.html

@@ -3,7 +3,7 @@
 <!-- wp:query {"tagName":"main","layout":{"inherit":true},"queryId":1,"query":{"perPage":5,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true}} -->
 <main class="wp-block-query">
 	<!-- wp:post-template -->
-		<!-- wp:post-date {"fontSize":"tiny","isLink":true,"textAlign":"center"} /-->
+		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center"} /-->
 		<!-- wp:post-featured-image {"isLink":true} /-->
 		<!-- wp:post-excerpt /-->

+ 2 - 2
quadrat/block-templates/single.html

@@ -5,8 +5,8 @@
 
 	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}, "style":{"spacing":{"padding":"50px"}}} -->
 	<div style="padding:50px" class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","fontSize":"tiny","isLink":true} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","fontSize":"tiny"} /-->
+		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 	</div>
 	<!-- /wp:group -->
 

+ 14 - 23
quadrat/child-theme.json

@@ -154,6 +154,9 @@
 				},
 				"padding": "20px"
 			},
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"body": {
 				"typography": {
 					"lineHeight": 1.7
@@ -183,20 +186,19 @@
 					}
 				}
 			},
-			"quote": {
+			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontStyle": "normal",
-						"fontWeight": "400"
+						"fontWeight": 400
 					}
 				}
 			},
-			"pullquote": {
+			"quote": {
 				"citation": {
 					"typography": {
 						"fontStyle": "normal",
-						"fontWeight": 400
+						"fontWeight": "400"
 					}
 				}
 			}
@@ -217,11 +219,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "16px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "18px",
@@ -233,14 +230,14 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "22px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
-					"name": "Extra Large",
+					"name": "Large",
 					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				{
 					"name": "Huge",
@@ -304,12 +301,6 @@
 				"border": {
 					"width": "0px"
 				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontWeight": "400"
-					}
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
@@ -375,21 +366,21 @@
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(36px, 6vw), 65px)",
+					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": 1.2
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(28px, 5vw), 38px)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"lineHeight": 1.2
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontSize": "var(--wp--preset--font-size--medium)",
 					"lineHeight": 1.4
 				}
 			},

+ 16 - 9
quadrat/inc/patterns/headlines-and-buttons.php

@@ -10,18 +10,20 @@ return array(
 	'categories' => array( 'quadrat' ),
 	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"70px","top":"70px"}}},"className":"headlines-pattern"} -->
 	<div class="wp-block-group alignwide headlines-pattern" style="padding-top:70px;padding-bottom:70px"><!-- wp:media-text {"mediaLink":"' . get_stylesheet_directory_uri() . '/assets/illustrations/group-of-squares-displayed-diagonally.png","mediaType":"image","mediaWidth":52,"verticalAlignment":"top"} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:52% auto"><figure class="wp-block-media-text__media"><img src="' . get_stylesheet_directory_uri() . '/assets/illustrations/group-of-squares-displayed-diagonally.png" alt="' . esc_attr__( 'Group of squares displayed diagonally', 'quadrat' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"tiny"} -->
-	<p class="has-tiny-font-size">Coaching</p>
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:52% auto"><figure class="wp-block-media-text__media"><img src="' . get_stylesheet_directory_uri() . '/assets/illustrations/group-of-squares-displayed-diagonally.png" alt="' . esc_attr__( 'Group of squares displayed diagonally', 'quadrat' ) . '"/></figure><div class="wp-block-media-text__content">
+
+	<!-- wp:paragraph {"placeholder":"' . esc_html__('Content…', 'quadrat' ) . '","style":{"typography":{"fontSize":"16px"}}} -->
+	<p style="font-size:16px">' . esc_html__( 'Coaching', 'quadrat' ) . '</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:heading {"level":3} -->
 	<h3>' . esc_html__( 'Career Coaching 101', 'quadrat' ) . '</h3>
 	<!-- /wp:heading -->
-	
+
 	<!-- wp:paragraph -->
 	<p>' . esc_html__( 'Starting at $ 99', 'quadrat' ) . '</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:buttons -->
 	<div class="wp-block-buttons"><!-- wp:button -->
 	<div class="wp-block-button"><a class="wp-block-button__link">' . esc_html__( 'Learn more', 'quadrat' ) . '</a></div>
@@ -31,8 +33,11 @@ return array(
 	<!-- /wp:group -->
 	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"70px","top":"70px"}}},"className":"headlines-pattern"} -->
 	<div class="wp-block-group alignwide headlines-pattern" style="padding-top:70px;padding-bottom:70px"><!-- wp:media-text {"mediaPosition":"right","mediaLink":"' . get_stylesheet_directory_uri() . '/assets/illustrations/pink-squared-shapes-combination.png","mediaType":"image","mediaWidth":52,"verticalAlignment":"top"} -->
-	<div class="wp-block-media-text alignwide has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:auto 52%"><figure class="wp-block-media-text__media"><img src="' . get_stylesheet_directory_uri() . '/assets/illustrations/pink-squared-shapes-combination.png" alt="' . esc_attr__( 'Pink squared shapes combination', 'quadrat' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"tiny"} -->
-	<p class="has-tiny-font-size">Coaching</p>
+	<div class="wp-block-media-text alignwide has-media-on-the-right is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:auto 52%"><figure class="wp-block-media-text__media"><img src="' . get_stylesheet_directory_uri() . '/assets/illustrations/pink-squared-shapes-combination.png" alt="' . esc_attr__( 'Pink squared shapes combination', 'quadrat' ) . '"/></figure><div class="wp-block-media-text__content">
+
+
+	<!-- wp:paragraph {"placeholder":"' . esc_html__('Content…', 'quadrat' ) . '","style":{"typography":{"fontSize":"16px"}}} -->
+	<p style="font-size:16px">' . esc_html__( 'Coaching', 'quadrat' ) . '</p>
 	<!-- /wp:paragraph -->
 
 	<!-- wp:heading {"level":3} -->
@@ -52,8 +57,10 @@ return array(
 	<!-- /wp:group -->
 	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"70px","top":"70px"}}},"className":"headlines-pattern"} -->
 	<div class="wp-block-group alignwide headlines-pattern" style="padding-top:70px;padding-bottom:70px"><!-- wp:media-text {"mediaLink":"' . get_stylesheet_directory_uri() . '/assets/illustrations/orange-triangle-in-purple-background.png","mediaType":"image","mediaWidth":52,"verticalAlignment":"top"} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:52% auto"><figure class="wp-block-media-text__media"><img src="' . get_stylesheet_directory_uri() . '/assets/illustrations/orange-triangle-in-purple-background.png" alt="' . esc_attr__( 'Orange triangle in purple background', 'quadrat' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"tiny"} -->
-	<p class="has-tiny-font-size">Coaching</p>
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:52% auto"><figure class="wp-block-media-text__media"><img src="' . get_stylesheet_directory_uri() . '/assets/illustrations/orange-triangle-in-purple-background.png" alt="' . esc_attr__( 'Orange triangle in purple background', 'quadrat' ) . '"/></figure><div class="wp-block-media-text__content">
+
+	<!-- wp:paragraph {"placeholder":"' . esc_html__('Content…', 'quadrat' ) . '","style":{"typography":{"fontSize":"16px"}}} -->
+	<p style="font-size:16px">' . esc_html__( 'Coaching', 'quadrat' ) . '</p>
 	<!-- /wp:paragraph -->
 
 	<!-- wp:heading {"level":3} -->

+ 2 - 2
quadrat/inc/patterns/listen-to-the-podcast.php

@@ -16,7 +16,7 @@ return array(
 		<figure class="wp-block-audio"><audio controls src="' . get_stylesheet_directory_uri() . '/assets/quadrat-episode-1.mp3"></audio></figure>
 		<!-- /wp:audio -->
 
-		<!-- wp:paragraph {"align":"center","fontSize":"tiny"} -->
-		<p class="has-text-align-center has-tiny-font-size">' . sprintf( wp_kses( __( 'Listen on <a href="%1$s">Apple Podcasts</a>, <a href="%2$s">Spotify</a>.', 'quadrat' ), array( 'a' => array( 'href' => array() ) ) ), '/', '/' ) . '</p>
+		<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"16px"}}} -->
+		<p class="has-text-align-center" style="font-size:16px">' . sprintf( wp_kses( __( 'Listen on <a href="%1$s">Apple Podcasts</a>, <a href="%2$s">Spotify</a>.', 'quadrat' ), array( 'a' => array( 'href' => array() ) ) ), '/', '/' ) . '</p>
 		<!-- /wp:paragraph -->',
 );

+ 3 - 3
quadrat/inc/patterns/query-diamond.php

@@ -14,12 +14,12 @@ return array(
 	<!-- wp:columns -->
 	<div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center"} -->
 	<div class="wp-block-column is-vertically-aligned-center"><!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta"><!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
+	<div class="wp-block-group post-meta"><!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"16px"}}} /-->
 
-	<!-- wp:post-terms {"term":"category","fontSize":"tiny"} /--></div>
+	<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"16px"}}} /--></div>
 	<!-- /wp:group -->
 
-	<!-- wp:post-title {"textAlign":"left","isLink":true,"fontSize":"extra-large"} /-->
+	<!-- wp:post-title {"textAlign":"left","isLink":true,"fontSize":"large"} /-->
 
 	<!-- wp:post-excerpt {"moreText":"Read more","fontSize":"normal"} /--></div>
 	<!-- /wp:column -->

+ 3 - 3
quadrat/sass/blocks/_navigation.scss

@@ -9,8 +9,8 @@
 			text-decoration: underline;
 		}
 	}
-	&:not(.has-background) { 
-		.wp-block-navigation__container { 
+	&:not(.has-background) {
+		.wp-block-navigation__container {
 			.submenu-container,
 			.wp-block-navigation-link__container {
 				background-color: var(--wp--custom--color--background);
@@ -45,7 +45,7 @@
 						.wp-block-pages-list__item__link,
 						.wp-block-navigation-link__content {
 							padding: 0;
-							font-size: var(--wp--preset--font-size--tiny);
+							font-size: var(--wp--custom--font-sizes--tiny);
 							line-height: 40px;
 						}
 					}

+ 2 - 2
quadrat/sass/blocks/_query.scss

@@ -3,6 +3,6 @@
 
 	// Important is necessary to override any other font size rules applied to the exerpt.
 	.wp-block-post-excerpt__more-text {
-		font-size: var(--wp--preset--font-size--tiny) !important;
+		font-size: var(--wp--custom--font-sizes--tiny) !important;
 	}
-}
+}

+ 1 - 1
quadrat/sass/templates/_meta.scss

@@ -32,7 +32,7 @@
 
 		> * {
 			color: var(--wp--custom--color--foreground);
-			font-size: var(--wp--preset--font-size--tiny);
+			font-size: var(--wp--custom--font-sizes--tiny);
 		}
 	}
 

+ 21 - 23
quadrat/theme.json

@@ -192,6 +192,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"form": {
 				"padding": "20px",
 				"border": {
@@ -203,7 +206,7 @@
 				"checkbox": {
 					"checked": {
 						"content": "\"\\2715\"",
-						"fontSize": "14px",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"position": {
 							"left": "3px",
 							"top": "3px"
@@ -237,7 +240,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "normal",
 						"letterSpacing": "normal",
 						"textTransform": "none"
@@ -308,7 +311,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": 400
@@ -326,7 +329,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
@@ -343,7 +346,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -385,11 +388,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "16px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "18px",
@@ -401,14 +399,14 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "22px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
-					"name": "Extra Large",
+					"name": "Large",
 					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				{
 					"name": "Huge",
@@ -535,6 +533,12 @@
 					"style": "solid",
 					"width": "0px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
@@ -545,12 +549,6 @@
 					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontWeight": "400"
-					}
 				}
 			},
 			"core/navigation-link": {
@@ -604,7 +602,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
-					"fontSize": "min(max(36px, 6vw), 65px)"
+					"fontSize": "var(--wp--preset--font-size--huge)"
 				},
 				"spacing": {
 					"margin": {
@@ -618,7 +616,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
-					"fontSize": "min(max(28px, 5vw), 38px)"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				},
 				"spacing": {
 					"margin": {
@@ -632,7 +630,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				},
 				"spacing": {
 					"margin": {

+ 3 - 3
seedlet-blocks/assets/theme.css

@@ -183,7 +183,7 @@ is passed all of the block attributes on the block definition in the template. *
 
 .wp-block-post-comments .comment-meta,
 .wp-block-post-comments .comment-author {
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 }
 
 .wp-block-post-comments .comment-meta a,
@@ -232,7 +232,7 @@ is passed all of the block attributes on the block definition in the template. *
 
 .wp-block-post-comments form .comment-form-cookies-consent > label,
 .wp-block-post-comments form .comment-notes {
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 }
 
 .wp-block-post-comments form input:not([type=submit]):not([type=checkbox]),
@@ -284,7 +284,7 @@ is passed all of the block attributes on the block definition in the template. *
 }
 
 .wp-block-post-navigation-links .wp-block-post-navigation-link-byline {
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 	margin: 0;
 }
 

+ 4 - 4
seedlet-blocks/block-template-parts/post-meta.html

@@ -3,11 +3,11 @@
 <!-- /wp:separator -->
 
 <!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-<div class="wp-block-group post-meta"><!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"tiny"} /-->
+<div class="wp-block-group post-meta"><!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"14px"} /-->
 
-<!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
+<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 
-<!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
+<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 
-<!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /--></div>
+<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /--></div>
 <!-- /wp:group -->

+ 0 - 5
seedlet-blocks/child-theme.json

@@ -141,11 +141,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"slug": "tiny",
-					"size": "14px"
-				},
 				{
 					"name": "Small",
 					"slug": "small",

+ 2 - 2
seedlet-blocks/sass/blocks/_post-comments.scss

@@ -7,7 +7,7 @@
 
 	.comment-meta,
 	.comment-author {
-		font-size: var(--wp--preset--font-size--tiny);
+		font-size: var(--wp--custom--font-sizes--tiny);
 
 		a {
 			text-decoration: none;
@@ -69,7 +69,7 @@
 
 		.comment-form-cookies-consent > label,
 		.comment-notes {
-			font-size: var(--wp--preset--font-size--tiny);
+			font-size: var(--wp--custom--font-sizes--tiny);
 		}
 
 		input:not([type=submit]):not([type=checkbox]),

+ 1 - 1
seedlet-blocks/sass/theme.scss

@@ -26,7 +26,7 @@
 }
 
 .wp-block-post-navigation-links .wp-block-post-navigation-link-byline {
-	font-size: var(--wp--preset--font-size--tiny);
+	font-size: var(--wp--custom--font-sizes--tiny);
 	margin: 0;
 }
 

+ 14 - 10
seedlet-blocks/theme.json

@@ -187,6 +187,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "14px"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"border": {
@@ -198,7 +201,7 @@
 				"checkbox": {
 					"checked": {
 						"content": "\"\\2715\"",
-						"fontSize": "14px",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"position": {
 							"left": "3px",
 							"top": "3px"
@@ -232,7 +235,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "normal",
 						"letterSpacing": "normal",
 						"textTransform": "none"
@@ -303,7 +306,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "italic"
 					},
@@ -320,7 +323,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "italic",
 						"fontWeight": "400"
 					}
@@ -337,7 +340,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -382,11 +385,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"slug": "tiny",
-					"size": "14px"
-				},
 				{
 					"name": "Small",
 					"slug": "small",
@@ -529,6 +527,12 @@
 					"style": "solid",
 					"width": "0 0 0 1px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "var(--wp--custom--gap--horizontal)"

+ 6 - 7
skatepark/block-template-parts/footer.html

@@ -1,10 +1,9 @@
 <!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"bottom":"30px"}}}} -->
 <div class="wp-block-group site-footer" style="padding-bottom: 30px">
 
-	<!-- wp:paragraph {"align":"center","fontSize":"tiny"} -->
-	<p class="has-text-align-center has-tiny-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-	<!-- /wp:paragraph -->
-	
-	</div>
-	<!-- /wp:group -->
-	
+<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
+<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny)">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+<!-- /wp:paragraph -->
+
+</div>
+<!-- /wp:group -->

+ 1 - 1
skatepark/block-templates/index.html

@@ -16,7 +16,7 @@
 
 	<!-- wp:post-excerpt /-->
 
-	<!-- wp:post-date {"style":{"typography":{"fontWeight":"500"}},"fontSize":"tiny","isLink":true} /--></div>
+	<!-- wp:post-date {"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)","fontWeight":"500"}},"isLink":true} /--></div>
 	<!-- /wp:group -->
 	<!-- /wp:post-template -->
 

+ 3 - 3
skatepark/block-templates/single.html

@@ -31,9 +31,9 @@
 	<!-- /wp:separator -->
 	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
 	<div class="wp-block-group post-meta">
-	<!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
-	<!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
-	<!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /--></div>
+	<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+	<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+	<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /--></div>
 	<!-- /wp:group -->
 
 	</div>

+ 5 - 7
skatepark/child-theme.json

@@ -171,7 +171,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "900",
 						"letterSpacing": ".1em",
 						"textTransform": "uppercase"
@@ -182,6 +182,9 @@
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"heading": {
 				"typography": {
 					"fontWeight": "700"
@@ -214,11 +217,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "14px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "16px",
@@ -368,7 +366,7 @@
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "var(--wp--preset--font-size--tiny)",
+					"fontSize": "var(--wp--custom--font-sizes--tiny)",
 					"fontWeight": "900",
 					"letterSpacing": "0.1em",
 					"lineHeight": 1.3,

+ 1 - 1
skatepark/inc/patterns/blog-posts.php

@@ -21,7 +21,7 @@ return array(
 
 	<!-- wp:post-excerpt {"moreText":"' . esc_html__( 'Continue reading', 'skatepark' ) . '"} /-->
 
-	<!-- wp:post-date {"style":{"typography":{"fontWeight":"500"}},"fontSize":"tiny","isLink":true} /--></div>
+	<!-- wp:post-date {"style":{"typography":{"fontSize":"16px","fontWeight":"500"}},"isLink":true} /--></div>
 	<!-- /wp:group -->
 	<!-- /wp:post-template -->
 

+ 10 - 10
skatepark/inc/patterns/pre-footer.php

@@ -12,31 +12,31 @@ return array(
 	<div class="wp-block-group alignwide pre-footer" style="padding-top:60px;padding-bottom:60px"><!-- wp:columns -->
 		<div class="wp-block-columns"><!-- wp:column -->
 		<div class="wp-block-column"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"large"} /-->
-		
+
 		<!-- wp:paragraph {"fontSize":"small"} -->
 		<p class="has-small-font-size">' . esc_html__( "Skatepark's coaches will work with you to develop and improve your skating abilities.", 'skatepark' ) . '</p>
 		<!-- /wp:paragraph -->
-		
+
 		<!-- wp:social-links {"iconColor":"primary","iconColorValue":"var(--wp--custom--color--foreground)","className":"is-style-logos-only"} -->
 		<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"http://twitter.com","service":"twitter"} /-->
-		
+
 		<!-- wp:social-link {"url":"http://facebook.com","service":"facebook"} /-->
-		
+
 		<!-- wp:social-link {"url":"http://instagram.com","service":"instagram"} /--></ul>
 		<!-- /wp:social-links --></div>
 		<!-- /wp:column -->
-		
+
 		<!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:heading {"level":3,"fontSize":"tiny"} -->
-		<h3 class="has-tiny-font-size"><strong>' . esc_html__( 'More info', 'skatepark' ) . '</strong></h3>
+		<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"14px"}}} -->
+		<h3 style="font-size:14px;"><strong>' . esc_html__( 'More info', 'skatepark' ) . '</strong></h3>
 		<!-- /wp:heading -->
-		
+
 		<!-- wp:navigation {"orientation":"vertical","__unstableLocation":"primary","style":{"typography":{"textDecoration":"underline"}},"fontSize":"small"} /--></div>
 		<!-- /wp:column -->
 
 		<!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:heading {"level":3,"fontSize":"tiny"} -->
-		<h3 class="has-tiny-font-size"><strong>' . esc_html__( 'Search', 'skatepark' ) . '</strong></h3><!-- /wp:heading --><!-- wp:search {"label":"' . esc_html__( 'Search', 'skatepark' ) . '","showLabel":false,"buttonText":"' . esc_html__( 'Search', 'skatepark' ) . '","buttonPosition":"button-inside"} /--></div>
+		<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"14px"}}} -->
+		<h3 style="font-size:14px"><strong>' . esc_html__( 'Search', 'skatepark' ) . '</strong></h3><!-- /wp:heading --><!-- wp:search {"label":"' . esc_html__( 'Search', 'skatepark' ) . '","showLabel":false,"buttonText":"' . esc_html__( 'Search', 'skatepark' ) . '","buttonPosition":"button-inside"} /--></div>
 		<!-- /wp:column --></div>
 		<!-- /wp:columns --></div>
 		<!-- /wp:group -->',

+ 14 - 10
skatepark/theme.json

@@ -188,6 +188,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"border": {
@@ -233,7 +236,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "900",
 						"letterSpacing": ".1em",
 						"textTransform": "uppercase"
@@ -305,7 +308,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "italic"
 					},
@@ -322,7 +325,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "italic",
 						"fontWeight": "400"
 					}
@@ -339,7 +342,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -381,11 +384,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "14px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "16px",
@@ -530,6 +528,12 @@
 					"style": "solid",
 					"width": "0 0 0 1px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "var(--wp--custom--gap--horizontal)"
@@ -640,7 +644,7 @@
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
-					"fontSize": "var(--wp--preset--font-size--tiny)",
+					"fontSize": "var(--wp--custom--font-sizes--tiny)",
 					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 				},

+ 6 - 15
videomaker/block-template-parts/footer.html

@@ -1,16 +1,7 @@
-<!-- wp:group {"align":"full","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--custom--gap--horizontal","right":"var(--wp--custom--gap--horizontal","bottom":"var(--wp--custom--gap--horizontal","left":"var(--wp--custom--gap--horizontal"}}}} -->
-<div class="wp-block-group alignfull" style="padding-top: var(--wp--custom--gap--horizontal);padding-right: var(--wp--custom--gap--horizontal);padding-bottom: var(--wp--custom--gap--horizontal);padding-left: var(--wp--custom--gap--horizontal);">
-	<!-- wp:group -->
-	<div class="wp-block-group">
-	<!-- wp:navigation {"orientation":"vertical","__unstableLocation":"footer"} --><!-- /wp:navigation -->
-	</div>
-	<!-- /wp:group -->
-	<!-- wp:group -->
-	<div class="wp-block-group">
-		<!-- wp:paragraph {"fontSize":"small"} -->
-		<p class="has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-		<!-- /wp:paragraph -->
-	</div>
-	<!-- /wp:group -->
+<!-- wp:group -->
+<div class="wp-block-group">
+	<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
+	<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny)">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+	<!-- /wp:paragraph -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->

+ 4 - 4
videomaker/block-template-parts/post-meta.html

@@ -1,8 +1,8 @@
 <!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
 <div class="wp-block-group post-meta">
-    <!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"tiny"} /-->
-    <!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
-    <!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
-    <!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /-->
+    <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 </div>
 <!-- /wp:group -->

+ 11 - 18
videomaker/child-theme.json

@@ -96,7 +96,10 @@
 						"tertiary": "#FAFAFA"
 					}
 				}
-			]
+			],
+			"fontSizes": {
+				"tiny": "16px"
+			}
 		},
 		"layout": {
 			"contentSize": "800px",
@@ -112,11 +115,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "14px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "16px",
@@ -128,24 +126,19 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "25px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
-					"name": "Extra Large",
+					"name": "Large",
 					"size": "45px",
-					"slug": "xl"
+					"slug": "large"
 				},
 				{
-					"name": "XX Large",
+					"name": "Huge",
 					"size": "60px",
-					"slug": "xxl"
-				},
-				{
-					"name": "XXX Large",
-					"size": "65px",
-					"slug": "xxxl"
+					"slug": "huge"
 				}
 			]
 		}
@@ -169,7 +162,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--xxl)",
+					"fontSize": "var(--wp--preset--font-size--huge)",
 					"fontFamily": "var(--wp--preset--font-family--inter)"
 				}
 			}

+ 21 - 30
videomaker/theme.json

@@ -147,6 +147,9 @@
 					}
 				}
 			],
+			"fontSizes": {
+				"tiny": "16px"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"border": {
@@ -158,7 +161,7 @@
 				"checkbox": {
 					"checked": {
 						"content": "\"\\2715\"",
-						"fontSize": "14px",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"position": {
 							"left": "3px",
 							"top": "3px"
@@ -192,7 +195,7 @@
 						}
 					},
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontWeight": "normal",
 						"letterSpacing": "normal",
 						"textTransform": "none"
@@ -263,7 +266,7 @@
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontFamily": "inherit",
 						"fontStyle": "italic"
 					},
@@ -280,7 +283,7 @@
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "italic",
 						"fontWeight": "400"
 					}
@@ -297,7 +300,7 @@
 			"table": {
 				"figcaption": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--custom--font-sizes--tiny)"
 					}
 				}
 			},
@@ -336,11 +339,6 @@
 				}
 			],
 			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "14px",
-					"slug": "tiny"
-				},
 				{
 					"name": "Small",
 					"size": "16px",
@@ -352,24 +350,19 @@
 					"slug": "normal"
 				},
 				{
-					"name": "Large",
+					"name": "Medium",
 					"size": "25px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
-					"name": "Extra Large",
+					"name": "Large",
 					"size": "45px",
-					"slug": "xl"
+					"slug": "large"
 				},
 				{
-					"name": "XX Large",
+					"name": "Huge",
 					"size": "60px",
-					"slug": "xxl"
-				},
-				{
-					"name": "XXX Large",
-					"size": "65px",
-					"slug": "xxxl"
+					"slug": "huge"
 				}
 			]
 		}
@@ -417,14 +410,6 @@
 					}
 				}
 			},
-			"core/group": {
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -433,7 +418,7 @@
 			"core/post-title": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontSize": "var(--wp--preset--font-size--xxl)",
+					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
@@ -486,6 +471,12 @@
 					"style": "solid",
 					"width": "0 0 0 1px"
 				},
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--custom--font-sizes--tiny)",
+						"fontWeight": "400"
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "var(--wp--custom--gap--horizontal)"