Browse Source

Merge pull request #3781 from Automattic/reorder-theme-json

BCB + Children: reorder theme json
Maggie 4 năm trước cách đây
mục cha
commit
aba4be63bd

+ 240 - 240
blank-canvas-blocks/experimental-theme.json

@@ -15,6 +15,12 @@
 		}
 	],
 	"settings": {
+		"border": {
+			"customColor": true,
+			"customRadius": true,
+			"customStyle": true,
+			"customWidth": true
+		},
 		"color": {
 			"gradients": [],
 			"palette": [
@@ -45,112 +51,55 @@
 				}
 			]
 		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "14px",
-					"slug": "tiny"
-				},
-				{
-					"name": "Small",
-					"size": "16px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Large",
-					"size": "24px",
-					"slug": "large"
-				},
-				{
-					"name": "Huge",
-					"size": "28px",
-					"slug": "huge"
-				}
-			],
-			"fontFamilies": [
-				{
-					"fontFamily": "var(--font-base, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif)",
-					"slug": "base",
-					"name": "Base"
-				},
-				{
-					"fontFamily": "var(--font-headings, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif)",
-					"slug": "headings",
-					"name": "Headings"
-				}
-			]
-		},
-		"spacing": {
-			"customPadding": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
-		"layout": {
-			"contentSize": "620px",
-			"wideSize": "1000px"
-		},
 		"custom": {
-			"color": {
-				"primary": "var(--wp--preset--color--black)",
-				"secondary": "var(--wp--preset--color--blue)",
-				"tertiary": "var(--wp--preset--color--almost-white)",
-				"foreground": "var(--wp--preset--color--almost-black)",
-				"background": "var(--wp--preset--color--white)",
-				"selection": "var(--wp--preset--color--almost-white)"
-			},
-			"margin": {
-				"baseline": "10px",
-				"horizontal": "30px",
-				"vertical": "30px"
-			},
 			"alignment": {
 				"alignedMaxWidth": "50%"
 			},
 			"button": {
-				"typography": {
-					"fontWeight": "normal",
-					"fontFamily": "var(--wp--preset--font-family--base)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": 2
-				},
 				"border": {
+					"color": "var(--wp--custom--button--color--text)",
 					"radius": "4px",
-					"width": "0",
 					"style": "solid",
-					"color": "var(--wp--custom--button--color--text)"
+					"width": "0"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--background)",
 					"background": "var(--wp--custom--color--secondary)",
 					"hoverText": "var(--wp--custom--color--background)",
-					"hoverBackground": "#006ba1"
+					"hoverBackground": "#006ba1",
+					"text": "var(--wp--custom--color--background)"
+				},
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--base)",
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "normal",
+					"lineHeight": 2
+				}
+			},
+			"code": {
+				"typography": {
+					"fontFamily": "monospace"
 				}
 			},
+			"color": {
+				"primary": "var(--wp--preset--color--black)",
+				"secondary": "var(--wp--preset--color--blue)",
+				"tertiary": "var(--wp--preset--color--almost-white)",
+				"foreground": "var(--wp--preset--color--almost-black)",
+				"background": "var(--wp--preset--color--white)",
+				"selection": "var(--wp--preset--color--almost-white)"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--margin--horizontal) )",
 				"border": {
-					"radius": "0",
 					"color": "#EFEFEF",
-					"width": "2px",
-					"style": "solid"
+					"radius": "0",
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--foreground)",
 					"background": "transparent",
-					"boxShadow": "none"
+					"boxShadow": "none",
+					"text": "var(--wp--custom--color--foreground)"
 				},
 				"label": {
 					"typography": {
@@ -161,71 +110,11 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontFamily": "var(--wp--preset--font-family--base)",
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-content": {
-				"padding": {
-					"left": "var(--wp--custom--margin--horizontal)",
-					"right": "var(--wp--custom--margin--horizontal)"
-				}
-			},
 			"gallery": {
 				"caption": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"code": {
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"quote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontStyle": "italic"
-					}
-				}
-			},
-			"pullquote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--margin--vertical)"
-						}
-					}
-				}
-			},
-			"separator": {
-				"margin": "var(--wp--custom--margin--vertical) auto",
-				"opacity": 1,
-				"width": "150px"
-			},
-			"video": {
-				"caption": {
-					"margin": "var(--wp--custom--margin--vertical) auto",
-					"textAlign": "center"
-				}
-			},
 			"heading": {
 				"typography": {
 					"fontWeight": 400,
@@ -238,14 +127,19 @@
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
 			},
+			"margin": {
+				"baseline": "10px",
+				"horizontal": "30px",
+				"vertical": "30px"
+			},
 			"navigation": {
 				"mobile": {
 					"menu": {
-						"openLabel": "☰",
-						"closeLabel": "╳",
 						"color": {
 							"text": "var(--wp--custom--color--foreground)"
 						},
+						"closeLabel": "╳",
+						"openLabel": "☰",
 						"typography": {
 							"fontWeight": 500,
 							"fontSize": "24px",
@@ -253,32 +147,86 @@
 						}
 					},
 					"padding": "10px",
-					"verticalAlignment": "center",
-					"horizontalAlignment": "center",
 					"typography": {
 						"fontWeight": 200,
 						"fontSize": "20px",
 						"fontFamily": "var(--wp--custom--font-family--base)"
-					}
+					},
+					"horizontalAlignment": "center",
+					"verticalAlignment": "center"
 				},
 				"padding": "10px",
 				"submenu": {
-					"padding": "8px",
-					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)",
-					"border": {
-						"radius": "0",
-						"color": "0",
-						"width": "1px",
-						"style": "none"
-					},
 					"color": {
 						"text": "var(--wp--custom--color--foreground)",
 						"background": "var(--wp--custom--color--background)",
 						"hoverText": "var(--wp--custom--color--secondary)",
 						"hoverBackground": "var(--wp--custom--color--background)"
+					},
+					"border": {
+						"color": "0",
+						"radius": "0",
+						"style": "none",
+						"width": "1px"
+					},
+					"padding": "8px",
+					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)"
+				}
+			},
+			"paragraph": {
+				"dropcap": {
+					"margin": ".1em .1em 0 0",
+					"typography": {
+						"fontFamily": "var(--wp--preset--font-family--base)",
+						"fontSize": "110px",
+						"fontWeight": "400"
 					}
 				}
 			},
+			"post-author": {
+				"typography": {
+					"fontWeight": "normal"
+				}
+			},
+			"post-content": {
+				"padding": {
+					"left": "var(--wp--custom--margin--horizontal)",
+					"right": "var(--wp--custom--margin--horizontal)"
+				}
+			},
+			"pullquote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontFamily": "inherit",
+						"fontStyle": "italic"
+					},
+					"spacing": {
+						"margin": {
+							"top": "var(--wp--custom--margin--vertical)"
+						}
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"quote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontStyle": "italic"
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"separator": {
+				"opacity": 1,
+				"margin": "var(--wp--custom--margin--vertical) auto",
+				"width": "150px"
+			},
 			"table": {
 				"figcaption": {
 					"typography": {
@@ -286,80 +234,89 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
+			"video": {
+				"caption": {
+					"textAlign": "center",
+					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
 			}
 		},
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		}
-	},
-	"styles": {
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
+		"layout": {
+			"contentSize": "620px",
+			"wideSize": "1000px"
 		},
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)",
-			"lineHeight": 1.6,
-			"fontFamily": "var(--wp--preset--font-family--base)"
+		"spacing": {
+			"customPadding": true,
+			"units": [
+				"px",
+				"em",
+				"rem",
+				"vh",
+				"vw"
+			]
 		},
-		"blocks": {
-			"core/post-content": {
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--post-content--padding--left)",
-						"right": "var(--wp--custom--post-content--padding--right)"
-					}
+		"typography": {
+			"customFontSize": true,
+			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "var(--font-base, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif)",
+					"slug": "base",
+					"name": "Base"
+				},
+				{
+					"fontFamily": "var(--font-headings, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif)",
+					"slug": "headings",
+					"name": "Headings"
 				}
-			},
-			"core/button": {
-				"color": {
-					"text": "var(--wp--custom--button--color--text)",
-					"background": "var(--wp--custom--button--color--background)"
+			],
+			"fontSizes": [
+				{
+					"name": "Tiny",
+					"size": "14px",
+					"slug": "tiny"
 				},
-				"typography": {
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+				{
+					"name": "Small",
+					"size": "16px",
+					"slug": "small"
+				},
+				{
+					"name": "Normal",
+					"size": "18px",
+					"slug": "normal"
 				},
+				{
+					"name": "Large",
+					"size": "24px",
+					"slug": "large"
+				},
+				{
+					"name": "Huge",
+					"size": "28px",
+					"slug": "huge"
+				}
+			]
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/button": {
 				"border": {
+					"color": "var(--wp--custom--button--border--color)",
 					"radius": "var(--wp--custom--button--border--radius)",
 					"style": "var(--wp--custom--button--border--style)",
-					"width": "var(--wp--custom--button--border--width)",
-					"color": "var(--wp--custom--button--border--color)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
-			"core/post-date": {
+					"width": "var(--wp--custom--button--border--width)"
+				},
 				"color": {
-					"text": "var(--wp--custom--color--foreground)",
-					"link": "var(--wp--custom--color--foreground)"
+					"background": "var(--wp--custom--button--color--background)",
+					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "60px",
-					"fontWeight": 700
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"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": {
@@ -372,37 +329,56 @@
 					}
 				},
 				"border": {
-					"radius": "0px",
 					"color": "#CCCCCC",
+					"radius": "0px",
 					"style": "solid",
 					"width": "2px"
 				}
 			},
-			"core/quote": {
+			"core/heading": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
-				},
-				"border": {
-					"color": "var(--wp--custom--color--secondary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
+					"fontFamily": "var(--wp--preset--font-family--headings)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
+				}
+			},
+			"core/navigation": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
+				}
+			},
+			"core/post-content": {
 				"spacing": {
 					"padding": {
-						"left": "var(--wp--custom--margin--horizontal)"
+						"left": "var(--wp--custom--post-content--padding--left)",
+						"right": "var(--wp--custom--post-content--padding--right)"
 					}
 				}
 			},
