Remove/child theme (#4861)

* Updated build process to merge ALL attributes (as Gutenberg does) and re-defined the now missing custom templates items in the themes that would now lack them

* removed the build step tooling from blockbase

* converted build tool to a 'replacement tool'

* Removed build scripting from children package files

* Removed build scripting from children package files

* Run the script to remove child-theme.json files

* Update the version number and changelog for Blockbase

* Remove the rebuild script, we don't need it anymore

Co-authored-by: Ben Dwyer <ben@scruffian.com>

blockbase/build.js

@@ -1,70 +0,0 @@
-const fs = require( 'fs' );
-const chokidar = require( 'chokidar' );
-const merge = require( 'deepmerge' );
-const childThemeName = process.argv[ 2 ];
-const watch = 'watch' === process.argv[ 3 ];
-const parentThemeJsonFileName = __dirname + '/theme.json';
-const childThemeJsonFileName =
-	__dirname + '/../' + childThemeName + '/child-theme.json';
-
-const keysToMerge = [ 'customTemplates' ];
-
-const overwriteMerge = ( destinationArray, sourceArray, options ) => {
-	return sourceArray;
-};
-
-const combineMerge = ( destinationArray, sourceArray, options ) =>
-	destinationArray.concat( sourceArray );
-
-const combineCustomTemplates = ( key ) => {
-	if ( keysToMerge.indexOf( key ) > -1 ) {
-		return combineMerge;
-	}
-};
-
-const buildChildTheme = () => {
-	try {
-		const parentThemeJsonFile = fs.readFileSync(
-				parentThemeJsonFileName,
-				'utf8'
-			),
-			childThemeJsonFile = fs.readFileSync(
-				childThemeJsonFileName,
-				'utf8'
-			),
-			parentThemeJson = JSON.parse( parentThemeJsonFile ),
-			childThemeJson = JSON.parse( childThemeJsonFile ),
-			mergedThemeJson = merge( parentThemeJson, childThemeJson, {
-				customMerge: combineCustomTemplates,
-				arrayMerge: overwriteMerge,
-			} );
-
-		fs.writeFile(
-			'../' + childThemeName + '/theme.json',
-			JSON.stringify( mergedThemeJson, null, '\t' ),
-			'utf8',
-			() => {
-				console.log(
-					'\x1b[32m' +
-						childThemeName +
-						'/theme.json created successfully.'
-				);
-			}
-		);
-	} catch ( error ) {
-		console.error( '\x1b[31m' + error );
-	}
-};
-
-if ( ! fs.existsSync( childThemeJsonFileName ) ) {
-	console.log( '\x1b[31m' + childThemeJsonFileName + ' not found :(' );
-	return;
-}
-
-if ( watch ) {
-	chokidar
-		.watch( [ parentThemeJsonFileName, childThemeJsonFileName ] )
-		.on( 'all', buildChildTheme );
-} else {
-	buildChildTheme();
-}

blockbase/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "blockbase",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

blockbase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockbase",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "Blank Parent Theme",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"
@@ -35,10 +35,6 @@
   "scripts": {
     "create:child": "node create-child.js",
     "start": "chokidar \"sass/**/*.scss\" -c \"npm run build\" --initial",
-    "start:child": "run-p start \"build:child -- {@} watch\" --",
-    "start:all": "chokidar \"sass/**/*.scss\" \"experimental-theme.json\" -c \"npm run build:all\" --initial",
-    "build": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/ponyfill.scss assets/ponyfill.css --output-style expanded --indent-type tab --indent-width 1 --source-map true",
-    "build:child": "node build.js",
-    "build:all": "npm run build && sh ./rebuild-child-themes.sh"
+    "build": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/ponyfill.scss assets/ponyfill.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
   }
 }

blockbase/readme.txt

@@ -18,7 +18,10 @@ For more information see our README.md file.
 
 == Changelog ==
 
-= 1.3.0 =
+= 1.4.1 =
+* Remove child-theme.json #4861
+
+= 1.3.1 =
 * Added dynamic duotone support to the customizer #4740
 * Handle posts without titles #4920
 * Update the stacking of site title and tagline #4928

blockbase/rebuild-child-themes.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-declare -a ChildThemes=( "geologist" "kerr" "mayland-blocks" "payton" "quadrat" "russell" "seedlet-blocks" "skatepark" "videomaker" "zoologist" )
-
-for child in ${ChildThemes[@]}; do
-	cd '../'${child}
-	echo 'Rebulding '${child}
-	npm i
-	npm run build
-done

blockbase/style.css

@@ -7,7 +7,7 @@ Description: Blockbase is a simple theme that supports full-site editing. It com
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.3.3
+Version: 1.4.0
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Text Domain: blockbase

geologist/child-theme.json

@@ -1,354 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"customTemplates": [
-		{
-			"name": "page-without-title",
-			"title": "Page without title",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#F5F0E5",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#FFFFFF",
-					"name": "Secondary"
-				},
-				{
-					"slug": "background",
-					"color": "#28262C",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#45424A",
-					"name": "Tertiary"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
-					"width": "3px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--foreground)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				}
-			},
-			"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)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "White",
-					"slug": "white",
-					"colors": {
-						"primary": "#000000",
-						"secondary": "#000000",
-						"tertiary": "#f1f1f1",
-						"background": "#ffffff"
-					}
-				},
-				{
-					"label": "Black",
-					"slug": "black",
-					"colors": {
-						"primary": "#ffffff",
-						"secondary": "#ffffff",
-						"tertiary": "#313131",
-						"background": "#000000"
-					}
-				}
-			],
-			"form": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"style": "solid",
-					"width": "2px"
-				},
-				"padding": "20px"
-			},
-			"fontSizes": {
-				"tiny": "16px"
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.7
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"layout": {
-				"contentSize":"664px"
-			},
-			"line-height": {
-				"body": 1.7
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(30px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": 400
-					}
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": "400"
-					}
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1128px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"DM Sans\", sans-serif",
-					"slug": "dm-sans",
-					"name": "DM Sans",
-					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "18px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "20px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "22px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "min(max(36px, 5vw), 48px)",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"width": "0px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "400",
-					"lineHeight": "1.6"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 64px)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "1.2"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"width": "0px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"typography": {
-					"fontSize": "25px",
-					"fontWeight": "normal",
-					"lineHeight": "40px"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "500",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"border": {
-					"width": "1px 0 0 0"
-				}
-			},
-			"core/post-template": {
-				"elements": {
-					"h2": {
-						"typography": {
-							"fontSize": "var(--wp--preset--font-size--large)"
-						}
-					}
-				}
-			},
-			"core/query-pagination": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "500"
-				}
-			},
-			"core/site-title": {
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textTransform": "uppercase"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"lineHeight": "1.2"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(36px, 6vw), 65px)",
-					"lineHeight": "1.2"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"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)",
-					"lineHeight": "1.4"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "1.4"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": "1.4"
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontWeight": "400"
-		}
-	}
-}

geologist/package.json

@@ -11,9 +11,8 @@
     "node-sass-package-importer": "^5.3.2"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js geologist",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss assets/theme.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
   },
   "author": "",

geologist/theme.json

@@ -1,16 +1,6 @@
 {
 	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
 	"customTemplates": [
 		{
 			"name": "blank",
@@ -38,12 +28,6 @@
 		}
 	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -69,14 +53,10 @@
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
 					"radius": "0",
-					"style": "solid",
 					"width": "3px"
 				},
 				"color": {
@@ -92,18 +72,9 @@
 						"color": "var(--wp--custom--color--foreground)"
 					}
 				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"lineHeight": 2
+					"fontWeight": "700"
 				}
 			},
 			"color": {
@@ -135,68 +106,16 @@
 					}
 				}
 			],
-			"fontSizes": {
-				"tiny": "16px"
-			},
 			"form": {
-				"padding": "20px",
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
 					"style": "solid",
 					"width": "2px"
 				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
+				"padding": "20px"
 			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
+			"fontSizes": {
+				"tiny": "16px"
 			},
 			"body": {
 				"typography": {
@@ -205,26 +124,14 @@
 			},
 			"heading": {
 				"typography": {
-					"fontWeight": "500",
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
+					"fontWeight": "500"
 				}
 			},
 			"layout": {
-				"contentSize": "664px"
+				"contentSize":"664px"
 			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
+			"line-height": {
+				"body": 1.7
 			},
 			"gap": {
 				"baseline": "10px",
@@ -240,84 +147,27 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": 400
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
 			},
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
-			},
-			"line-height": {
-				"body": 1.7
 			}
 		},
 		"layout": {
 			"contentSize": "664px",
 			"wideSize": "1128px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -361,9 +211,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -371,40 +218,20 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
 				}
 			},
 			"core/code": {
 				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
 					"width": "0px"
 				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+				"color": {
+					"background": "var(--wp--custom--color--tertiary)"
 				},
 				"typography": {
-					"fontFamily": "monospace",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"core/navigation": {
@@ -412,68 +239,22 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 64px)",
-					"lineHeight": "1.2",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
-				}
-			},
-			"core/post-date": {
+			"core/navigation-link": {
 				"color": {
-					"link": "var(--wp--custom--color--foreground)",
+					"background": "transparent",
 					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0 0 0"
-				},
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "500",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				}
-			},
-			"core/search": {
+			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
+					"fontSize": "min(max(48px, 7vw), 64px)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "1.2"
 				}
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
 					"width": "0px"
 				},
 				"spacing": {
@@ -483,26 +264,27 @@
 				},
 				"typography": {
 					"fontSize": "25px",
-					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
 				}
 			},
-			"core/site-title": {
+			"core/pullquote": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textDecoration": "none",
-					"textTransform": "uppercase"
+					"fontStyle": "normal",
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontWeight": "500",
+					"lineHeight": "1.4"
 				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
+				"spacing": {
+					"padding": {
+						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )"
+					}
+				},
+				"border": {
+					"width": "1px 0 0 0"
 				}
 			},
 			"core/post-template": {
@@ -519,95 +301,59 @@
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "500"
 				}
+			},
+			"core/site-title": {
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "700",
+					"textTransform": "uppercase"
+				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "1.2",
-					"fontSize": "min(max(48px, 7vw), 80px)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "min(max(48px, 7vw), 80px)",
+					"lineHeight": "1.2"
 				}
 			},
 			"h2": {
 				"typography": {
 					"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)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "min(max(36px, 6vw), 65px)",
+					"lineHeight": "1.2"
 				}
 			},
 			"h3": {
 				"typography": {
 					"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--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": "1.2"
 				}
 			},
 			"h4": {
 				"typography": {
 					"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)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": "1.4"
 				}
 			},
 			"h5": {
 				"typography": {
 					"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--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"lineHeight": "1.4"
 				}
 			},
 			"h6": {
 				"typography": {
 					"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--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.4"
 				}
 			},
 			"link": {
@@ -616,14 +362,9 @@
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		}
 	}