-			"core/pullquote": {
+			"core/post-title": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontStyle": "italic"
+					"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--margin--horizontal)",
@@ -422,20 +398,34 @@
 					"width": "0 0 1px 0"
 				}
 			},
-			"core/heading": {
+			"core/site-title": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--headings)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
+					"fontSize": "60px",
+					"fontWeight": 700
+				}
+			},
+			"core/quote": {
+				"border": {
+					"color": "var(--wp--custom--color--secondary)",
+					"style": "solid",
+					"width": "0 0 0 1px"
+				},
+				"spacing": {
+					"padding": {
+						"left": "var(--wp--custom--margin--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": {
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--secondary)"
-				}
-			},
 			"h1": {
 				"typography": {
 					"fontSize": "48px"
@@ -465,7 +455,17 @@
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
+			},
+			"link": {
+				"color": {
+					"text": "var(--wp--custom--color--secondary)"
+				}
 			}
+		},
+		"typography": {
+			"lineHeight": 1.6,
+			"fontFamily": "var(--wp--preset--font-family--base)",
+			"fontSize": "var(--wp--preset--font-size--normal)"
 		}
 	}
 }

+ 91 - 91
mayland-blocks/child-experimental-theme.json

@@ -48,31 +48,51 @@
 				}
 			]
 		},
+		"custom": {
+			"button": {
+				"color": {
+					"hoverBackground": "var(--wp--custom--color--tertiary)"
+				}
+			},
+			"color": {
+				"primary": "var(--wp--preset--color--black)",
+				"secondary": "var(--wp--preset--color--almost-black)",
+				"tertiary": "var(--wp--preset--color--gray)",
+				"foreground": "var(--wp--preset--color--black)",
+				"background": "var(--wp--preset--color--white)",
+				"selection": "lightblue"
+			},
+			"fontsToLoadFromGoogle": [
+				"family=Poppins:ital,wght@0,400;0,600;1,400"
+			],
+			"heading": {
+				"typography": {
+					"fontWeight": 600
+				}
+			},
+			"line-height": {
+				"body": 1.6,
+				"headings": 1.125
+			},
+			"margin": {
+				"horizontal": "32px"
+			},
+			"width": {
+				"default": "750px",
+				"wide": "1022px"
+			}
+		},
+		"layout": {
+			"contentSize": "782px",
+			"wideSize": "1000px"
+		},
+		"spacing": {
+			"customPadding": true,
+			"units": [ "px", "em", "rem", "vh", "vw" ]
+		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
-			"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"
-				}
-			],
 			"fontFamilies": [
 				{
 					"fontFamily": "\"Poppins\", sans-serif",
@@ -100,105 +120,75 @@
 					"fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif",
 					"slug": "hoefler-times-new-roman"
 				}
-			]
-		},
-		"spacing": {
-			"customPadding": true,
-			"units": [ "px", "em", "rem", "vh", "vw" ]
-		},
-		"layout": {
-			"contentSize": "782px",
-			"wideSize": "1000px"
-		},
-		"custom": {
-			"fontsToLoadFromGoogle": [
-				"family=Poppins:ital,wght@0,400;0,600;1,400"
 			],
-			"color": {
-				"primary": "var(--wp--preset--color--black)",
-				"secondary": "var(--wp--preset--color--almost-black)",
-				"tertiary": "var(--wp--preset--color--gray)",
-				"foreground": "var(--wp--preset--color--black)",
-				"background": "var(--wp--preset--color--white)",
-				"selection": "lightblue"
-			},
-			"line-height": {
-				"body": 1.6,
-				"headings": 1.125
-			},
-			"heading": {
-				"typography": {
-					"fontWeight": 600
-				}
-			},
-			"margin": {
-				"horizontal": "32px"
-			},
-			"width": {
-				"default": "750px",
-				"wide": "1022px"
-			},
-			"button": {
-				"color": {
-					"hoverBackground": "var(--wp--custom--color--tertiary)"
+			"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": {
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
-		},
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)",
-			"lineHeight": "var(--wp--custom--line-height--body)",
-			"fontFamily": "var(--wp--preset--font-family--base)"
-		},
 		"blocks": {
+			"core/button": {
+				"color": {
+					"background": "var(--wp--custom--color--primary)"
+				}
+			},
 			"core/heading": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--base)",
 					"lineHeight": "var(--wp--custom--line-height--headings)"
 				}
 			},
-			"core/post-title": {
+			"core/navigation": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--line-height--headings)"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/post-date": {
 				"color": {
-					"text": "var(--wp--custom--color--foreground-light)",
-					"link": "var(--wp--custom--color--foreground-light)"
+					"link": "var(--wp--custom--color--foreground-light)",
+					"text": "var(--wp--custom--color--foreground-light)"
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/site-title": {
+			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontSize": "var(--wp--preset--font-size--huge)",
+					"lineHeight": "var(--wp--custom--line-height--headings)"
 				}
 			},
-			"core/navigation": {
+			"core/site-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/button": {
-				"color": {
-					"background": "var(--wp--custom--color--primary)"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			}
 		},
+		"color": {
+			"background": "var(--wp--custom--color--background)",
+			"text": "var(--wp--custom--color--foreground)"
+		},
 		"elements": {
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
 			"h1": {
 				"typography": {
 					"fontSize": "41.47px"
@@ -228,7 +218,17 @@
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
+			},
+			"link": {
+				"color": {
+					"text": "var(--wp--custom--color--foreground)"
+				}
 			}
+		},
+		"typography": {
+			"fontFamily": "var(--wp--preset--font-family--base)",
+			"fontSize": "var(--wp--preset--font-size--normal)",
+			"lineHeight": "var(--wp--custom--line-height--body)"
 		}
 	}
 }

+ 251 - 251
mayland-blocks/experimental-theme.json

@@ -19,6 +19,12 @@
 		}
 	],
 	"settings": {
+		"border": {
+			"customColor": true,
+			"customRadius": true,
+			"customStyle": true,
+			"customWidth": true
+		},
 		"color": {
 			"gradients": [],
 			"palette": [
@@ -49,123 +55,55 @@
 				}
 			]
 		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"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"
-				}
-			],
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Poppins\", sans-serif",
-					"slug": "base",
-					"name": "Poppins"
-				},
-				{
-					"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"
-				}
-			]
-		},
-		"spacing": {
-			"customPadding": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
-		"layout": {
-			"contentSize": "782px",
-			"wideSize": "1000px"
-		},
 		"custom": {
-			"color": {
-				"primary": "var(--wp--preset--color--black)",
-				"secondary": "var(--wp--preset--color--almost-black)",
-				"tertiary": "var(--wp--preset--color--gray)",
-				"foreground": "var(--wp--preset--color--black)",
-				"background": "var(--wp--preset--color--white)",
-				"selection": "lightblue"
-			},
-			"margin": {
-				"baseline": "10px",
-				"horizontal": "32px",
-				"vertical": "30px"
-			},
 			"alignment": {
 				"alignedMaxWidth": "50%"
 			},
 			"button": {
-				"typography": {
-					"fontWeight": "normal",
-					"fontFamily": "var(--wp--preset--font-family--base)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": 2
-				},
 				"border": {
+					"color": "var(--wp--custom--button--color--text)",
 					"radius": "4px",
-					"width": "0",
 					"style": "solid",
-					"color": "var(--wp--custom--button--color--text)"
+					"width": "0"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--background)",
 					"background": "var(--wp--custom--color--secondary)",
 					"hoverText": "var(--wp--custom--color--background)",
-					"hoverBackground": "var(--wp--custom--color--tertiary)"
+					"hoverBackground": "var(--wp--custom--color--tertiary)",
+					"text": "var(--wp--custom--color--background)"
+				},
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--base)",
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "normal",
+					"lineHeight": 2
+				}
+			},
+			"code": {
+				"typography": {
+					"fontFamily": "monospace"
 				}
 			},
+			"color": {
+				"primary": "var(--wp--preset--color--black)",
+				"secondary": "var(--wp--preset--color--almost-black)",
+				"tertiary": "var(--wp--preset--color--gray)",
+				"foreground": "var(--wp--preset--color--black)",
+				"background": "var(--wp--preset--color--white)",
+				"selection": "lightblue"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--margin--horizontal) )",
 				"border": {
-					"radius": "0",
 					"color": "#EFEFEF",
-					"width": "2px",
-					"style": "solid"
+					"radius": "0",
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--foreground)",
 					"background": "transparent",
-					"boxShadow": "none"
+					"boxShadow": "none",
+					"text": "var(--wp--custom--color--foreground)"
 				},
 				"label": {
 					"typography": {
@@ -176,71 +114,11 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontFamily": "var(--wp--preset--font-family--base)",
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-content": {
-				"padding": {
-					"left": "var(--wp--custom--margin--horizontal)",
-					"right": "var(--wp--custom--margin--horizontal)"
-				}
-			},
 			"gallery": {
 				"caption": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"code": {
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"quote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontStyle": "italic"
-					}
-				}
-			},
-			"pullquote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--margin--vertical)"
-						}
-					}
-				}
-			},
-			"separator": {
-				"margin": "var(--wp--custom--margin--vertical) auto",
-				"opacity": 1,
-				"width": "150px"
-			},
-			"video": {
-				"caption": {
-					"margin": "var(--wp--custom--margin--vertical) auto",
-					"textAlign": "center"
-				}
-			},
 			"heading": {
 				"typography": {
 					"fontWeight": 600,
@@ -253,14 +131,19 @@
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
 			},
+			"margin": {
+				"baseline": "10px",
+				"horizontal": "32px",
+				"vertical": "30px"
+			},
 			"navigation": {
 				"mobile": {
 					"menu": {
-						"openLabel": "☰",
-						"closeLabel": "╳",
 						"color": {
 							"text": "var(--wp--custom--color--foreground)"
 						},
+						"closeLabel": "╳",
+						"openLabel": "☰",
 						"typography": {
 							"fontWeight": 500,
 							"fontSize": "24px",
@@ -268,32 +151,86 @@
 						}
 					},
 					"padding": "10px",
-					"verticalAlignment": "center",
-					"horizontalAlignment": "center",
 					"typography": {
 						"fontWeight": 200,
 						"fontSize": "20px",
 						"fontFamily": "var(--wp--custom--font-family--base)"
-					}
+					},
+					"horizontalAlignment": "center",
+					"verticalAlignment": "center"
 				},
 				"padding": "10px",
 				"submenu": {
-					"padding": "8px",
-					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)",
-					"border": {
-						"radius": "0",
-						"color": "0",
-						"width": "1px",
-						"style": "none"
-					},
 					"color": {
 						"text": "var(--wp--custom--color--foreground)",
 						"background": "var(--wp--custom--color--background)",
 						"hoverText": "var(--wp--custom--color--secondary)",
 						"hoverBackground": "var(--wp--custom--color--background)"
+					},
+					"border": {
+						"color": "0",
+						"radius": "0",
+						"style": "none",
+						"width": "1px"
+					},
+					"padding": "8px",
+					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)"
+				}
+			},
+			"paragraph": {
+				"dropcap": {
+					"margin": ".1em .1em 0 0",
+					"typography": {
+						"fontFamily": "var(--wp--preset--font-family--base)",
+						"fontSize": "110px",
+						"fontWeight": "400"
+					}
+				}
+			},
+			"post-author": {
+				"typography": {
+					"fontWeight": "normal"
+				}
+			},
+			"post-content": {
+				"padding": {
+					"left": "var(--wp--custom--margin--horizontal)",
+					"right": "var(--wp--custom--margin--horizontal)"
+				}
+			},
+			"pullquote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontFamily": "inherit",
+						"fontStyle": "italic"
+					},
+					"spacing": {
+						"margin": {
+							"top": "var(--wp--custom--margin--vertical)"
+						}
 					}
+				},
+				"typography": {
+					"textAlign": "left"
 				}
 			},
+			"quote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontStyle": "italic"
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"separator": {
+				"opacity": 1,
+				"margin": "var(--wp--custom--margin--vertical) auto",
+				"width": "150px"
+			},
 			"table": {
 				"figcaption": {
 					"typography": {
@@ -301,9 +238,10 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
+			"video": {
+				"caption": {
+					"textAlign": "center",
+					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
 			},
 			"fontsToLoadFromGoogle": [
@@ -318,74 +256,93 @@
 				"wide": "1022px"
 			}
 		},
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		}
-	},
-	"styles": {
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
+		"layout": {
+			"contentSize": "782px",
+			"wideSize": "1000px"
 		},
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)",
-			"lineHeight": "var(--wp--custom--line-height--body)",
-			"fontFamily": "var(--wp--preset--font-family--base)"
+		"spacing": {
+			"customPadding": true,
+			"units": [
+				"px",
+				"em",
+				"rem",
+				"vh",
+				"vw"
+			]
 		},
-		"blocks": {
-			"core/post-content": {
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--post-content--padding--left)",
-						"right": "var(--wp--custom--post-content--padding--right)"
-					}
+		"typography": {
+			"customFontSize": true,
+			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "\"Poppins\", sans-serif",
+					"slug": "base",
+					"name": "Poppins"
+				},
+				{
+					"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"
 				}
-			},
-			"core/button": {
-				"color": {
-					"text": "var(--wp--custom--button--color--text)",
-					"background": "var(--wp--custom--color--primary)"
+			],
+			"fontSizes": [
+				{
+					"name": "Small",
+					"size": "16.6px",
+					"slug": "small"
 				},
-				"typography": {
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+				{
+					"name": "Normal",
+					"size": "20px",
+					"slug": "normal"
 				},
+				{
+					"name": "Large",
+					"size": "28.8px",
+					"slug": "large"
+				},
+				{
+					"name": "Huge",
+					"size": "34.56px",
+					"slug": "huge"
+				}
+			]
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/button": {
 				"border": {
+					"color": "var(--wp--custom--button--border--color)",
 					"radius": "var(--wp--custom--button--border--radius)",
 					"style": "var(--wp--custom--button--border--style)",
-					"width": "var(--wp--custom--button--border--width)",
-					"color": "var(--wp--custom--button--border--color)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--line-height--headings)"
-				}
-			},
-			"core/post-date": {
+					"width": "var(--wp--custom--button--border--width)"
+				},
 				"color": {
-					"text": "var(--wp--custom--color--foreground-light)",
-					"link": "var(--wp--custom--color--foreground-light)"
+					"background": "var(--wp--custom--color--primary)",
+					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": 700
-				}
-			},
-			"core/navigation": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"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": {
@@ -398,37 +355,56 @@
 					}
 				},
 				"border": {
-					"radius": "0px",
 					"color": "#CCCCCC",
+					"radius": "0px",
 					"style": "solid",
 					"width": "2px"
 				}
 			},
-			"core/quote": {
+			"core/heading": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
-				},
-				"border": {
-					"color": "var(--wp--custom--color--secondary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
+					"fontFamily": "var(--wp--preset--font-family--base)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--line-height--headings)"
+				}
+			},
+			"core/navigation": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
+				}
+			},
+			"core/post-content": {
 				"spacing": {
 					"padding": {
-						"left": "var(--wp--custom--margin--horizontal)"
+						"left": "var(--wp--custom--post-content--padding--left)",
+						"right": "var(--wp--custom--post-content--padding--right)"
 					}
 				}
 			},