-}
+}

kerr/child-theme.json

@@ -1,351 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"customTemplates": [
-		{
-			"name": "page-without-title",
-			"title": "Page without title",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#60495a",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#f4845f",
-					"name": "Secondary"
-				},
-				{
-					"slug": "foreground",
-					"color": "#1d1e1e",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#fcf9f5",
-					"name": "Tertiary"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
-					"width": "3px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--secondary)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--foreground)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				}
-			},
-			"color": {
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
-				"primary": "var(--wp--preset--color--primary)",
-				"secondary": "var(--wp--preset--color--secondary)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"form": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"style": "solid",
-					"width": "2px"
-				},
-				"padding": "20px"
-			},
-			"fontSizes": {
-				"tiny": "16px"
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.7
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": "400"
-				}
-			},
-			"layout": {
-				"contentSize":"664px"
-			},
-			"line-height": {
-				"body": 1.7
-			},
-			"gap": {
-				"horizontal": "min(20px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": "400"
-					}
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "664px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Work Sans\", sans-serif",
-					"slug": "work-sans",
-					"name": "Work Sans",
-					"google": "family=Work+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "24px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "32px",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "36px",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"width": "0px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "400",
-					"lineHeight": "1.6"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "400",
-					"lineHeight": 1.3
-				}
-			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"width": "0px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"typography": {
-					"fontSize": "25px",
-					"fontWeight": "normal",
-					"lineHeight": "40px"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "400",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"border": {
-					"width": "1px 0 0 0"
-				}
-			},
-			"core/post-template": {
-				"elements": {
-					"h2": {
-						"typography": {
-							"fontSize": "var(--wp--preset--font-size--large)"
-						}
-					}
-				}
-			},
-			"core/query-pagination": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "400"
-				}
-			},
-			"core/site-title": {
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": 1.2
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"lineHeight": 1.2
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--medium)",
-					"lineHeight": 1.2
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": 1.4
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": 1.4
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": 1.4
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--work-sans)",
-			"fontWeight": "400"
-		},
-		"core/site-logo": {
-			"spacing": {
-				"padding": {
-					"left": "35px"
-				}
-			}
-		}
-	}
-}

kerr/theme.json

@@ -1,16 +1,6 @@
 {
 	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
 	"customTemplates": [
 		{
 			"name": "blank",
@@ -38,12 +28,6 @@
 		}
 	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -74,14 +58,10 @@
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
 					"radius": "0",
-					"style": "solid",
 					"width": "3px"
 				},
 				"color": {
@@ -97,18 +77,9 @@
 						"color": "var(--wp--custom--color--foreground)"
 					}
 				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"lineHeight": 2
+					"fontWeight": "700"
 				}
 			},
 			"color": {
@@ -118,103 +89,16 @@
 				"secondary": "var(--wp--preset--color--secondary)",
 				"tertiary": "var(--wp--preset--color--tertiary)"
 			},
-			"colorPalettes": [
-				{
-					"label": "Featured",
-					"slug": "palette-1",
-					"colors": {
-						"primary": "#C8133E",
-						"secondary": "#4E2F4B",
-						"foreground": "#1D1E1E",
-						"background": "#FFFFFF",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-2",
-					"colors": {
-						"primary": "#35845D",
-						"secondary": "#233252",
-						"foreground": "#242527",
-						"background": "#EEF4F7",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-3",
-					"colors": {
-						"primary": "#9FD3E8",
-						"secondary": "#FBE6AA",
-						"foreground": "#FFFFFF",
-						"background": "#1F2527",
-						"tertiary": "#364043"
-					}
-				}
-			],
-			"fontSizes": {
-				"tiny": "16px"
-			},
 			"form": {
-				"padding": "20px",
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
 					"style": "solid",
 					"width": "2px"
 				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
+				"padding": "20px"
 			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
+			"fontSizes": {
+				"tiny": "16px"
 			},
 			"body": {
 				"typography": {
@@ -223,29 +107,16 @@
 			},
 			"heading": {
 				"typography": {
-					"fontWeight": "400",
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
+					"fontWeight": "400"
 				}
 			},
 			"layout": {
-				"contentSize": "664px"
+				"contentSize":"664px"
 			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
+			"line-height": {
+				"body": 1.7
 			},
 			"gap": {
-				"baseline": "15px",
 				"horizontal": "min(20px, 5vw)",
 				"vertical": "min(30px, 5vw)"
 			},
@@ -258,83 +129,25 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": "400"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
 			},
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
 				}
-			},
-			"line-height": {
-				"body": 1.7
 			}
 		},
 		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1000px"
-		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
+			"contentSize": "664px"
 		},
 		"typography": {
 			"customFontSize": true,
@@ -379,9 +192,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -389,40 +199,20 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
 				}
 			},
 			"core/code": {
 				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
 					"width": "0px"
 				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+				"color": {
+					"background": "var(--wp--custom--color--tertiary)"
 				},
 				"typography": {
-					"fontFamily": "monospace",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"core/navigation": {
@@ -430,6 +220,12 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
+			"core/navigation-link": {
+				"color": {
+					"background": "transparent",
+					"text": "var(--wp--custom--color--foreground)"
+				}
+			},
 			"core/post-title": {
 				"spacing": {
 					"margin": {
@@ -439,70 +235,19 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": 1.3,
-					"fontWeight": "400"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0 0 0"
-				},
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--large)",
 					"fontWeight": "400",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
+					"lineHeight": 1.3
 				}
 			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
+			"list": {
+				"padding": {
+					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
 				}
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"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 )"
@@ -510,20 +255,27 @@
 				},
 				"typography": {
 					"fontSize": "25px",
-					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
 				}
 			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
+			"core/pullquote": {
+				"typography": {
+					"fontStyle": "normal",
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontWeight": "400",
+					"lineHeight": "1.4"
+				},
+				"spacing": {
+					"padding": {
+						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )"
+					}
+				},
+				"border": {
+					"width": "1px 0 0 0"
 				}
 			},
 			"core/post-template": {
@@ -540,95 +292,58 @@
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400"
 				}
+			},
+			"core/site-title": {
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "700"
+				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"lineHeight": 1.2
 				}
 			},
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": 1.2
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"lineHeight": 1.2
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"lineHeight": 1.4
 				}
 			},
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": 1.4
 				}
 			},
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--work-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.4,
-					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": 1.4
 				}
 			},
 			"link": {
@@ -637,13 +352,8 @@
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--work-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		},
 		"core/site-logo": {
@@ -654,4 +364,4 @@
 			}
 		}
 	}
-}
+}

mayland-blocks/child-theme.json

@@ -1,237 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		},
-		{
-			"name": "navigation",
-			"area": "navigation"
-		},
-		{
-			"name": "post-meta",
-			"area": "Post Meta"
-		}
-	],
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "foreground",
-					"color": "#1a1a1a",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "primary",
-					"color": "#000000",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#666666",
-					"name": "Secondary"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#add8e6",
-					"name": "tertiary"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"radius": "5px",
-					"color": "var(--wp--custom--color--foreground)"
-				},
-				"color": {
-					"text": "var(--wp--custom--color--background)",
-					"background": "var(--wp--custom--color--primary)"
-				},
-				"spacing": {
-					"padding": {
-						"top": "4px",
-						"bottom": "4px",
-						"left": "14px",
-						"right": "14px"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"fontWeight": 600
-				}
-			},
-			"color": {
-				"primary": "var(--wp--preset--color--primary)",
-				"secondary": "var(--wp--preset--color--secondary)",
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(32px, 5vw)"
-			},
-			"width": {
-				"default": "750px",
-				"wide": "1022px"
-			}
-		},
-		"layout": {
-			"contentSize": "782px",
-			"wideSize": "1000px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Poppins\", sans-serif",
-					"slug": "poppins",
-					"name": "Poppins",
-					"google": "family=Poppins: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"
-				},
-				{
-					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
-				},
-				{
-					"fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif",
-					"slug": "helvetica-arial"
-				},
-				{
-					"fontFamily": "Geneva, Tahoma, Verdana, sans-serif",
-					"slug": "geneva-verdana"
-				},
-				{
-					"fontFamily": "Cambria, Georgia, serif",
-					"slug": "cambria-georgia"
-				},
-				{
-					"fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif",
-					"slug": "hoefler-times-new-roman"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16.6px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "20px",
-					"slug": "normal"
-				},
-				{
-					"name": "Large",
-					"size": "28.8px",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "34.56px",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/post-date": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
-				}
-			}
-		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "41.47px"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "var(--wp--preset--font-size--large)"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "24px"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--poppins)"
-		}
-	}
-}

mayland-blocks/package.json

@@ -11,9 +11,8 @@
 		"node-sass-package-importer": "^5.3.2"
 	},
 	"scripts": {
-		"start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-		"build": "npm run build:theme && npm run build:scss",
-		"build:theme": "node ../blockbase/build.js mayland-blocks",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
 		"build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss assets/theme.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
 	},
 	"author": "",

mayland-blocks/theme.json

@@ -19,31 +19,7 @@
 			"area": "Post Meta"
 		}
 	],
-	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -74,28 +50,14 @@
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
-					"color": "var(--wp--custom--color--foreground)",
 					"radius": "5px",
-					"style": "solid",
-					"width": "2px"
+					"color": "var(--wp--custom--color--foreground)"
 				},
 				"color": {
-					"background": "var(--wp--custom--color--primary)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--background)",
-						"background": "var(--wp--custom--color--secondary)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--secondary)"
-					}
+					"text": "var(--wp--custom--color--background)",
+					"background": "var(--wp--custom--color--primary)"
 				},
 				"spacing": {
 					"padding": {
@@ -107,213 +69,19 @@
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)",
-					"fontWeight": 600,
-					"lineHeight": 2
+					"fontWeight": 600
 				}
 			},
 			"color": {
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
 				"primary": "var(--wp--preset--color--primary)",
 				"secondary": "var(--wp--preset--color--secondary)",
+				"foreground": "var(--wp--preset--color--foreground)",
+				"background": "var(--wp--preset--color--background)",
 				"tertiary": "var(--wp--preset--color--tertiary)"
 			},
-			"colorPalettes": [
-				{
-					"label": "Featured",
-					"slug": "palette-1",
-					"colors": {
-						"primary": "#C8133E",
-						"secondary": "#4E2F4B",
-						"foreground": "#1D1E1E",
-						"background": "#FFFFFF",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-2",
-					"colors": {
-						"primary": "#35845D",
-						"secondary": "#233252",
-						"foreground": "#242527",
-						"background": "#EEF4F7",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-3",
-					"colors": {
-						"primary": "#9FD3E8",
-						"secondary": "#FBE6AA",
-						"foreground": "#FFFFFF",
-						"background": "#1F2527",
-						"tertiary": "#364043"
-					}
-				}
-			],
-			"fontSizes": {
-				"tiny": "14px"
-			},
-			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
-				"border": {
-					"color": "#EFEFEF",
-					"radius": "0",
-					"style": "solid",
-					"width": "2px"
-				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.6
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": 400,
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
-				}
-			},
-			"layout": {
-				"contentSize": "620px"
-			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
-			},
 			"gap": {
 				"baseline": "10px",
-				"horizontal": "min(32px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontStyle": "italic",
-						"fontWeight": "400"
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
+				"horizontal": "min(32px, 5vw)"
 			},
 			"width": {
 				"default": "750px",
@@ -324,18 +92,6 @@
 			"contentSize": "782px",
 			"wideSize": "1000px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -395,127 +151,35 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontFamily": "var(--wp--preset--font-family--poppins)"
 				}
 			},
-			"core/code": {
-				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
+			"core/navigation": {
 				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/navigation": {
+			"core/post-date": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
 			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0"
-				},
 				"typography": {
-					"fontStyle": "italic",
 					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
-				}
-			},
-			"core/search": {
-				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
 				}
 			},
 			"core/site-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "700",
-					"textDecoration": "none"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			}
 		},
@@ -527,85 +191,37 @@
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "41.47px"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "24px"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"link": {
@@ -614,13 +230,8 @@
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--preset--font-family--poppins)",
-			"fontSize": "var(--wp--preset--font-size--normal)"
+			"fontFamily": "var(--wp--preset--font-family--poppins)"
 		}
 	}
-}
+}

payton/child-theme.json

@@ -1,174 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#111111",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#557769",
-					"name": "Secondary"
-				},
-				{
-					"slug": "foreground",
-					"color": "#686868",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#d5e1dc",
-					"name": "Tertiary"
-				}
-			]
-		},
-		"custom": {
-			"separator": {
-				"margin": "var(--wp--custom--gap--vertical) auto"
-			}
-		},
-		"layout": {
-			"contentSize": "684px",
-			"wideSize": "1194px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Source Serif Pro\", serif",
-					"slug": "source-serif-pro",
-					"name": "Source Serif Pro",
-					"google": "family=Source+Serif+Pro:ital,wght@0,400;0,700;1,400;1,700"
-				},
-				{
-					"fontFamily": "\"Overpass\", sans-serif",
-					"slug": "overpass",
-					"name": "Overpass",
-					"google": "family=Overpass:ital,wght@0,200;0,400;0,700;1,200;1,400;1,700"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "24px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "28px",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "32px",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"textTransform": "uppercase"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": 1.2
-				},
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
-				},
-				"spacing": {
-					"margin": {
-						"bottom": "1em"
-					}
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"core/site-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--large)"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--source-serif-pro)",
-			"fontWeight": "400"
-		}
-	}
-}

payton/theme.json

@@ -1,41 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
-	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -66,265 +32,14 @@
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"radius": "4px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--primary)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--background)",
-						"background": "var(--wp--custom--color--secondary)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--secondary)"
-					}
-				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "normal",
-					"lineHeight": 2
-				}
-			},
-			"color": {
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
-				"primary": "var(--wp--preset--color--primary)",
-				"secondary": "var(--wp--preset--color--secondary)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "Featured",
-					"slug": "palette-1",
-					"colors": {
-						"primary": "#C8133E",
-						"secondary": "#4E2F4B",
-						"foreground": "#1D1E1E",
-						"background": "#FFFFFF",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-2",
-					"colors": {
-						"primary": "#35845D",
-						"secondary": "#233252",
-						"foreground": "#242527",
-						"background": "#EEF4F7",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-3",
-					"colors": {
-						"primary": "#9FD3E8",
-						"secondary": "#FBE6AA",
-						"foreground": "#FFFFFF",
-						"background": "#1F2527",
-						"tertiary": "#364043"
-					}
-				}
-			],
-			"fontSizes": {
-				"tiny": "14px"
-			},
-			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
-				"border": {
-					"color": "#EFEFEF",
-					"radius": "0",
-					"style": "solid",
-					"width": "2px"
-				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.6
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": 400,
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
-				}
-			},
-			"layout": {
-				"contentSize": "620px"
-			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
-			},
-			"gap": {
-				"baseline": "15px",
-				"horizontal": "min(30px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontStyle": "italic",
-						"fontWeight": "400"
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
 			"separator": {
-				"opacity": 1,
-				"width": "150px",
 				"margin": "var(--wp--custom--gap--vertical) auto"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
 			}
 		},
 		"layout": {
 			"contentSize": "684px",
 			"wideSize": "1194px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -374,9 +89,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -385,47 +97,10 @@
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)",
 					"textTransform": "uppercase"
 				}
 			},
-			"core/code": {
-				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
 			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "1em"
-					}
-				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
@@ -433,182 +108,67 @@
 				},
 				"color": {
 					"text": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
 				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+				"spacing": {
+					"margin": {
+						"bottom": "1em"
+					}
 				}
 			},
 			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0"
-				},
 				"typography": {
-					"fontStyle": "italic",
 					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
 				}
 			},
 			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700
-				},
 				"spacing": {
 					"margin": {
 						"bottom": "0"
 					}
 				}
-			},
-			"core/quote": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"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)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
-				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--medium)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--overpass)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--source-serif-pro)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		}
 	}
-}
+}

quadrat/child-theme.json

@@ -1,409 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"customTemplates": [
-		{
-			"name": "page-without-title",
-			"title": "Page without title",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#FFD1D1",
-					"name": "Primary"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#151853",
-					"name": "Tertiary"
-				},
-				{
-					"slug": "background",
-					"color": "#292C6D",
-					"name": "Background"
-				}
-
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
-					"width": "3px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--foreground)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				}
-			},
-			"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)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "Blue",
-					"slug": "blue",
-					"colors": {
-						"primary": "#FDF5E2",
-						"tertiary": "#123B62",
-						"background": "#204A72"
-					}
-				},
-				{
-					"label": "Dark Blue",
-					"slug": "dark-blue",
-					"colors": {
-						"primary": "#F9DAAD",
-						"tertiary": "#071F2C",
-						"background": "#0E2B3B"
-					}
-				},
-				{
-					"label": "Green",
-					"slug": "green",
-					"colors": {
-						"primary": "#F5D5CA",
-						"tertiary": "#0A2C25",
-						"background": "#103931"
-					}
-				},
-				{
-					"label": "Red",
-					"slug": "red",
-					"colors": {
-						"primary": "#CEEDFF",
-						"tertiary": "#721A18",
-						"background": "#822726"
-					}
-				},
-				{
-					"label": "Light Green",
-					"slug": "light-green",
-					"colors": {
-						"primary": "#0C1946",
-						"tertiary": "#DBE9DD",
-						"background": "#EBF3EC"
-					}
-				},
-				{
-					"label": "White",
-					"slug": "white",
-					"colors": {
-						"primary": "#2B2B2B",
-						"tertiary": "#F8F8F8",
-						"background": "#FFFFFF"
-					}
-				},
-				{
-					"label": "Light Pink",
-					"slug": "light-pink",
-					"colors": {
-						"primary": "#151853",
-						"tertiary": "#FCD0D0",
-						"background": "#FFE2E2"
-					}
-				},
-				{
-					"label": "Light Yellow",
-					"slug": "light-yellow",
-					"colors": {
-						"primary": "#0E2B3B",
-						"tertiary": "#FBEAD2",
-						"background": "#FFF4E3"
-					}
-				},
-				{
-					"label": "Light Blue",
-					"slug": "light-blue",
-					"colors": {
-						"primary": "#460707",
-						"tertiary": "#DEE9F1",
-						"background": "#EDF4F9"
-					}
-				}
-			],
-			"form": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"style": "solid",
-					"width": "2px"
-				},
-				"padding": "20px"
-			},
-			"fontSizes": {
-				"tiny": "16px"
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.7
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"layout": {
-				"contentSize":"664px"
-			},
-			"line-height": {
-				"body": 1.7
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(34px, 5vw)",
-				"vertical": "min(34px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": 400
-					}
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": "400"
-					}
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1128px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"DM Sans\", sans-serif",
-					"slug": "dm-sans",
-					"name": "DM Sans",
-					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "18px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "20px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "22px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "min(max(36px, 5vw), 48px)",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"width": "0px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "400",
-					"lineHeight": "1.6"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "1.2"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"width": "0px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"typography": {
-					"fontSize": "25px",
-					"fontWeight": "normal",
-					"lineHeight": "40px"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "400",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "0px",
-						"right": "0px"
-					}
-				},
-				"border": {
-					"width": "1px 0 0 0"
-				}
-			},
-			"core/post-template": {
-				"elements": {
-					"h2": {
-						"typography": {
-							"fontSize": "min(max(28px, 5vw), 38px)"
-						}
-					}
-				}
-			},
-			"core/query-pagination": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "500"
-				}
-			},
-			"core/site-title": {
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textTransform": "uppercase"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"lineHeight": "1.2"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "1.2"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"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--medium)",
-					"lineHeight": "1.4"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "1.4"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": "1.4"
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontWeight": "400"
-		}
-	}
-}

quadrat/package.json

@@ -14,9 +14,8 @@
     "postcss-cli": "^8.3.1"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js quadrat",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss --output-style expanded --indent-type tab --indent-width 1 | postcss --use autoprefixer --output assets/theme.css --map"
   },
   "author": "",

quadrat/theme.json

@@ -1,16 +1,6 @@
 {
 	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
 	"customTemplates": [
 		{
 			"name": "blank",
@@ -38,12 +28,6 @@
 		}
 	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -61,17 +45,14 @@
 					"color": "#292C6D",
 					"name": "Background"
 				}
+
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
 					"radius": "0",
-					"style": "solid",
 					"width": "3px"
 				},
 				"color": {
@@ -87,18 +68,9 @@
 						"color": "var(--wp--custom--color--foreground)"
 					}
 				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"lineHeight": 2
+					"fontWeight": "700"
 				}
 			},
 			"color": {
@@ -191,68 +163,16 @@
 					}
 				}
 			],