-			"core/pullquote": {
+			"core/post-title": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontStyle": "italic"
+					"lineHeight": "var(--wp--custom--line-height--headings)"
+				}
+			},
+			"core/post-date": {
+				"color": {
+					"link": "var(--wp--custom--color--foreground-light)",
+					"text": "var(--wp--custom--color--foreground-light)"
 				},
+				"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--margin--horizontal)",
@@ -448,20 +424,34 @@
 					"width": "0 0 1px 0"
 				}
 			},
-			"core/heading": {
+			"core/site-title": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--base)",
-					"lineHeight": "var(--wp--custom--line-height--headings)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontWeight": 700
+				}
+			},
+			"core/quote": {
+				"border": {
+					"color": "var(--wp--custom--color--secondary)",
+					"style": "solid",
+					"width": "0 0 0 1px"
+				},
+				"spacing": {
+					"padding": {
+						"left": "var(--wp--custom--margin--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": {
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
 			"h1": {
 				"typography": {
 					"fontSize": "41.47px"
@@ -491,7 +481,17 @@
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
+			},
+			"link": {
+				"color": {
+					"text": "var(--wp--custom--color--foreground)"
+				}
 			}
+		},
+		"typography": {
+			"lineHeight": "var(--wp--custom--line-height--body)",
+			"fontFamily": "var(--wp--preset--font-family--base)",
+			"fontSize": "var(--wp--preset--font-size--normal)"
 		}
 	}
 }

+ 156 - 156
quadrat/child-experimental-theme.json

@@ -30,9 +30,110 @@
 				}
 			]
 		},
+		"custom": {
+			"button": {
+				"border": {
+					"radius": "0"
+				},
+				"color": {
+					"background": "var(--wp--custom--color--foreground)",
+					"hoverText": "var(--wp--custom--color--foreground)",
+					"hoverBackground": "transparent",
+					"text": "var(--wp--custom--color--background)"
+				},
+				"typography": {
+					"fontSize": "20px",
+					"fontWeight": "600"
+				}
+			},
+			"color": {
+				"primary": "var(--wp--preset--color--pink)",
+				"secondary": "var(--wp--preset--color--darker-blue)",
+				"foreground": "var(--wp--preset--color--pink)",
+				"background": "var(--wp--preset--color--blue)",
+				"selection": "var(--wp--preset--color--darker-blue)"
+			},
+			"fontsToLoadFromGoogle": [
+				"family=Poppins:ital,wght@0,300;0,400;0,500;0,600;1,400"
+			],
+			"heading": {
+				"typography": {
+					"fontWeight": "500"
+				}
+			},
+			"line-height": {
+				"body": 1.7,
+				"headings": {
+					"h1": 1.2,
+					"h2": 1.2,
+					"h3": 1.2,
+					"h4": 1.4,
+					"h5": 1.4,
+					"h6": 1.4
+				}
+			},
+			"list": {
+				"padding": {
+					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
+				}
+			},
+			"margin": {
+				"horizontal": "20px",
+				"vertical": "30px"
+			},
+			"navigation": {
+				"color": {
+					"hoverText": "var(--wp--custom--color--primary)"
+				}
+			},
+			"paragraph": {
+				"dropcap": {
+					"margin": "0 .2em .2em 0",
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--huge)",
+						"fontWeight": "300"
+					}
+				}
+			},
+			"quote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontStyle": "normal",
+						"fontWeight": "300"
+					}
+				}
+			}
+		},
+		"layout": {
+			"contentSize": "664px",
+			"wideSize": "1128px"
+		},
+		"spacing": {
+			"customPadding": true,
+			"units": [
+				"px",
+				"em",
+				"rem",
+				"vh",
+				"vw"
+			]
+		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "\"Poppins\", sans-serif",
+					"slug": "base",
+					"name": "Poppins"
+				},
+				{
+					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
+					"slug": "system-font",
+					"name": "System Font"
+				}
+			],
 			"fontSizes": [
 				{
 					"name": "Tiny",
@@ -64,122 +165,77 @@
 					"size": "min(max(36px, 5vw), 48px)",
 					"slug": "huge"
 				}
-			],
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Poppins\", sans-serif",
-					"slug": "base",
-					"name": "Poppins"
-				},
-				{
-					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
-				}
 			]
-		},
-		"spacing": {
-			"customPadding": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
-		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1128px"
-		},
-		"custom": {
-			"fontsToLoadFromGoogle": [
-				"family=Poppins:ital,wght@0,300;0,400;0,500;0,600;1,400"
-			],
-			"color": {
-				"primary": "var(--wp--preset--color--pink)",
-				"secondary": "var(--wp--preset--color--darker-blue)",
-				"foreground": "var(--wp--preset--color--pink)",
-				"background": "var(--wp--preset--color--blue)",
-				"selection": "var(--wp--preset--color--darker-blue)"
-			},
-			"margin": {
-				"horizontal": "20px",
-				"vertical": "30px"
-			},
-			"line-height": {
-				"body": 1.7,
-				"headings": {
-					"h1": 1.2,
-					"h2": 1.2,
-					"h3": 1.2,
-					"h4": 1.4,
-					"h5": 1.4,
-					"h6": 1.4
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/button": {
+				"color": {
+					"background": "var(--wp--custom--button--color--background)",
+					"text": "var(--wp--custom--button--color--text)"
+				},
+				"typography": {
+					"fontSize": "var(--wp--custom--button--typography--font-size)"
 				}
 			},
-			"button": {
-				"typography": {
-					"fontWeight": "600",
-					"fontSize": "20px"
-				},
+			"core/code": {
 				"border": {
-					"radius": "0"
+					"width": "0px"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--background)",
-					"background": "var(--wp--custom--color--foreground)",
-					"hoverText": "var(--wp--custom--color--foreground)",
-					"hoverBackground": "transparent"
-				}
-			},
-			"heading": {
+					"background": "var(--wp--custom--color--secondary)"
+				},
 				"typography": {
-					"fontWeight": "500"
+					"fontSize": "20px",
+					"fontWeight": "400",
+					"lineHeight": "1.6"
 				}
 			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "300"
-					}
+			"core/heading": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--base)"
 				}
 			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
+			"core/post-title": {
+				"typography": {
+					"fontSize": "min(max(36px, 5vw), 65px)",
+					"fontWeight": "500",
+					"lineHeight": "var(--wp--custom--line-height--headings--h2)"
 				}
 			},
-			"quote": {
+			"core/quote": {
+				"border": {
+					"width": "0px"
+				},
 				"citation": {
 					"typography": {
-						"fontWeight": "300",
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontStyle": "normal"
+						"fontSize": "15px",
+						"fontWeight": "300"
+					}
+				},
+				"spacing": {
+					"padding": {
+						"left": "calc( var(--wp--custom--margin--horizontal) * 3 )"
 					}
+				},
+				"typography": {
+					"fontSize": "25px",
+					"fontWeight": "normal",
+					"lineHeight": "40px"
 				}
 			},
-			"navigation": {
+			"core/site-title": {
 				"color": {
-					"hoverText": "var(--wp--custom--color--primary)"
+					"link": "var(--wp--custom--color--primary)"
+				},
+				"typography": {
+					"fontSize": "20px",
+					"fontWeight": 800
 				}
 			}
-		}
-	},
-	"styles": {
-		"typography": {
-			"fontWeight": "300",
-			"fontSize": "20px",
-			"lineHeight": "var(--wp--custom--line-height--body)"
 		},
 		"elements": {
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
 			"h1": {
 				"typography": {
 					"fontSize": "min(max(48px, 7vw), 80px)",
@@ -215,73 +271,17 @@
 					"fontSize": "16px",
 					"lineHeight": "var(--wp--custom--line-height--headings--h6)"
 				}
-			}
-		},
-		"blocks": {
-			"core/site-title": {
-				"typography": {
-					"fontWeight": 800,
-					"fontSize": "20px"
-				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/button": {
-				"color": {
-					"text": "var(--wp--custom--button--color--text)",
-					"background": "var(--wp--custom--button--color--background)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--custom--button--typography--font-size)"
-				}
-			},
-			"core/heading": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--base)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontWeight": "500",
-					"fontSize": "min(max(36px, 5vw), 65px)",
-					"lineHeight": "var(--wp--custom--line-height--headings--h2)"
-				}
 			},
-			"core/code": {
-				"typography": {
-					"fontWeight": "400",
-					"fontSize": "20px",
-					"lineHeight": "1.6"
-				},
-				"border": {
-					"width": "0px"
-				},
+			"link": {
 				"color": {
-					"background": "var(--wp--custom--color--secondary)"
-				}
-			},
-			"core/quote": {
-				"typography": {
-					"fontWeight": "normal",
-					"fontSize": "25px",
-					"lineHeight": "40px"
-				},
-				"spacing": {
-					"padding": {
-						"left": "calc( var(--wp--custom--margin--horizontal) * 3 )"
-					}
-				},
-				"citation": {
-					"typography": {
-						"fontWeight": "300",
-						"fontSize": "15px"
-					}
-				},
-				"border": {
-					"width": "0px"
+					"text": "var(--wp--custom--color--foreground)"
 				}
 			}
+		},
+		"typography": {
+			"fontSize": "20px",
+			"fontWeight": "300",
+			"lineHeight": "var(--wp--custom--line-height--body)"
 		}
 	}
 }

+ 265 - 265
quadrat/experimental-theme.json

@@ -15,6 +15,12 @@
 		}
 	],
 	"settings": {
+		"border": {
+			"customColor": true,
+			"customRadius": true,
+			"customStyle": true,
+			"customWidth": true
+		},
 		"color": {
 			"gradients": [],
 			"palette": [
@@ -45,117 +51,55 @@
 				}
 			]
 		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontSizes": [
-				{
-					"name": "Tiny",
-					"size": "15px",
-					"slug": "tiny"
-				},
-				{
-					"name": "Small",
-					"size": "17px",
-					"slug": "small"
-				},
-				{
-					"name": "Normal",
-					"size": "18px",
-					"slug": "normal"
-				},
-				{
-					"name": "Large",
-					"size": "22px",
-					"slug": "large"
-				},
-				{
-					"name": "Extra Large",
-					"size": "min(max(28px, 5vw), 35px)",
-					"slug": "extra-large"
-				},
-				{
-					"name": "Huge",
-					"size": "min(max(36px, 5vw), 48px)",
-					"slug": "huge"
-				}
-			],
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Poppins\", sans-serif",
-					"slug": "base",
-					"name": "Poppins"
-				},
-				{
-					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
-				}
-			]
-		},
-		"spacing": {
-			"customPadding": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
-		"layout": {
-			"contentSize": "664px",
-			"wideSize": "1128px"
-		},
 		"custom": {
-			"color": {
-				"primary": "var(--wp--preset--color--pink)",
-				"secondary": "var(--wp--preset--color--darker-blue)",
-				"tertiary": "var(--wp--preset--color--almost-white)",
-				"foreground": "var(--wp--preset--color--pink)",
-				"background": "var(--wp--preset--color--blue)",
-				"selection": "var(--wp--preset--color--darker-blue)"
-			},
-			"margin": {
-				"baseline": "10px",
-				"horizontal": "20px",
-				"vertical": "30px"
-			},
 			"alignment": {
 				"alignedMaxWidth": "50%"
 			},
 			"button": {
-				"typography": {
-					"fontWeight": "600",
-					"fontFamily": "var(--wp--preset--font-family--base)",
-					"fontSize": "20px",
-					"lineHeight": 2
-				},
 				"border": {
+					"color": "var(--wp--custom--button--color--text)",
 					"radius": "0",
-					"width": "0",
 					"style": "solid",
-					"color": "var(--wp--custom--button--color--text)"
+					"width": "0"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--background)",
 					"background": "var(--wp--custom--color--foreground)",
 					"hoverText": "var(--wp--custom--color--foreground)",
-					"hoverBackground": "transparent"
+					"hoverBackground": "transparent",
+					"text": "var(--wp--custom--color--background)"
+				},
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--base)",
+					"fontSize": "20px",
+					"fontWeight": "600",
+					"lineHeight": 2
+				}
+			},
+			"code": {
+				"typography": {
+					"fontFamily": "monospace"
 				}
 			},
+			"color": {
+				"primary": "var(--wp--preset--color--pink)",
+				"secondary": "var(--wp--preset--color--darker-blue)",
+				"tertiary": "var(--wp--preset--color--almost-white)",
+				"foreground": "var(--wp--preset--color--pink)",
+				"background": "var(--wp--preset--color--blue)",
+				"selection": "var(--wp--preset--color--darker-blue)"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--margin--horizontal) )",
 				"border": {
-					"radius": "0",
 					"color": "#EFEFEF",
-					"width": "2px",
-					"style": "solid"
+					"radius": "0",
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--foreground)",
 					"background": "transparent",
-					"boxShadow": "none"
+					"boxShadow": "none",
+					"text": "var(--wp--custom--color--foreground)"
 				},
 				"label": {
 					"typography": {
@@ -166,72 +110,11 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"paragraph": {
-				"dropcap": {
-					"margin": "0 .2em .2em 0",
-					"typography": {
-						"fontFamily": "var(--wp--preset--font-family--base)",
-						"fontSize": "var(--wp--preset--font-size--huge)",
-						"fontWeight": "300"
-					}
-				}
-			},
-			"post-content": {
-				"padding": {
-					"left": "var(--wp--custom--margin--horizontal)",
-					"right": "var(--wp--custom--margin--horizontal)"
-				}
-			},
 			"gallery": {
 				"caption": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"code": {
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"quote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontStyle": "normal",
-						"fontWeight": "300"
-					}
-				}
-			},
-			"pullquote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontFamily": "inherit",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "var(--wp--custom--margin--vertical)"
-						}
-					}
-				}
-			},
-			"separator": {
-				"margin": "var(--wp--custom--margin--vertical) auto",
-				"opacity": 1,
-				"width": "150px"
-			},
-			"video": {
-				"caption": {
-					"margin": "var(--wp--custom--margin--vertical) auto",
-					"textAlign": "center"
-				}
-			},
 			"heading": {
 				"typography": {
 					"fontWeight": "500",
@@ -244,14 +127,19 @@
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
 			},
+			"margin": {
+				"baseline": "10px",
+				"horizontal": "20px",
+				"vertical": "30px"
+			},
 			"navigation": {
 				"mobile": {
 					"menu": {
-						"openLabel": "☰",
-						"closeLabel": "╳",
 						"color": {
 							"text": "var(--wp--custom--color--foreground)"
 						},
+						"closeLabel": "╳",
+						"openLabel": "☰",
 						"typography": {
 							"fontWeight": 500,
 							"fontSize": "24px",
@@ -259,39 +147,42 @@
 						}
 					},
 					"padding": "10px",
-					"verticalAlignment": "center",
-					"horizontalAlignment": "center",
 					"typography": {
 						"fontWeight": 200,
 						"fontSize": "20px",
 						"fontFamily": "var(--wp--custom--font-family--base)"
-					}
+					},
+					"horizontalAlignment": "center",
+					"verticalAlignment": "center"
 				},
 				"padding": "10px",
 				"submenu": {
-					"padding": "8px",
-					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)",
-					"border": {
-						"radius": "0",
-						"color": "0",
-						"width": "1px",
-						"style": "none"
-					},
 					"color": {
 						"text": "var(--wp--custom--color--foreground)",
 						"background": "var(--wp--custom--color--background)",
 						"hoverText": "var(--wp--custom--color--secondary)",
 						"hoverBackground": "var(--wp--custom--color--background)"
-					}
+					},
+					"border": {
+						"color": "0",
+						"radius": "0",
+						"style": "none",
+						"width": "1px"
+					},
+					"padding": "8px",
+					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)"
 				},
 				"color": {
 					"hoverText": "var(--wp--custom--color--primary)"
 				}
 			},
-			"table": {
-				"figcaption": {
+			"paragraph": {
+				"dropcap": {
+					"margin": "0 .2em .2em 0",
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontFamily": "var(--wp--preset--font-family--base)",
+						"fontSize": "var(--wp--preset--font-size--huge)",
+						"fontWeight": "300"
 					}
 				}
 			},
@@ -300,6 +191,59 @@
 					"fontWeight": "normal"
 				}
 			},