-			"fontSizes": {
-				"tiny": "16px"
-			},
 			"form": {
-				"padding": "20px",
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
 					"style": "solid",
 					"width": "2px"
 				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
+				"padding": "20px"
 			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
+			"fontSizes": {
+				"tiny": "16px"
 			},
 			"body": {
 				"typography": {
@@ -261,26 +181,14 @@
 			},
 			"heading": {
 				"typography": {
-					"fontWeight": "500",
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
+					"fontWeight": "500"
 				}
 			},
 			"layout": {
-				"contentSize": "664px"
+				"contentSize":"664px"
 			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
+			"line-height": {
+				"body": 1.7
 			},
 			"gap": {
 				"baseline": "10px",
@@ -296,84 +204,27 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": 400
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
 			},
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
-			},
-			"line-height": {
-				"body": 1.7
 			}
 		},
 		"layout": {
 			"contentSize": "664px",
 			"wideSize": "1128px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -417,9 +268,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -427,40 +275,20 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
 				}
 			},
 			"core/code": {
 				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
 					"width": "0px"
 				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+				"color": {
+					"background": "var(--wp--custom--color--tertiary)"
 				},
 				"typography": {
-					"fontFamily": "monospace",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"core/navigation": {
@@ -468,68 +296,22 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"lineHeight": "1.2",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
-				}
-			},
-			"core/post-date": {
+			"core/navigation-link": {
 				"color": {
-					"link": "var(--wp--custom--color--foreground)",
+					"background": "transparent",
 					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0 0 0"
-				},
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "400",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "0px",
-						"right": "0px",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
-				}
-			},
-			"core/search": {
+			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
+					"fontSize": "min(max(48px, 7vw), 80px)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "1.2"
 				}
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
 					"width": "0px"
 				},
 				"spacing": {
@@ -539,26 +321,25 @@
 				},
 				"typography": {
 					"fontSize": "25px",
-					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
 				}
 			},
-			"core/site-title": {
+			"core/pullquote": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textDecoration": "none",
-					"textTransform": "uppercase"
+					"fontStyle": "normal",
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"fontWeight": "400",
+					"lineHeight": "1.4"
 				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
+				"spacing": {
+					"padding": {
+						"left": "0px",
+						"right": "0px"
+					}
+				},
+				"border": {
+					"width": "1px 0 0 0"
 				}
 			},
 			"core/post-template": {
@@ -575,95 +356,59 @@
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "500"
 				}
+			},
+			"core/site-title": {
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "700",
+					"textTransform": "uppercase"
+				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "1.2",
-					"fontSize": "min(max(48px, 7vw), 80px)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "min(max(48px, 7vw), 80px)",
+					"lineHeight": "1.2"
 				}
 			},
 			"h2": {
 				"typography": {
 					"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--huge)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"lineHeight": "1.2"
 				}
 			},
 			"h3": {
 				"typography": {
 					"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--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": "1.2"
 				}
 			},
 			"h4": {
 				"typography": {
 					"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--medium)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"lineHeight": "1.4"
 				}
 			},
 			"h5": {
 				"typography": {
 					"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--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"lineHeight": "1.4"
 				}
 			},
 			"h6": {
 				"typography": {
 					"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--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.4"
 				}
 			},
 			"link": {
@@ -672,14 +417,9 @@
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		}
 	}
-}
+}

russell/child-theme.json

@@ -1,140 +0,0 @@
-{
-    "$schema": "https:\/\/json.schemastore.org\/theme-v1.json",
-    "version": 1,
-    "settings": {
-        "color": {
-            "palette": [
-                {
-                    "slug": "primary",
-                    "color": "#384143",
-                    "name": "Primary"
-                },
-                {
-                    "slug": "secondary",
-                    "color": "#967e7e",
-                    "name": "Secondary"
-                },
-                {
-                    "slug": "foreground",
-                    "color": "#384143",
-                    "name": "Foreground"
-                },
-                {
-                    "slug": "background",
-                    "color": "#ffffff",
-                    "name": "Background"
-                },
-                {
-                    "slug": "tertiary",
-                    "color": "#fbf7f7",
-                    "name": "Tertiary"
-                }
-            ]
-        },
-        "custom": {
-            "separator": {
-                "margin": "var(--wp--custom--gap--vertical) auto"
-            }
-        },
-        "typography": {
-            "customFontSize": true,
-            "customLineHeight": true,
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"DM Sans\", sans-serif",
-                    "slug": "dm-sans",
-                    "name": "DM Sans",
-                    "google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-                },
-                {
-                    "fontFamily": "\"Libre Baskerville\", serif",
-                    "slug": "libre-baskerville",
-                    "name": "Libre Baskerville",
-                    "google": "family=Libre+Baskerville:ital,wght@0,400;0,700;1,400"
-                }
-            ],
-            "fontSizes": [
-                {
-                    "name": "Small",
-                    "size": "16px",
-                    "slug": "small"
-                },
-                {
-                    "name": "Normal",
-                    "size": "18px",
-                    "slug": "normal"
-                },
-                {
-                    "name": "Medium",
-                    "size": "24px",
-                    "slug": "medium"
-                },
-                {
-                    "name": "Large",
-                    "size": "28px",
-                    "slug": "large"
-                },
-                {
-                    "name": "Huge",
-                    "size": "32px",
-                    "slug": "huge"
-                }
-            ]
-        }
-    },
-    "styles": {
-        "blocks": {
-            "core\/button": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--dm-sans)"
-                }
-            },
-            "core\/post-title": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-                    "fontSize": "var(--wp--preset--font-size--huge)"
-                }
-            },
-            "core\/pullquote": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            }
-        },
-        "elements": {
-            "h1": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            },
-            "h2": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            },
-            "h3": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            },
-            "h4": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            },
-            "h5": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            },
-            "h6": {
-                "typography": {
-                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-                }
-            }
-        },
-        "typography": {
-            "fontFamily": "var(--wp--preset--font-family--dm-sans)"
-        }
-    }
-}

russell/package.json

@@ -11,9 +11,8 @@
     "node-sass-package-importer": "^5.3.2"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js russell",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss assets/theme.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
   },
   "author": "",

russell/theme.json

@@ -1,606 +1,140 @@
 {
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
-	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
-	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
-		"color": {
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#384143",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#967e7e",
-					"name": "Secondary"
-				},
-				{
-					"slug": "foreground",
-					"color": "#384143",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#fbf7f7",
-					"name": "Tertiary"
-				}
-			]
-		},
-		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"radius": "4px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--primary)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--background)",
-						"background": "var(--wp--custom--color--secondary)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--secondary)"
-					}
-				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "normal",
-					"lineHeight": 2
-				}
-			},
-			"color": {
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
-				"primary": "var(--wp--preset--color--primary)",
-				"secondary": "var(--wp--preset--color--secondary)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "Featured",
-					"slug": "palette-1",
-					"colors": {
-						"primary": "#C8133E",
-						"secondary": "#4E2F4B",
-						"foreground": "#1D1E1E",
-						"background": "#FFFFFF",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-2",
-					"colors": {
-						"primary": "#35845D",
-						"secondary": "#233252",
-						"foreground": "#242527",
-						"background": "#EEF4F7",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-3",
-					"colors": {
-						"primary": "#9FD3E8",
-						"secondary": "#FBE6AA",
-						"foreground": "#FFFFFF",
-						"background": "#1F2527",
-						"tertiary": "#364043"
-					}
-				}
-			],
-			"fontSizes": {
-				"tiny": "14px"
-			},
-			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
-				"border": {
-					"color": "#EFEFEF",
-					"radius": "0",
-					"style": "solid",
-					"width": "2px"
-				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.6
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": 400,
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
-				}
-			},
-			"layout": {
-				"contentSize": "620px"
-			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
-			},
-			"gap": {
-				"baseline": "15px",
-				"horizontal": "min(30px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontStyle": "italic",
-						"fontWeight": "400"
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px",
-				"margin": "var(--wp--custom--gap--vertical) auto"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "620px",
-			"wideSize": "1000px"
-		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"DM Sans\", sans-serif",
-					"slug": "dm-sans",
-					"name": "DM Sans",
-					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-				},
-				{
-					"fontFamily": "\"Libre Baskerville\", serif",
-					"slug": "libre-baskerville",
-					"name": "Libre Baskerville",
-					"google": "family=Libre+Baskerville:ital,wght@0,400;0,700;1,400"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "24px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "28px",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "32px",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0"
-				},
-				"typography": {
-					"fontStyle": "italic",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
-				}
-			},
-			"core/search": {
-				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textDecoration": "none"
-				}
-			}
-		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "48px"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "32px"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
-				}
-			}
-		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
-		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)"
-		}
-	}
-}
+    "$schema": "https:\/\/json.schemastore.org\/theme-v1.json",
+    "version": 1,
+    "settings": {
+        "color": {
+            "palette": [
+                {
+                    "slug": "primary",
+                    "color": "#384143",
+                    "name": "Primary"
+                },
+                {
+                    "slug": "secondary",
+                    "color": "#967e7e",
+                    "name": "Secondary"
+                },
+                {
+                    "slug": "foreground",
+                    "color": "#384143",
+                    "name": "Foreground"
+                },
+                {
+                    "slug": "background",
+                    "color": "#ffffff",
+                    "name": "Background"
+                },
+                {
+                    "slug": "tertiary",
+                    "color": "#fbf7f7",
+                    "name": "Tertiary"
+                }
+            ]
+        },
+        "custom": {
+            "separator": {
+                "margin": "var(--wp--custom--gap--vertical) auto"
+            }
+        },
+        "typography": {
+            "customFontSize": true,
+            "customLineHeight": true,
+            "fontFamilies": [
+                {
+                    "fontFamily": "\"DM Sans\", sans-serif",
+                    "slug": "dm-sans",
+                    "name": "DM Sans",
+                    "google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
+                },
+                {
+                    "fontFamily": "\"Libre Baskerville\", serif",
+                    "slug": "libre-baskerville",
+                    "name": "Libre Baskerville",
+                    "google": "family=Libre+Baskerville:ital,wght@0,400;0,700;1,400"
+                }
+            ],
+            "fontSizes": [
+                {
+                    "name": "Small",
+                    "size": "16px",
+                    "slug": "small"
+                },
+                {
+                    "name": "Normal",
+                    "size": "18px",
+                    "slug": "normal"
+                },
+                {
+                    "name": "Medium",
+                    "size": "24px",
+                    "slug": "medium"
+                },
+                {
+                    "name": "Large",
+                    "size": "28px",
+                    "slug": "large"
+                },
+                {
+                    "name": "Huge",
+                    "size": "32px",
+                    "slug": "huge"
+                }
+            ]
+        }
+    },
+    "styles": {
+        "blocks": {
+            "core\/button": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--dm-sans)"
+                }
+            },
+            "core\/post-title": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)",
+                    "fontSize": "var(--wp--preset--font-size--huge)"
+                }
+            },
+            "core\/pullquote": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            }
+        },
+        "elements": {
+            "h1": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            },
+            "h2": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            },
+            "h3": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            },
+            "h4": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            },
+            "h5": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            },
+            "h6": {
+                "typography": {
+                    "fontFamily": "var(--wp--preset--font-family--libre-baskerville)"
+                }
+            }
+        },
+        "typography": {
+            "fontFamily": "var(--wp--preset--font-family--dm-sans)"
+        }
+    }
+}

seedlet-blocks/child-theme.json