+			"post-content": {
+				"padding": {
+					"left": "var(--wp--custom--margin--horizontal)",
+					"right": "var(--wp--custom--margin--horizontal)"
+				}
+			},
+			"pullquote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontFamily": "inherit",
+						"fontStyle": "italic"
+					},
+					"spacing": {
+						"margin": {
+							"top": "var(--wp--custom--margin--vertical)"
+						}
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"quote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontStyle": "normal",
+						"fontWeight": "300"
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"separator": {
+				"opacity": 1,
+				"margin": "var(--wp--custom--margin--vertical) auto",
+				"width": "150px"
+			},
+			"table": {
+				"figcaption": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)"
+					}
+				}
+			},
+			"video": {
+				"caption": {
+					"textAlign": "center",
+					"margin": "var(--wp--custom--margin--vertical) auto"
+				}
+			},
 			"fontsToLoadFromGoogle": [
 				"family=Poppins:ital,wght@0,300;0,400;0,500;0,600;1,400"
 			],
@@ -315,79 +259,87 @@
 				}
 			}
 		},
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		}
-	},
-	"styles": {
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
+		"layout": {
+			"contentSize": "664px",
+			"wideSize": "1128px"
 		},
-		"typography": {
-			"fontSize": "20px",
-			"lineHeight": "var(--wp--custom--line-height--body)",
-			"fontFamily": "var(--wp--preset--font-family--base)",
-			"fontWeight": "300"
+		"spacing": {
+			"customPadding": true,
+			"units": [
+				"px",
+				"em",
+				"rem",
+				"vh",
+				"vw"
+			]
 		},
-		"blocks": {
-			"core/post-content": {
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--post-content--padding--left)",
-						"right": "var(--wp--custom--post-content--padding--right)"
-					}
+		"typography": {
+			"customFontSize": true,
+			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "\"Poppins\", sans-serif",
+					"slug": "base",
+					"name": "Poppins"
+				},
+				{
+					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
+					"slug": "system-font",
+					"name": "System Font"
 				}
-			},
-			"core/button": {
-				"color": {
-					"text": "var(--wp--custom--button--color--text)",
-					"background": "var(--wp--custom--button--color--background)"
+			],
+			"fontSizes": [
+				{
+					"name": "Tiny",
+					"size": "15px",
+					"slug": "tiny"
 				},
-				"typography": {
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+				{
+					"name": "Small",
+					"size": "17px",
+					"slug": "small"
+				},
+				{
+					"name": "Normal",
+					"size": "18px",
+					"slug": "normal"
+				},
+				{
+					"name": "Large",
+					"size": "22px",
+					"slug": "large"
+				},
+				{
+					"name": "Extra Large",
+					"size": "min(max(28px, 5vw), 35px)",
+					"slug": "extra-large"
 				},
+				{
+					"name": "Huge",
+					"size": "min(max(36px, 5vw), 48px)",
+					"slug": "huge"
+				}
+			]
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/button": {
 				"border": {
+					"color": "var(--wp--custom--button--border--color)",
 					"radius": "var(--wp--custom--button--border--radius)",
 					"style": "var(--wp--custom--button--border--style)",
-					"width": "var(--wp--custom--button--border--width)",
-					"color": "var(--wp--custom--button--border--color)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontSize": "min(max(36px, 5vw), 65px)",
-					"lineHeight": "var(--wp--custom--line-height--headings--h2)",
-					"fontWeight": "500"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)",
-					"link": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "20px",
-					"fontWeight": 800
+					"width": "var(--wp--custom--button--border--width)"
 				},
 				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/navigation": {
+					"background": "var(--wp--custom--button--color--background)",
+					"text": "var(--wp--custom--button--color--text)"
+				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"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": {
@@ -400,53 +352,65 @@
 					}
 				},
 				"border": {
-					"radius": "0px",
 					"color": "#CCCCCC",
+					"radius": "0px",
 					"style": "solid",
 					"width": "0px"
 				},
+				"color": {
+					"background": "var(--wp--custom--color--secondary)"
+				},
 				"typography": {
-					"fontWeight": "400",
 					"fontSize": "20px",
+					"fontWeight": "400",
 					"lineHeight": "1.6"
-				},
-				"color": {
-					"background": "var(--wp--custom--color--secondary)"
 				}
 			},
-			"core/quote": {
+			"core/heading": {
 				"typography": {
-					"fontSize": "25px",
-					"fontStyle": "normal",
-					"fontWeight": "normal",
-					"lineHeight": "40px"
-				},
-				"border": {
-					"color": "var(--wp--custom--color--secondary)",
-					"style": "solid",
-					"width": "0px"
-				},
+					"fontFamily": "var(--wp--preset--font-family--base)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
+				}
+			},
+			"core/navigation": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
+				}
+			},
+			"core/post-content": {
 				"spacing": {
 					"padding": {
-						"left": "calc( var(--wp--custom--margin--horizontal) * 3 )"
-					}
-				},
-				"citation": {
-					"typography": {
-						"fontWeight": "300",
-						"fontSize": "15px"
+						"left": "var(--wp--custom--post-content--padding--left)",
+						"right": "var(--wp--custom--post-content--padding--right)"
 					}
 				}
 			},
-			"core/pullquote": {
+			"core/post-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontStyle": "italic"
+					"fontSize": "min(max(36px, 5vw), 65px)",
+					"lineHeight": "var(--wp--custom--line-height--headings--h2)",
+					"fontWeight": "500"
+				}
+			},
+			"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--margin--horizontal)",
@@ -466,20 +430,45 @@
 					"width": "0 0 1px 0"
 				}
 			},
-			"core/heading": {
+			"core/site-title": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--base)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
+					"fontSize": "20px",
+					"fontWeight": 800
+				},
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				}
+			},
+			"core/quote": {
+				"border": {
+					"color": "var(--wp--custom--color--secondary)",
+					"style": "solid",
+					"width": "0px"
+				},
+				"spacing": {
+					"padding": {
+						"left": "calc( var(--wp--custom--margin--horizontal) * 3 )"
+					}
+				},
+				"typography": {
+					"fontSize": "25px",
+					"fontStyle": "normal",
+					"fontWeight": "normal",
+					"lineHeight": "40px"
+				},
+				"citation": {
+					"typography": {
+						"fontSize": "15px",
+						"fontWeight": "300"
+					}
 				}
 			}
 		},
+		"color": {
+			"background": "var(--wp--custom--color--background)",
+			"text": "var(--wp--custom--color--foreground)"
+		},
 		"elements": {
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)"
-				}
-			},
 			"h1": {
 				"typography": {
 					"fontSize": "min(max(48px, 7vw), 80px)",
@@ -515,7 +504,18 @@
 					"fontSize": "16px",
 					"lineHeight": "var(--wp--custom--line-height--headings--h6)"
 				}
+			},
+			"link": {
+				"color": {
+					"text": "var(--wp--custom--color--foreground)"
+				}
 			}
+		},
+		"typography": {
+			"lineHeight": "var(--wp--custom--line-height--body)",
+			"fontFamily": "var(--wp--preset--font-family--base)",
+			"fontSize": "20px",
+			"fontWeight": "300"
 		}
 	}
 }

+ 65 - 65
seedlet-blocks/child-experimental-theme.json

@@ -87,9 +87,63 @@
 
 			]
 		},
+		"custom": {
+			"button": {
+				"color": {
+					"hoverBackground": "#336D58"
+				}
+			},
+			"color": {
+				"primary": "var(--wp--preset--color--black)",
+				"secondary": "var(--wp--preset--color--green)",
+				"tertiary": "var(--wp--preset--color--almost-white)",
+				"foreground": "var(--wp--preset--color--almost-black)",
+				"background": "var(--wp--preset--color--white)",
+				"selection": "var(--wp--preset--color--almost-white)"
+			},
+			"fontsToLoadFromGoogle": [
+				"family=Fira+Sans:ital,wght@0,400;0,500;1,400",
+				"family=Playfair+Display:ital,wght@0,400;0,700;1,400"
+			],
+			"margin": {
+				"horizontal": "25px",
+				"vertical": "30px"
+			},
+			"pullquote": {
+				"citation": {
+					"typography": {
+						"fontFamily": "var(--wp--preset--font-family--base)"
+					},
+					"spacing": {
+						"margin": {
+							"top": "20px"
+						}
+					}
+				}
+			},
+			"separator": {
+				"margin": "calc( 9 * var(--wp--custom--margin--baseline) ) auto calc(2 * var(--wp--custom--margin--baseline) )"
+			}
+		},
+		"layout": {
+			"contentSize": "620px",
+			"wideSize": "790px"
+		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif)",
+					"slug": "base",
+					"name": "Base"
+				},
+				{
+					"fontFamily": "var(--font-headings, 'Playfair Display', Georgia, Times, serif)",
+					"slug": "headings",
+					"name": "Headings"
+				}
+			],
 			"fontSizes": [
 				{
 					"name": "Tiny",
@@ -117,80 +171,15 @@
 					"size": "28px"
 				}
 			],
-			"fontFamilies": [
-				{
-					"fontFamily": "var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif)",
-					"slug": "base",
-					"name": "Base"
-				},
-				{
-					"fontFamily": "var(--font-headings, 'Playfair Display', Georgia, Times, serif)",
-					"slug": "headings",
-					"name": "Headings"
-				}
-			],
 			"spacing": {
 				"customPadding": true,
 				"units": [ "px", "em", "rem", "vh", "vw" ]
 			}
-		},
-		"layout": {
-			"contentSize": "620px",
-			"wideSize": "790px"
-		},
-		"custom": {
-			"fontsToLoadFromGoogle": [
-				"family=Fira+Sans:ital,wght@0,400;0,500;1,400",
-				"family=Playfair+Display:ital,wght@0,400;0,700;1,400"
-			],
-			"color": {
-				"primary": "var(--wp--preset--color--black)",
-				"secondary": "var(--wp--preset--color--green)",
-				"tertiary": "var(--wp--preset--color--almost-white)",
-				"foreground": "var(--wp--preset--color--almost-black)",
-				"background": "var(--wp--preset--color--white)",
-				"selection": "var(--wp--preset--color--almost-white)"
-			},
-			"margin": {
-				"horizontal": "25px",
-				"vertical": "30px"
-			},
-			"separator": {
-				"margin": "calc( 9 * var(--wp--custom--margin--baseline) ) auto calc(2 * var(--wp--custom--margin--baseline) )"
-			},
-			"button": {
-				"color": {
-					"hoverBackground": "#336D58"
-				}
-			},
-			"pullquote": {
-				"citation": {
-					"typography": {
-						"fontFamily": "var(--wp--preset--font-family--base)"
-					},
-					"spacing": {
-						"margin": {
-							"top": "20px"
-						}
-					}
-				}
-			}
 		}
 	},
 	"styles": {
 		"blocks": {
-			"core/separator": {
-				"color": {
-					"text": "var(--wp--preset--color--light-grey)"
-				}
-			},
 			"core/pullquote": {
-				"typography": {
-					"fontSize": "32px",
-					"fontStyle": "italic",
-					"lineHeight": "1.3",
-					"fontFamily": "var(--wp--preset--font-family--headings)"
-				},
 				"border": {
 					"style": "none"
 				},
@@ -201,6 +190,17 @@
 						"top": "var(--wp--custom--margin--vertical)",
 						"bottom": "var(--wp--custom--margin--vertical)"
 					}
+				},
+				"typography": {
+					"fontSize": "32px",
+					"fontStyle": "italic",
+					"lineHeight": "1.3",
+					"fontFamily": "var(--wp--preset--font-family--headings)"
+				}
+			},
+			"core/separator": {
+				"color": {
+					"text": "var(--wp--preset--color--light-grey)"
 				}
 			},
 			"core/site-title": {

+ 256 - 256
seedlet-blocks/experimental-theme.json

@@ -15,6 +15,12 @@
 		}
 	],
 	"settings": {
+		"border": {
+			"customColor": true,
+			"customRadius": true,
+			"customStyle": true,
+			"customWidth": true
+		},
 		"color": {
 			"gradients": [
 				{
@@ -87,122 +93,55 @@
 				}
 			]
 		},
-		"typography": {
-			"customFontSize": true,
-			"customLineHeight": true,
-			"fontSizes": [
-				{
-					"name": "Tiny",
-					"slug": "tiny",
-					"size": "14px"
-				},
-				{
-					"name": "Small",
-					"slug": "small",
-					"size": "16px"
-				},
-				{
-					"name": "Normal",
-					"slug": "normal",
-					"size": "18px"
-				},
-				{
-					"name": "Large",
-					"slug": "large",
-					"size": "24px"
-				},
-				{
-					"name": "Huge",
-					"slug": "huge",
-					"size": "28px"
-				}
-			],
-			"fontFamilies": [
-				{
-					"fontFamily": "var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif)",
-					"slug": "base",
-					"name": "Base"
-				},
-				{
-					"fontFamily": "var(--font-headings, 'Playfair Display', Georgia, Times, serif)",
-					"slug": "headings",
-					"name": "Headings"
-				}
-			],
-			"spacing": {
-				"customPadding": true,
-				"units": [
-					"px",
-					"em",
-					"rem",
-					"vh",
-					"vw"
-				]
-			}
-		},
-		"spacing": {
-			"customPadding": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
-		"layout": {
-			"contentSize": "620px",
-			"wideSize": "790px"
-		},
 		"custom": {
-			"color": {
-				"primary": "var(--wp--preset--color--black)",
-				"secondary": "var(--wp--preset--color--green)",
-				"tertiary": "var(--wp--preset--color--almost-white)",
-				"foreground": "var(--wp--preset--color--almost-black)",
-				"background": "var(--wp--preset--color--white)",
-				"selection": "var(--wp--preset--color--almost-white)"
-			},
-			"margin": {
-				"baseline": "10px",
-				"horizontal": "25px",
-				"vertical": "30px"
-			},
 			"alignment": {
 				"alignedMaxWidth": "50%"
 			},
 			"button": {
-				"typography": {
-					"fontWeight": "normal",
-					"fontFamily": "var(--wp--preset--font-family--base)",
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"lineHeight": 2
-				},
 				"border": {
+					"color": "var(--wp--custom--button--color--text)",
 					"radius": "4px",
-					"width": "0",
 					"style": "solid",
-					"color": "var(--wp--custom--button--color--text)"
+					"width": "0"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--background)",
 					"background": "var(--wp--custom--color--secondary)",
 					"hoverText": "var(--wp--custom--color--background)",
-					"hoverBackground": "#336D58"
+					"hoverBackground": "#336D58",
+					"text": "var(--wp--custom--color--background)"
+				},
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--base)",
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": "normal",
+					"lineHeight": 2
+				}
+			},
+			"code": {
+				"typography": {
+					"fontFamily": "monospace"
 				}
 			},
+			"color": {
+				"primary": "var(--wp--preset--color--black)",
+				"secondary": "var(--wp--preset--color--green)",
+				"tertiary": "var(--wp--preset--color--almost-white)",
+				"foreground": "var(--wp--preset--color--almost-black)",
+				"background": "var(--wp--preset--color--white)",
+				"selection": "var(--wp--preset--color--almost-white)"
+			},
 			"form": {
 				"padding": "calc( 0.5 * var(--wp--custom--margin--horizontal) )",
 				"border": {
-					"radius": "0",
 					"color": "#EFEFEF",
-					"width": "2px",
-					"style": "solid"
+					"radius": "0",
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
-					"text": "var(--wp--custom--color--foreground)",
 					"background": "transparent",
-					"boxShadow": "none"
+					"boxShadow": "none",
+					"text": "var(--wp--custom--color--foreground)"
 				},
 				"label": {
 					"typography": {
@@ -213,71 +152,11 @@
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
-			"paragraph": {
-				"dropcap": {
-					"margin": ".1em .1em 0 0",
-					"typography": {
-						"fontFamily": "var(--wp--preset--font-family--base)",
-						"fontSize": "110px",
-						"fontWeight": "400"
-					}
-				}
-			},
-			"post-content": {
-				"padding": {
-					"left": "var(--wp--custom--margin--horizontal)",
-					"right": "var(--wp--custom--margin--horizontal)"
-				}
-			},
 			"gallery": {
 				"caption": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"code": {
-				"typography": {
-					"fontFamily": "monospace"
-				}
-			},
-			"quote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontStyle": "italic"
-					}
-				}
-			},
-			"pullquote": {
-				"typography": {
-					"textAlign": "left"
-				},
-				"citation": {
-					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontFamily": "var(--wp--preset--font-family--base)",
-						"fontStyle": "italic"
-					},
-					"spacing": {
-						"margin": {
-							"top": "20px"
-						}
-					}
-				}
-			},
-			"separator": {
-				"margin": "calc( 9 * var(--wp--custom--margin--baseline) ) auto calc(2 * var(--wp--custom--margin--baseline) )",
-				"opacity": 1,
-				"width": "150px"
-			},
-			"video": {
-				"caption": {
-					"margin": "var(--wp--custom--margin--vertical) auto",
-					"textAlign": "center"
-				}
-			},
 			"heading": {
 				"typography": {
 					"fontWeight": 400,
@@ -290,14 +169,19 @@
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
 			},
+			"margin": {
+				"baseline": "10px",
+				"horizontal": "25px",
+				"vertical": "30px"
+			},
 			"navigation": {
 				"mobile": {
 					"menu": {
-						"openLabel": "☰",
-						"closeLabel": "╳",
 						"color": {
 							"text": "var(--wp--custom--color--foreground)"
 						},
+						"closeLabel": "╳",
+						"openLabel": "☰",
 						"typography": {
 							"fontWeight": 500,
 							"fontSize": "24px",
@@ -305,32 +189,86 @@
 						}
 					},
 					"padding": "10px",
-					"verticalAlignment": "center",
-					"horizontalAlignment": "center",
 					"typography": {
 						"fontWeight": 200,
 						"fontSize": "20px",
 						"fontFamily": "var(--wp--custom--font-family--base)"
-					}
+					},
+					"horizontalAlignment": "center",
+					"verticalAlignment": "center"
 				},
 				"padding": "10px",
 				"submenu": {
-					"padding": "8px",
-					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)",
-					"border": {
-						"radius": "0",
-						"color": "0",
-						"width": "1px",
-						"style": "none"
-					},
 					"color": {
 						"text": "var(--wp--custom--color--foreground)",
 						"background": "var(--wp--custom--color--background)",
 						"hoverText": "var(--wp--custom--color--secondary)",
 						"hoverBackground": "var(--wp--custom--color--background)"
+					},
+					"border": {
+						"color": "0",
+						"radius": "0",
+						"style": "none",
+						"width": "1px"
+					},
+					"padding": "8px",
+					"shadow": "1px 1px 3px 0px rgba(0,0,0,.2)"
+				}
+			},
+			"paragraph": {
+				"dropcap": {
+					"margin": ".1em .1em 0 0",
+					"typography": {
+						"fontFamily": "var(--wp--preset--font-family--base)",
+						"fontSize": "110px",
+						"fontWeight": "400"
 					}
 				}
 			},