@@ -1,259 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		},
-		{
-			"name": "post-meta",
-			"area": "Post Meta"
-		}
-	],
-	"settings": {
-		"color": {
-			"gradients": [
-				{
-					"slug": "hard-diagonal",
-					"gradient": "linear-gradient(to bottom right, #3C8067 49.9%, #FAFBF6 50%)",
-					"name": "Hard diagonal"
-				},
-				{
-					"slug": "hard-diagonal-inverted",
-					"gradient": "linear-gradient(to top left, #3C8067 49.9%, #FAFBF6 50%)",
-					"name": "Hard diagonal inverted"
-				},
-				{
-					"slug": "hard-horizontal",
-					"gradient": "linear-gradient(to bottom, #3C8067 50%, #FAFBF6 50%)",
-					"name": "Hard horizontal"
-				},
-				{
-					"slug": "hard-horizontal-inverted",
-					"gradient": "linear-gradient(to top, #3C8067 50%, #FAFBF6 50%)",
-					"name": "Hard horizontal inverted"
-				},
-				{
-					"slug": "diagonal",
-					"gradient": "linear-gradient(to bottom right, #3C8067, #FAFBF6)",
-					"name": "Diagonal"
-				},
-				{
-					"slug": "diagonal-inverted",
-					"gradient": "linear-gradient(to top left, #3C8067, #FAFBF6)",
-					"name": "Diagonal inverted"
-				},
-				{
-					"slug": "horizontal",
-					"gradient": "linear-gradient(to bottom, #3C8067, #FAFBF6)",
-					"name": "Horizontal"
-				},
-				{
-					"slug": "horizontal-inverted",
-					"gradient": "linear-gradient(to top, #3C8067, #FAFBF6)",
-					"name": "Horizontal inverted"
-				},
-				{
-					"slug": "stripe",
-					"gradient": "linear-gradient(to bottom, transparent 20%, #3C8067 20%, #3C8067 80%, transparent 80%)",
-					"name": "Stripe"
-				}
-			],
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#3C8067",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#336D58",
-					"name": "Secondary"
-				},
-				{
-					"slug": "foreground",
-					"color": "#333333",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#FAFBF6",
-					"name": "tertiary"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)"
-				},
-				"hover": {
-					"color": {
-						"background": "var(--wp--custom--color--secondary)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--secondary)"
-					}
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)"
-					}
-				}
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "25px",
-				"vertical": "30px"
-			},
-			"pullquote": {
-				"citation": {
-					"spacing": {
-						"margin": {
-							"top": "20px"
-						}
-					}
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "620px",
-			"wideSize": "790px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "'Fira Sans', Helvetica, Arial, sans-serif",
-					"slug": "fira-sans",
-					"name": "Fira Sans",
-					"google": "family=Fira+Sans:ital,wght@0,100..900;1,100..900"
-				},
-				{
-					"fontFamily": "'Playfair Display', Georgia, Times, serif",
-					"slug": "playfair-display",
-					"name": "Playfair Display",
-					"google": "family=Playfair+Display:ital,wght@0,400..900;1,400..900"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"slug": "small",
-					"size": "16px"
-				},
-				{
-					"name": "Normal",
-					"slug": "normal",
-					"size": "18px"
-				},
-				{
-					"name": "Large",
-					"slug": "large",
-					"size": "24px"
-				},
-				{
-					"name": "Huge",
-					"slug": "huge",
-					"size": "28px"
-				}
-			],
-			"spacing": {
-				"customPadding": true,
-				"units": [ "px", "em", "rem", "vh", "vw" ]
-			}
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--fira-sans)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"core/pullquote": {
-				"border": {
-					"style": "none"
-				},
-				"spacing": {
-					"padding": {
-						"left": 0,
-						"right": 0,
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontSize": "32px",
-					"fontStyle": "italic",
-					"lineHeight": "1.3",
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "#EFEFEF"
-				}
-			},
-			"core/site-title": {
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--fira-sans)"
-		}
-	}
-}

seedlet-blocks/package.json

@@ -11,9 +11,8 @@
     "node-sass-package-importer": "^5.3.2"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js seedlet-blocks",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss assets/theme.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
   },
   "author": "",

seedlet-blocks/theme.json

@@ -15,59 +15,8 @@
 			"area": "Post Meta"
 		}
 	],
-	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#3C8067",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#336D58",
-					"name": "Secondary"
-				},
-				{
-					"slug": "foreground",
-					"color": "#333333",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#FAFBF6",
-					"name": "tertiary"
-				}
-			],
 			"gradients": [
 				{
 					"slug": "hard-diagonal",
@@ -114,160 +63,47 @@
 					"gradient": "linear-gradient(to bottom, transparent 20%, #3C8067 20%, #3C8067 80%, transparent 80%)",
 					"name": "Stripe"
 				}
+			],
+			"palette": [
+				{
+					"slug": "primary",
+					"color": "#3C8067",
+					"name": "Primary"
+				},
+				{
+					"slug": "secondary",
+					"color": "#336D58",
+					"name": "Secondary"
+				},
+				{
+					"slug": "foreground",
+					"color": "#333333",
+					"name": "Foreground"
+				},
+				{
+					"slug": "background",
+					"color": "#ffffff",
+					"name": "Background"
+				},
+				{
+					"slug": "tertiary",
+					"color": "#FAFBF6",
+					"name": "tertiary"
+				}
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"radius": "4px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--primary)",
-					"text": "var(--wp--custom--color--background)"
+					"color": "var(--wp--custom--color--primary)"
 				},
 				"hover": {
 					"color": {
-						"text": "var(--wp--custom--color--background)",
 						"background": "var(--wp--custom--color--secondary)"
 					},
 					"border": {
 						"color": "var(--wp--custom--color--secondary)"
 					}
-				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "normal",
-					"lineHeight": 2
-				}
-			},
-			"color": {
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
-				"primary": "var(--wp--preset--color--primary)",
-				"secondary": "var(--wp--preset--color--secondary)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "Featured",
-					"slug": "palette-1",
-					"colors": {
-						"primary": "#C8133E",
-						"secondary": "#4E2F4B",
-						"foreground": "#1D1E1E",
-						"background": "#FFFFFF",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-2",
-					"colors": {
-						"primary": "#35845D",
-						"secondary": "#233252",
-						"foreground": "#242527",
-						"background": "#EEF4F7",
-						"tertiary": "#F9F9F9"
-					}
-				},
-				{
-					"label": "Featured",
-					"slug": "palette-3",
-					"colors": {
-						"primary": "#9FD3E8",
-						"secondary": "#FBE6AA",
-						"foreground": "#FFFFFF",
-						"background": "#1F2527",
-						"tertiary": "#364043"
-					}
-				}
-			],
-			"fontSizes": {
-				"tiny": "14px"
-			},
-			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
-				"border": {
-					"color": "#EFEFEF",
-					"radius": "0",
-					"style": "solid",
-					"width": "2px"
-				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.6
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": 400,
-					"lineHeight": 1.125
 				}
 			},
 			"latest-posts": {
@@ -277,85 +113,18 @@
 					}
 				}
 			},
-			"layout": {
-				"contentSize": "620px"
-			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
-			},
 			"gap": {
 				"baseline": "10px",
 				"horizontal": "25px",
 				"vertical": "30px"
 			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
 			"pullquote": {
 				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
 					"spacing": {
 						"margin": {
 							"top": "20px"
 						}
 					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontStyle": "italic",
-						"fontWeight": "400"
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
 				}
 			}
 		},
@@ -363,18 +132,6 @@
 			"contentSize": "620px",
 			"wideSize": "790px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -416,95 +173,26 @@
 			],
 			"spacing": {
 				"customPadding": true,
-				"units": [
-					"px",
-					"em",
-					"rem",
-					"vh",
-					"vw"
-				]
+				"units": [ "px", "em", "rem", "vh", "vw" ]
 			}
 		}
 	},
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--fira-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"core/navigation": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
+					"fontFamily": "var(--wp--preset--font-family--fira-sans)"
 				}
 			},
 			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "var(--wp--preset--font-size--huge)"
 				}
 			},
 			"core/pullquote": {
 				"border": {
-					"style": "none",
-					"width": "1px 0"
-				},
-				"typography": {
-					"fontStyle": "italic",
-					"fontSize": "32px",
-					"lineHeight": "1.3",
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+					"style": "none"
 				},
 				"spacing": {
 					"padding": {
@@ -513,153 +201,59 @@
 						"top": "var(--wp--custom--gap--vertical)",
 						"bottom": "var(--wp--custom--gap--vertical)"
 					}
-				}
-			},
-			"core/search": {
+				},
 				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
+					"fontSize": "32px",
+					"fontStyle": "italic",
+					"lineHeight": "1.3",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"core/separator": {
 				"color": {
 					"text": "#EFEFEF"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
 				}
 			},
 			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textDecoration": "none"
-				},
 				"color": {
 					"link": "var(--wp--custom--color--primary)"
 				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "48px"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"h2": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "32px"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"h3": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"h6": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--preset--font-family--fira-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)"
+			"fontFamily": "var(--wp--preset--font-family--fira-sans)"
 		}
 	}
-}
+}

skatepark/child-theme.json