+			"post-author": {
+				"typography": {
+					"fontWeight": "normal"
+				}
+			},
+			"post-content": {
+				"padding": {
+					"left": "var(--wp--custom--margin--horizontal)",
+					"right": "var(--wp--custom--margin--horizontal)"
+				}
+			},
+			"pullquote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontFamily": "var(--wp--preset--font-family--base)",
+						"fontStyle": "italic"
+					},
+					"spacing": {
+						"margin": {
+							"top": "20px"
+						}
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"quote": {
+				"citation": {
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontStyle": "italic"
+					}
+				},
+				"typography": {
+					"textAlign": "left"
+				}
+			},
+			"separator": {
+				"opacity": 1,
+				"margin": "calc( 9 * var(--wp--custom--margin--baseline) ) auto calc(2 * var(--wp--custom--margin--baseline) )",
+				"width": "150px"
+			},
 			"table": {
 				"figcaption": {
 					"typography": {
@@ -338,9 +276,10 @@
 					}
 				}
 			},
-			"post-author": {
-				"typography": {
-					"fontWeight": "normal"
+			"video": {
+				"caption": {
+					"textAlign": "center",
+					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
 			},
 			"fontsToLoadFromGoogle": [
@@ -348,77 +287,92 @@
 				"family=Playfair+Display:ital,wght@0,400;0,700;1,400"
 			]
 		},
-		"border": {
-			"customColor": true,
-			"customRadius": true,
-			"customStyle": true,
-			"customWidth": true
-		}
-	},
-	"styles": {
-		"color": {
-			"background": "var(--wp--custom--color--background)",
-			"text": "var(--wp--custom--color--foreground)"
+		"layout": {
+			"contentSize": "620px",
+			"wideSize": "790px"
 		},
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)",
-			"lineHeight": 1.6,
-			"fontFamily": "var(--wp--preset--font-family--base)"
+		"spacing": {
+			"customPadding": true,
+			"units": [
+				"px",
+				"em",
+				"rem",
+				"vh",
+				"vw"
+			]
 		},
-		"blocks": {
-			"core/post-content": {
-				"spacing": {
-					"padding": {
-						"left": "var(--wp--custom--post-content--padding--left)",
-						"right": "var(--wp--custom--post-content--padding--right)"
-					}
+		"typography": {
+			"customFontSize": true,
+			"customLineHeight": true,
+			"fontFamilies": [
+				{
+					"fontFamily": "var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif)",
+					"slug": "base",
+					"name": "Base"
+				},
+				{
+					"fontFamily": "var(--font-headings, 'Playfair Display', Georgia, Times, serif)",
+					"slug": "headings",
+					"name": "Headings"
 				}
-			},
-			"core/button": {
-				"color": {
-					"text": "var(--wp--custom--button--color--text)",
-					"background": "var(--wp--custom--button--color--background)"
+			],
+			"fontSizes": [
+				{
+					"name": "Tiny",
+					"slug": "tiny",
+					"size": "14px"
 				},
-				"typography": {
-					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
-					"fontSize": "var(--wp--custom--button--typography--font-size)",
-					"lineHeight": "var(--wp--custom--button--typography--line-height)"
+				{
+					"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": {
 				"border": {
+					"color": "var(--wp--custom--button--border--color)",
 					"radius": "var(--wp--custom--button--border--radius)",
 					"style": "var(--wp--custom--button--border--style)",
-					"width": "var(--wp--custom--button--border--width)",
-					"color": "var(--wp--custom--button--border--color)"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
-				}
-			},
-			"core/post-date": {
-				"color": {
-					"text": "var(--wp--custom--color--foreground)",
-					"link": "var(--wp--custom--color--foreground)"
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "60px",
-					"fontWeight": 700
+					"width": "var(--wp--custom--button--border--width)"
 				},
 				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
-			"core/navigation": {
+					"background": "var(--wp--custom--button--color--background)",
+					"text": "var(--wp--custom--button--color--text)"
+				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"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": {
@@ -431,39 +385,58 @@
 					}
 				},
 				"border": {
-					"radius": "0px",
 					"color": "#CCCCCC",
+					"radius": "0px",
 					"style": "solid",
 					"width": "2px"
 				}
 			},
-			"core/quote": {
+			"core/heading": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontStyle": "normal"
-				},
-				"border": {
-					"color": "var(--wp--custom--color--secondary)",
-					"style": "solid",
-					"width": "0 0 0 1px"
-				},
+					"fontFamily": "var(--wp--preset--font-family--headings)",
+					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
+					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
+				}
+			},
+			"core/navigation": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
+				}
+			},
+			"core/post-content": {
 				"spacing": {
 					"padding": {
-						"left": "var(--wp--custom--margin--horizontal)"
+						"left": "var(--wp--custom--post-content--padding--left)",
+						"right": "var(--wp--custom--post-content--padding--right)"
 					}
 				}
 			},
-			"core/pullquote": {
+			"core/post-title": {
 				"typography": {
-					"fontSize": "32px",
-					"fontStyle": "italic",
-					"lineHeight": "1.3",
-					"fontFamily": "var(--wp--preset--font-family--headings)"
+					"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": "none",
 					"width": "1px 0"
 				},
+				"typography": {
+					"fontStyle": "italic",
+					"fontSize": "32px",
+					"lineHeight": "1.3",
+					"fontFamily": "var(--wp--preset--font-family--headings)"
+				},
 				"spacing": {
 					"padding": {
 						"left": 0,
@@ -483,20 +456,37 @@
 					"width": "0 0 1px 0"
 				}
 			},
-			"core/heading": {
+			"core/site-title": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--headings)",
-					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
+					"fontSize": "60px",
+					"fontWeight": 700
+				},
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				}
+			},
+			"core/quote": {
+				"border": {
+					"color": "var(--wp--custom--color--secondary)",
+					"style": "solid",
+					"width": "0 0 0 1px"
+				},
+				"spacing": {
+					"padding": {
+						"left": "var(--wp--custom--margin--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": {
-			"link": {
-				"color": {
-					"text": "var(--wp--custom--color--secondary)"
-				}
-			},
 			"h1": {
 				"typography": {
 					"fontSize": "48px"
@@ -526,7 +516,17 @@
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
+			},
+			"link": {
+				"color": {
+					"text": "var(--wp--custom--color--secondary)"
+				}
 			}
+		},
+		"typography": {
+			"lineHeight": 1.6,
+			"fontFamily": "var(--wp--preset--font-family--base)",
+			"fontSize": "var(--wp--preset--font-size--normal)"
 		}
 	}
 }