@@ -1,409 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"settings": {
-		"color": {
-			"duotone": [
-                {
-                    "colors": [ "#000", "#B9FB9C" ],
-                    "slug": "default-filter",
-                    "name": "Default filter"
-                },
-                {
-                    "colors": [ "#000", "#FFF" ],
-                    "slug": "white-filter",
-                    "name": "White Filter"
-                },
-                {
-                    "colors": [ "#000", "#F3B2A9" ],
-                    "slug": "red-filter",
-                    "name": "Red Filter"
-                },
-                {
-                    "colors": [ "#000", "#C9E4ED" ],
-                    "slug": "blue-filter",
-                    "name": "Blue Filter"
-                },
-                {
-                    "colors": [ "#252B39", "#F9EED4" ],
-                    "slug": "blue-cream-filter",
-                    "name": "Blue/Cream Filter"
-                },
-                {
-                    "colors": [ "#153232", "#F7B9A9" ],
-                    "slug": "green-pink-filter",
-                    "name": "Green/Pink Filter"
-                }
-            ],
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#000000",
-					"name": "Primary"
-				},
-				{
-					"slug": "background",
-					"color": "#B9FB9C",
-					"name": "Background"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"radius": "0",
-					"width": "3px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--primary)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--primary)"
-					}
-				},
-				"spacing": {
-					"padding": {
-						"left": "1.75em",
-						"right": "1.75em"
-					}
-				},
-				"typography": {
-					"fontSize": "16px",
-					"fontWeight": "700"
-				}
-			},
-			"body": {
-				"typography": {
-					"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)",
-				"tertiary": "var(--wp--preset--color--background)"
-			},
-			"colorPalettes": [
-				{
-					"label": "White",
-					"slug": "white",
-					"colors": {
-						"primary": "#000000",
- 						"background": "#FFFFFF"
-					}
-				},
-				{
-					"label": "Red",
-					"slug": "red",
-					"colors": {
-						"primary": "#000000",
-						"background": "#F3B2A9"
-					}
-				},
-				{
-					"label": "Blue",
-					"slug": "blue",
-					"colors": {
-						"primary": "#000000",
-						"background": "#C9E4ED"
-					}
-				},
-				{
-					"label": "Blue/Cream",
-					"slug": "blue-cream",
-					"colors": {
-						"primary": "#F9EED4",
-						"background": "#252B39"
-					}
-				},
-				{
-					"label": "Green/Pink",
-					"slug": "green-pink",
-					"colors": {
-						"primary": "#F7B9A9",
-						"background": "#153232"
-					}
-				}
-			],
-			"form": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"radius": "0",
-					"style": "solid",
-					"width": "3px"
-				},
-				"checkbox": {
-					"checked": {
-						"fontSize": "var(--wp--preset--font-size--normal)",
-						"position": {
-							"left": "7px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "25px",
-							"width": "25px"
-						}
-					},
-					"unchecked": {
-						"position": {
-							"top": "-0.4em"
-						},
-						"sizing": {
-							"height": "30px",
-							"width": "30px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "900",
-						"letterSpacing": ".1em",
-						"textTransform": "uppercase"
-					}
-				},
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"fontSizes": {
-				"tiny": "14px"
-			},
-			"gap": {
-				"baseline": "10px"
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": "700"
-				}
-			},
-			"layout": {
-				"contentSize": "684px",
-				"wideSize": "1194px"
-			},
-			"line-height": {
-				"body": 1.6
-			}
-		},
-		"layout": {
-			"contentSize": "684px",
-			"wideSize": "1194px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Red Hat Display\", sans-serif",
-					"slug": "red-hat-display",
-					"name": "Red Hat Display",
-					"google": "family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "20px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "24px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "min(max(28px, 5vw), 36px)",
-					"slug": "large"
-				},
-				{
-					"name": "Extra Large",
-					"size": "min(max(36px, 5vw), 48px)",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"letterSpacing": "0.1em",
-					"textTransform": "uppercase"
-				}
-			},
-			"core/cover": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				},
-				"spacing": {
-					"padding": "15vh"
-				}
-			},
-			"core/image": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				}
-			},
-			"core/post-author": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				}
-			},
-			"core/post-date": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"core/post-featured-image": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "min(max(48px, 7vw), 72px)",
-					"fontWeight": "700",
-					"lineHeight": "1.2"
-				},
-				"spacing": {
-					"margin": {
-						"bottom": "1em"
-					}
-				}
-			},
-			"core/post-navigation-link": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"core/separator": {
-				"border": {
-					"width": "0 0 3px 0"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)",
-					"fontWeight": "900",
-					"letterSpacing": "0.05em",
-					"textTransform": "uppercase"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"letterSpacing": "0.05em"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "min(max(48px, 7vw), 72px)",
-					"fontWeight": "700",
-					"lineHeight": "1.2"
-				},
-				"spacing": {
-					"margin": {
-						"top": "calc( 1.1 * var(--wp--custom--gap--vertical) )",
-						"bottom": "calc( 1.1 * var(--wp--custom--gap--vertical) )"
-					}
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "min(max(36px, 5vw), 64px)",
-					"fontWeight": "900",
-					"lineHeight": "1.2"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "min(max(30px, 5vw), 48px)",
-					"fontWeight": "900",
-					"lineHeight": "1.3"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "900",
-					"letterSpacing": "0.1em",
-					"lineHeight": "1.3",
-					"textTransform": "uppercase"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"fontWeight": "900",
-					"letterSpacing": "0.1em",
-					"lineHeight": "1.3",
-					"textTransform": "uppercase"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "var(--wp--custom--font-sizes--tiny)",
-					"fontWeight": "900",
-					"letterSpacing": "0.1em",
-					"lineHeight": "1.3",
-					"textTransform": "uppercase"
-				}
-			}
-		},
-		"spacing": {
-			"blockGap": "0.5em"
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-			"fontWeight": "400"
-		}
-	}
-}

skatepark/package.json

@@ -14,9 +14,8 @@
     "postcss-cli": "^8.3.1"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js skatepark",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss --output-style expanded --indent-type tab --indent-width 1 | postcss --use autoprefixer --output assets/theme.css --map"
   },
   "author": "",

skatepark/theme.json

@@ -1,42 +1,40 @@
 {
 	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
-	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
+			"duotone": [
+                {
+                    "colors": [ "#000", "#B9FB9C" ],
+                    "slug": "default-filter",
+                    "name": "Default filter"
+                },
+                {
+                    "colors": [ "#000", "#FFF" ],
+                    "slug": "white-filter",
+                    "name": "White Filter"
+                },
+                {
+                    "colors": [ "#000", "#F3B2A9" ],
+                    "slug": "red-filter",
+                    "name": "Red Filter"
+                },
+                {
+                    "colors": [ "#000", "#C9E4ED" ],
+                    "slug": "blue-filter",
+                    "name": "Blue Filter"
+                },
+                {
+                    "colors": [ "#252B39", "#F9EED4" ],
+                    "slug": "blue-cream-filter",
+                    "name": "Blue/Cream Filter"
+                },
+                {
+                    "colors": [ "#153232", "#F7B9A9" ],
+                    "slug": "green-pink-filter",
+                    "name": "Green/Pink Filter"
+                }
+            ],
 			"palette": [
 				{
 					"slug": "primary",
@@ -48,67 +46,13 @@
 					"color": "#B9FB9C",
 					"name": "Background"
 				}
-			],
-			"duotone": [
-				{
-					"colors": [
-						"#000",
-						"#B9FB9C"
-					],
-					"slug": "default-filter",
-					"name": "Default filter"
-				},
-				{
-					"colors": [
-						"#000",
-						"#FFF"
-					],
-					"slug": "white-filter",
-					"name": "White Filter"
-				},
-				{
-					"colors": [
-						"#000",
-						"#F3B2A9"
-					],
-					"slug": "red-filter",
-					"name": "Red Filter"
-				},
-				{
-					"colors": [
-						"#000",
-						"#C9E4ED"
-					],
-					"slug": "blue-filter",
-					"name": "Blue Filter"
-				},
-				{
-					"colors": [
-						"#252B39",
-						"#F9EED4"
-					],
-					"slug": "blue-cream-filter",
-					"name": "Blue/Cream Filter"
-				},
-				{
-					"colors": [
-						"#153232",
-						"#F7B9A9"
-					],
-					"slug": "green-pink-filter",
-					"name": "Green/Pink Filter"
-				}
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--primary)",
 					"radius": "0",
-					"style": "solid",
 					"width": "3px"
 				},
 				"color": {
@@ -126,16 +70,18 @@
 				},
 				"spacing": {
 					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
 						"left": "1.75em",
 						"right": "1.75em"
 					}
 				},
 				"typography": {
 					"fontSize": "16px",
-					"fontWeight": "700",
-					"lineHeight": 2
+					"fontWeight": "700"
+				}
+			},
+			"body": {
+				"typography": {
+					"lineHeight": 1.6
 				}
 			},
 			"color": {
@@ -151,7 +97,7 @@
 					"slug": "white",
 					"colors": {
 						"primary": "#000000",
-						"background": "#FFFFFF"
+ 						"background": "#FFFFFF"
 					}
 				},
 				{
@@ -187,11 +133,7 @@
 					}
 				}
 			],
-			"fontSizes": {
-				"tiny": "14px"
-			},
 			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"border": {
 					"color": "var(--wp--custom--color--primary)",
 					"radius": "0",
@@ -200,7 +142,6 @@
 				},
 				"checkbox": {
 					"checked": {
-						"content": "\"\\2715\"",
 						"fontSize": "var(--wp--preset--font-size--normal)",
 						"position": {
 							"left": "7px",
@@ -212,9 +153,7 @@
 						}
 					},
 					"unchecked": {
-						"content": "\"\"",
 						"position": {
-							"left": "0",
 							"top": "-0.4em"
 						},
 						"sizing": {
@@ -224,9 +163,7 @@
 					}
 				},
 				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
+					"background": "transparent"
 				},
 				"label": {
 					"spacing": {
@@ -241,115 +178,26 @@
 						"textTransform": "uppercase"
 					}
 				},
+				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
+			"fontSizes": {
+				"tiny": "14px"
 			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.6
-				}
+			"gap": {
+				"baseline": "10px"
 			},
 			"heading": {
 				"typography": {
-					"fontWeight": "700",
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
+					"fontWeight": "700"
 				}
 			},
 			"layout": {
 				"contentSize": "684px",
 				"wideSize": "1194px"
 			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(30px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontStyle": "italic",
-						"fontWeight": "400"
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
-			},
 			"line-height": {
 				"body": 1.6
 			}
@@ -358,18 +206,6 @@
 			"contentSize": "684px",
 			"wideSize": "1194px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -413,9 +249,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -424,170 +257,92 @@
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)",
 					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 				}
 			},
-			"core/code": {
-				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
-					"width": "2px"
+			"core/cover": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default-filter)"
 				},
 				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
+					"padding": "15vh"
+				}
+			},
+			"core/image": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default-filter)"
+				}
+			},
+			"core/post-author": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default-filter)"
+				}
+			},
+			"core/post-date": {
 				"typography": {
-					"fontFamily": "monospace"
+					"fontWeight": "500"
 				}
 			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+			"core/post-featured-image": {
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--default-filter)"
 				}
 			},
-			"core/navigation": {
+			"core/post-terms": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"letterSpacing": "0.05em"
+					"fontWeight": "500"
 				}
 			},
 			"core/post-title": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"fontSize": "min(max(48px, 7vw), 72px)",
+					"fontWeight": "700",
+					"lineHeight": "1.2"
+				},
 				"spacing": {
 					"margin": {
 						"bottom": "1em"
 					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontSize": "min(max(48px, 7vw), 72px)",
-					"lineHeight": "1.2",
-					"fontWeight": "700"
 				}
 			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
+			"core/post-navigation-link": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "500"
 				}
 			},
 			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0"
-				},
 				"typography": {
-					"fontStyle": "italic",
 					"fontSize": "var(--wp--preset--font-size--huge)"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
-				}
-			},
-			"core/search": {
-				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
 				}
 			},
 			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
 				"border": {
-					"color": "currentColor",
-					"style": "solid",
 					"width": "0 0 3px 0"
 				}
 			},
-			"core/quote": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
-				}
-			},
 			"core/site-title": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--medium)",
 					"fontWeight": "900",
-					"textDecoration": "none",
 					"letterSpacing": "0.05em",
 					"textTransform": "uppercase"
 				}
 			},
-			"core/cover": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				},
-				"spacing": {
-					"padding": "15vh"
-				}
-			},
-			"core/image": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				}
-			},
-			"core/post-author": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				}
-			},
-			"core/post-featured-image": {
-				"filter": {
-					"duotone": "var(--wp--preset--duotone--default-filter)"
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"core/post-navigation-link": {
+			"core/navigation": {
 				"typography": {
-					"fontWeight": "500"
+					"letterSpacing": "0.05em"
 				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"fontSize": "min(max(48px, 7vw), 72px)",
 					"fontWeight": "700",
-					"lineHeight": "1.2",
-					"fontSize": "min(max(48px, 7vw), 72px)"
+					"lineHeight": "1.2"
 				},
 				"spacing": {
 					"margin": {
@@ -599,82 +354,47 @@
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"fontSize": "min(max(36px, 5vw), 64px)",
 					"fontWeight": "900",
-					"lineHeight": "1.2",
-					"fontSize": "min(max(36px, 5vw), 64px)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"lineHeight": "1.2"
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
+					"fontSize": "min(max(30px, 5vw), 48px)",
 					"fontWeight": "900",
-					"lineHeight": "1.3",
-					"fontSize": "min(max(30px, 5vw), 48px)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"lineHeight": "1.3"
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontWeight": "900",
-					"lineHeight": "1.3",
 					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "900",
 					"letterSpacing": "0.1em",
+					"lineHeight": "1.3",
 					"textTransform": "uppercase"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontWeight": "900",
-					"lineHeight": "1.3",
 					"fontSize": "var(--wp--preset--font-size--small)",
+					"fontWeight": "900",
 					"letterSpacing": "0.1em",
+					"lineHeight": "1.3",
 					"textTransform": "uppercase"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-					"fontWeight": "900",
-					"lineHeight": "1.3",
 					"fontSize": "var(--wp--custom--font-sizes--tiny)",
+					"fontWeight": "900",
 					"letterSpacing": "0.1em",
+					"lineHeight": "1.3",
 					"textTransform": "uppercase"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
 				}
 			}
 		},
@@ -682,10 +402,8 @@
 			"blockGap": "0.5em"
 		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		}
 	}
-}
+}

videomaker/child-theme.json

@@ -1,274 +0,0 @@
-{
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "foreground",
-					"color": "#FFFFFF",
-					"name": "Foreground"
-				},
-				{
-					"slug": "background",
-					"color": "#000000",
-					"name": "Background"
-				},
-				{
-					"slug": "primary",
-					"color": "#FFFFFF",
-					"name": "Primary"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#282828",
-					"name": "Tertiary"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
-					"width": "1.5px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--foreground)"
-					}
-				},
-				"typography": {
-					"fontWeight": 700
-				}
-			},
-			"color": {
-				"foreground": "var(--wp--preset--color--foreground)",
-				"background": "var(--wp--preset--color--background)",
-				"primary": "var(--wp--preset--color--foreground)",
-				"secondary": "var(--wp--preset--color--foreground)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "Blue/Yellow",
-					"slug": "blue/yellow",
-					"colors": {
-						"foreground": "#FFFFFF",
-						"background": "#0C1525",
-						"primary": "#FFEBD9",
-						"tertiary": "#1D283D"
-					}
-				},
-				{
-					"label": "Olive Green/Light Pink",
-					"slug": "olive-green/light-pink",
-					"colors": {
-						"foreground": "#FFFFFF",
-						"background": "#283226",
-						"primary": "#FFF1EE",
-						"tertiary": "#3B453A"
-					}
-				},
-				{
-					"label": "Grey/Mint Green",
-					"slug": "grey/mint-green",
-					"colors": {
-						"foreground": "#FFFFFF",
-						"background": "#3D3D3D",
-						"primary": "#E7FFDE",
-						"tertiary": "#4F4F4F"
-					}
-				},
-				{
-					"label": "Light Grey/Bordeaux",
-					"slug": "light-grey/bordeaux",
-					"colors": {
-						"foreground": "#000000",
-						"background": "#E3E4E8",
-						"primary": "#4E1509",
-						"tertiary": "#FAFAFA"
-					}
-				}
-			],
-			"fontSizes": {
-				"tiny": "16px"
-			},
-			"gap": {
-				"baseline": "10px"
-			}
-		},
-		"layout": {
-			"contentSize": "800px",
-			"wideSize": "1300px"
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Inter\", serif",
-					"slug": "inter",
-					"name": "Inter",
-					"google": "family=Inter:wght@100..900"
-				},
-				{
-					"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "25px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "45px",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "60px",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-date": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontFamily": "var(--wp--preset--font-family--inter)"
-				}
-			},
-			"core/site-tagline": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"textTransform": "uppercase"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--style--block-gap)",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--style--block-gap)",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--style--block-gap)",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--style--block-gap)",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--style--block-gap)",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--style--block-gap)",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--inter)"
-		}
-	}
-}

videomaker/package.json

@@ -11,9 +11,8 @@
     "node-sass-package-importer": "^5.3.2"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js videomaker",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss assets/theme.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
   },
   "author": "",

videomaker/theme.json

@@ -1,41 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/theme-v1.json",
 	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
-	"customTemplates": [
-		{
-			"name": "blank",
-			"title": "Blank",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		},
-		{
-			"name": "header-footer-only",
-			"title": "Header and Footer Only",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -61,14 +27,10 @@
 			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
 					"radius": "0",
-					"style": "solid",
 					"width": "1.5px"
 				},
 				"color": {
@@ -84,18 +46,8 @@
 						"color": "var(--wp--custom--color--foreground)"
 					}
 				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700,
-					"lineHeight": 2
+					"fontWeight": 700
 				}
 			},
 			"color": {
@@ -150,185 +102,15 @@
 			"fontSizes": {
 				"tiny": "16px"
 			},
-			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--gap--horizontal) )",
-				"border": {
-					"color": "#EFEFEF",
-					"radius": "0",
-					"style": "solid",
-					"width": "2px"
-				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.6
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": 400,
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
-				}
-			},
-			"layout": {
-				"contentSize": "620px"
-			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
-			},
 			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(30px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontStyle": "italic",
-						"fontWeight": "400"
-					}
-				},
-				"typography": {
-					"textAlign": "left"
-				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
+				"baseline": "10px"
 			}
 		},
 		"layout": {
 			"contentSize": "800px",
 			"wideSize": "1300px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
 			"fontFamilies": [
 				{
 					"fontFamily": "\"Inter\", serif",
@@ -374,158 +156,48 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontFamily": "var(--wp--preset--font-family--inter)"
 				}
 			},
-			"core/code": {
-				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
-					"width": "2px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "0"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
+			"core/navigation-link": {
+				"color": {
+					"background": "transparent",
+					"text": "var(--wp--custom--color--foreground)"
 				}
 			},
 			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0"
-				},
+			"core/post-terms": {
 				"typography": {
-					"fontStyle": "italic",
-					"fontSize": "var(--wp--preset--font-size--large)"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--horizontal)",
-						"bottom": "var(--wp--custom--gap--horizontal)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/search": {
+			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"fontFamily": "var(--wp--preset--font-family--inter)"
 				}
 			},
-			"core/quote": {
-				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)"
-					}
-				},
+			"core/site-tagline": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/site-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"textDecoration": "none",
 					"textTransform": "uppercase"
 				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/site-tagline": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600,
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "48px"
+					"fontWeight": 600
 				},
 				"spacing": {
 					"margin": {
@@ -537,9 +209,7 @@
 			"h2": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600,
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "32px"
+					"fontWeight": 600
 				},
 				"spacing": {
 					"margin": {
@@ -551,9 +221,7 @@
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600,
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontWeight": 600
 				},
 				"spacing": {
 					"margin": {
@@ -565,9 +233,7 @@
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600,
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontWeight": 600
 				},
 				"spacing": {
 					"margin": {
@@ -579,9 +245,7 @@
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600,
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--normal)"
+					"fontWeight": 600
 				},
 				"spacing": {
 					"margin": {
@@ -593,9 +257,7 @@
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--inter)",
-					"fontWeight": 600,
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontWeight": 600
 				},
 				"spacing": {
 					"margin": {
@@ -603,20 +265,10 @@
 						"bottom": "var(--wp--style--block-gap)"
 					}
 				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--primary)"
-				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--preset--font-family--inter)",
-			"fontSize": "var(--wp--preset--font-size--normal)"
+			"fontFamily": "var(--wp--preset--font-family--inter)"
 		}
 	}
-}
+}

zoologist/child-theme.json

@@ -1,363 +0,0 @@
-{
-	"customTemplates": [
-		{
-			"name": "page-without-title",
-			"title": "Page without title",
-			"postTypes": [
-				"page",
-				"post"
-			]
-		}
-	],
-	"settings": {
-		"color": {
-			"gradients": [],
-			"palette": [
-				{
-					"slug": "primary",
-					"color": "#333333",
-					"name": "Primary"
-				},
-				{
-					"slug": "secondary",
-					"color": "#000000",
-					"name": "Secondary"
-				},
-				{
-					"slug": "background",
-					"color": "#ffffff",
-					"name": "Background"
-				},
-				{
-					"slug": "tertiary",
-					"color": "#f1f1f1",
-					"name": "Tertiary"
-				}
-			]
-		},
-		"custom": {
-			"button": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
-					"width": "3px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--background)"
-				},
-				"hover": {
-					"color": {
-						"text": "var(--wp--custom--color--foreground)",
-						"background": "var(--wp--custom--color--background)"
-					},
-					"border": {
-						"color": "var(--wp--custom--color--foreground)"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700"
-				}
-			},
-			"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)",
-				"tertiary": "var(--wp--preset--color--tertiary)"
-			},
-			"colorPalettes": [
-				{
-					"label": "White",
-					"slug": "white",
-					"colors": {
-						"primary": "#000000",
-						"secondary": "#000000",
-						"tertiary": "#f1f1f1",
-						"background": "#ffffff"
-					}
-				},
-				{
-					"label": "Black",
-					"slug": "black",
-					"colors": {
-						"primary": "#ffffff",
-						"secondary": "#ffffff",
-						"tertiary": "#313131",
-						"background": "#000000"
-					}
-				}
-			],
-			"form": {
-				"border": {
-					"color": "var(--wp--custom--color--foreground)",
-					"style": "solid",
-					"width": "2px"
-				},
-				"padding": "20px"
-			},
-			"fontSizes": {
-				"tiny": "16px"
-			},
-			"body": {
-				"typography": {
-					"lineHeight": 1.7
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": "500"
-				}
-			},
-			"layout": {
-				"contentSize":"664px"
-			},
-			"line-height": {
-				"body": 1.7
-			},
-			"gap": {
-				"baseline": "10px",
-				"horizontal": "min(30px, 5vw)",
-				"vertical": "min(30px, 5vw)"
-			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": 400
-					}
-				}
-			},
-			"quote": {
-				"citation": {
-					"typography": {
-						"fontStyle": "normal",
-						"fontWeight": "400"
-					}
-				}
-			}
-		},
-		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1128px"
-		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontFamilies": [
-				{
-					"fontFamily": "\"DM Sans\", sans-serif",
-					"slug": "dm-sans",
-					"name": "DM Sans",
-					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-				}
-			],
-			"fontSizes": [
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Medium",
-					"size": "22px",
-					"slug": "medium"
-				},
-				{
-					"name": "Large",
-					"size": "min(max(28px, 5vw), 38px)",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "min(max(36px, 5vw), 48px)",
-					"slug": "huge"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--button--color--background)",
-					"text": "var(--wp--custom--button--color--text)"
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
-				}
-			},
-			"core/code": {
-				"border": {
-					"width": "0px"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "400",
-					"lineHeight": "1.6"
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"core/post-title": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
-				},
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 64px)",
-					"fontWeight": "700",
-					"lineHeight": 1.2
-				}
-			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-				}
-			},
-			"core/quote": {
-				"border": {
-					"width": "0px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"typography": {
-					"fontSize": "25px",
-					"fontWeight": "normal",
-					"lineHeight": "40px"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "500",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				},
-				"border": {
-					"width": "1px 0 0 0"
-				}
-			},
-			"core/post-template": {
-				"elements": {
-					"h2": {
-						"typography": {
-							"fontSize": "var(--wp--preset--font-size--large)"
-						}
-					}
-				}
-			},
-			"core/query-pagination": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "500"
-				}
-			},
-			"core/site-title": {
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700,
-					"textTransform": "uppercase"
-				}
-			}
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(48px, 7vw), 80px)",
-					"lineHeight": 1.2
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(36px, 6vw), 65px)",
-					"lineHeight": 1.2
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"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)",
-					"lineHeight": 1.4
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": 1.4
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": 1.4
-				}
-			},
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontWeight": "400"
-		}
-	}
-}

zoologist/package.json

@@ -11,9 +11,8 @@
     "node-sass-package-importer": "^5.3.2"
   },
   "scripts": {
-    "start": "chokidar \"**/*.scss\" child-theme.json ../blockbase/theme.json -c \"npm run build\" --initial",
-    "build": "npm run build:theme && npm run build:scss",
-    "build:theme": "node ../blockbase/build.js zoologist",
+		"start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
+		"build": "npm run build:scss",
     "build:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js sass/theme.scss assets/theme.css --output-style expanded --indent-type tab --indent-width 1 --source-map true"
   },
   "author": "",

zoologist/theme.json

@@ -1,16 +1,4 @@
 {
-	"$schema": "https://json.schemastore.org/theme-v1.json",
-	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
 	"customTemplates": [
 		{
 			"name": "blank",
@@ -38,12 +26,6 @@
 		}
 	],
 	"settings": {
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		},
 		"color": {
 			"palette": [
 				{
@@ -66,18 +48,13 @@
 					"color": "#f1f1f1",
 					"name": "Tertiary"
 				}
-			],
-			"gradients": []
+			]
 		},
 		"custom": {
-			"alignment": {
-				"alignedMaxWidth": "50%"
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
 					"radius": "0",
-					"style": "solid",
 					"width": "3px"
 				},
 				"color": {
@@ -93,18 +70,9 @@
 						"color": "var(--wp--custom--color--foreground)"
 					}
 				},
-				"spacing": {
-					"padding": {
-						"top": "0.667em",
-						"bottom": "0.667em",
-						"left": "1.333em",
-						"right": "1.333em"
-					}
-				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": "700",
-					"lineHeight": 2
+					"fontWeight": "700"
 				}
 			},
 			"color": {
@@ -136,68 +104,16 @@
 					}
 				}
 			],
-			"fontSizes": {
-				"tiny": "16px"
-			},
 			"form": {
-				"padding": "20px",
 				"border": {
 					"color": "var(--wp--custom--color--foreground)",
-					"radius": "0",
 					"style": "solid",
 					"width": "2px"
 				},
-				"checkbox": {
-					"checked": {
-						"content": "\"\\2715\"",
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"position": {
-							"left": "3px",
-							"top": "3px"
-						},
-						"sizing": {
-							"height": "12px",
-							"width": "12px"
-						}
-					},
-					"unchecked": {
-						"content": "\"\"",
-						"position": {
-							"left": "0",
-							"top": "0.2em"
-						},
-						"sizing": {
-							"height": "16px",
-							"width": "16px"
-						}
-					}
-				},
-				"color": {
-					"background": "transparent",
-					"boxShadow": "none",
-					"text": "inherit"
-				},
-				"label": {
-					"spacing": {
-						"margin": {
-							"bottom": "var(--wp--custom--gap--baseline)"
-						}
-					},
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontWeight": "normal",
-						"letterSpacing": "normal",
-						"textTransform": "none"
-					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)"
-				}
+				"padding": "20px"
 			},
-			"gallery": {
-				"caption": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
+			"fontSizes": {
+				"tiny": "16px"
 			},
 			"body": {
 				"typography": {
@@ -206,26 +122,14 @@
 			},
 			"heading": {
 				"typography": {
-					"fontWeight": "500",
-					"lineHeight": 1.125
-				}
-			},
-			"latest-posts": {
-				"meta": {
-					"color": {
-						"text": "var(--wp--custom--color--primary)"
-					}
+					"fontWeight": "500"
 				}
 			},
 			"layout": {
-				"contentSize": "664px"
+				"contentSize":"664px"
 			},
-			"list": {
-				"spacing": {
-					"padding": {
-						"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
-					}
-				}
+			"line-height": {
+				"body": 1.7
 			},
 			"gap": {
 				"baseline": "10px",
@@ -241,84 +145,27 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
-				}
-			},
-			"post-comment": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
-				}
-			},
 			"pullquote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
-						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontWeight": 400
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--gap--vertical)"
-						}
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
 			},
 			"quote": {
 				"citation": {
 					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)",
 						"fontStyle": "normal",
 						"fontWeight": "400"
 					}
-				},
-				"typography": {
-					"textAlign": "left"
 				}
-			},
-			"separator": {
-				"opacity": 1,
-				"width": "150px"
-			},
-			"table": {
-				"figcaption": {
-					"typography": {
-						"fontSize": "var(--wp--custom--font-sizes--tiny)"
-					}
-				}
-			},
-			"video": {
-				"caption": {
-					"textAlign": "center",
-					"margin": "var(--wp--custom--gap--vertical) auto"
-				}
-			},
-			"line-height": {
-				"body": 1.7
 			}
 		},
 		"layout": {
 			"contentSize": "664px",
 			"wideSize": "1128px"
 		},
-		"spacing": {
-			"blockGap": true,
-			"customPadding": true,
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -362,9 +209,6 @@
 	"styles": {
 		"blocks": {
 			"core/button": {
-				"border": {
-					"radius": "var(--wp--custom--button--border--radius)"
-				},
 				"color": {
 					"background": "var(--wp--custom--button--color--background)",
 					"text": "var(--wp--custom--button--color--text)"
@@ -372,40 +216,20 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
 				}
 			},
 			"core/code": {
 				"border": {
-					"color": "#CCCCCC",
-					"radius": "0px",
-					"style": "solid",
 					"width": "0px"
 				},
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--gap--horizontal)",
-						"right": "var(--wp--custom--gap--horizontal)",
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+				"color": {
+					"background": "var(--wp--custom--color--tertiary)"
 				},
 				"typography": {
-					"fontFamily": "monospace",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--tertiary)"
-				}
-			},
-			"core/gallery": {
-				"spacing": {
-					"margin": {
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
 				}
 			},
 			"core/navigation": {
@@ -413,6 +237,12 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
+			"core/navigation-link": {
+				"color": {
+					"background": "transparent",
+					"text": "var(--wp--custom--color--foreground)"
+				}
+			},
 			"core/post-title": {
 				"spacing": {
 					"margin": {
@@ -422,59 +252,17 @@
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(48px, 7vw), 64px)",
-					"lineHeight": 1.2,
-					"fontWeight": "700"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"link": "var(--wp--custom--color--foreground)",
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/pullquote": {
-				"border": {
-					"style": "solid",
-					"width": "1px 0 0 0"
-				},
-				"typography": {
-					"fontStyle": "normal",
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "500",
-					"lineHeight": "1.4"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )",
-						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )"
-					}
-				}
-			},
-			"core/search": {
-				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--body--typography--line-height)"
+					"fontWeight": "700",
+					"lineHeight": 1.2
 				}
 			},
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				},
-				"border": {
-					"color": "currentColor",
-					"style": "solid",
-					"width": "0 0 1px 0"
+			"list": {
+				"padding": {
+					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
 				}
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--custom--color--primary)",
-					"style": "solid",
 					"width": "0px"
 				},
 				"spacing": {
@@ -484,31 +272,27 @@
 				},
 				"typography": {
 					"fontSize": "25px",
-					"fontStyle": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "40px"
 				}
 			},
-			"core/site-title": {
+			"core/pullquote": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700,
-					"textDecoration": "none",
-					"textTransform": "uppercase"
+					"fontStyle": "normal",
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontWeight": "500",
+					"lineHeight": "1.4"
 				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/navigation-link": {
-				"color": {
-					"background": "transparent",
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--gap--horizontal) )"
+				"spacing": {
+					"padding": {
+						"bottom": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"left": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"right": "calc( var(--wp--custom--gap--horizontal) * 3 )",
+						"top": "calc( var(--wp--custom--gap--horizontal) * 3 )"
+					}
+				},
+				"border": {
+					"width": "1px 0 0 0"
 				}
 			},
 			"core/post-template": {
@@ -525,95 +309,59 @@
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "500"
 				}
+			},
+			"core/site-title": {
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": 700,
+					"textTransform": "uppercase"
+				}
 			}
 		},
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
 		"elements": {
 			"h1": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
-					"lineHeight": 1.2,
-					"fontSize": "min(max(48px, 7vw), 80px)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "min(max(48px, 7vw), 80px)",
+					"lineHeight": 1.2
 				}
 			},
 			"h2": {
 				"typography": {
 					"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)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "min(max(36px, 6vw), 65px)",
+					"lineHeight": 1.2
 				}
 			},
 			"h3": {
 				"typography": {
 					"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--large)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": 1.2
 				}
 			},
 			"h4": {
 				"typography": {
 					"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)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": 1.4
 				}
 			},
 			"h5": {
 				"typography": {
 					"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--normal)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"lineHeight": 1.4
 				}
 			},
 			"h6": {
 				"typography": {
 					"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--small)"
-				},
-				"spacing": {
-					"margin": {
-						"top": "var(--wp--custom--gap--vertical)",
-						"bottom": "var(--wp--custom--gap--vertical)"
-					}
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": 1.4
 				}
 			},
 			"link": {
@@ -622,14 +370,9 @@
 				}
 			}
 		},
-		"spacing": {
-			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
-		},
 		"typography": {
-			"lineHeight": "var(--wp--custom--body--typography--line-height)",
 			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		}
 	}
-}
+}