Merge branch 'trunk' into add/skatepark-comment-form-styles

blockbase/inc/customizer/wp-customize-colors.php

@@ -133,6 +133,11 @@ class GlobalStylesColorCustomizer {
 		$user_theme_json_post         = get_post( $user_custom_post_type_id );
 		$user_theme_json_post_content = json_decode( $user_theme_json_post->post_content );
 
+		// Set meta settings.
+		$user_theme_json_post_content->version                     = 1;
+		$user_theme_json_post_content->isGlobalStylesUserThemeJSON = true;
+
+		// Set palette settings.
 		$user_theme_json_post_content = set_settings_array(
 			$user_theme_json_post_content,
 			array( 'settings', 'color', 'palette' ),

blockbase/inc/customizer/wp-customize-fonts.php

@@ -415,6 +415,10 @@ class GlobalStylesFontsCustomizer {
 		$user_theme_json_post         = get_post( $user_custom_post_type_id );
 		$user_theme_json_post_content = json_decode( $user_theme_json_post->post_content );
 
+		// Set meta settings.
+		$user_theme_json_post_content->version                     = 1;
+		$user_theme_json_post_content->isGlobalStylesUserThemeJSON = true;
+
 		// Set the typography settings.
 		$user_theme_json_post_content = set_settings_array(
 			$user_theme_json_post_content,

blockbase/inc/customizer/wp-customize-utils.php

@@ -1,5 +1,15 @@
 <?php
 
+/**
+ *
+ * Assign a value to an object at the given location.  Create the nested objects if they aren't already available.
+ *
+ * @param   object  $target The object to assign the value to
+ * @param   array   $array  The array describing the location of the property to update
+ * @param   object  $value  The value to assign
+ * @return  object          The modified $target object with $value assigned where $array describes
+ *
+ */
 function set_settings_array( $target, $array, $value ) {
 	$key     = array_shift( $array );
 	$current =& $target;

independent-publisher-2/inc/wpcom-colors.php

@@ -79,14 +79,15 @@ add_color_rule( 'link', '#0087be', array(
 __( 'Links' ) );
 
 add_color_rule( 'fg1', '#0087be', array(
-    array( 'button:not(.menu-toggle),
+    array( 'button,
             input[type="button"],
             input[type="reset"],
             input[type="submit"],
             .button,
             #content #infinite-handle span button,
             .more-link', 'background-color' ),
-    array( 'button:not(.menu-toggle):hover,
+    //:not(".components-button") avoids targeting button styles in the Gutenberg editor
+    array( 'button:not(".components-button"):hover,
             input[type="button"]:hover,
             input[type="reset"]:hover,
             input[type="submit"]:hover,
@@ -101,10 +102,10 @@ add_color_rule( 'extra', '#383838', array(
     array( '.widget_recent_comments a,
             .widget_recent_entries a,
             body,
-            button,
             input,
             select,
-            textarea', 'color', 'bg' ),
+            textarea,
+            .menu-toggle', 'color', 'bg' ),
 
     array( '#infinite-footer .blog-info a:hover,
             #infinite-footer .blog-credits a:hover', 'color', 'bg' ),
@@ -116,14 +117,13 @@ add_color_rule( 'extra', '#ffffff', array(
             .main-navigation > div > ul > li.current-menu-item > ul > li a,
             .main-navigation > div > ul > li.current_page_item > ul > li a', 'color', 'link' ),
 
-    array( 'button:not(.menu-toggle),
-            button:not(.menu-toggle):hover,
-            input[type="button"],
+    array( 'input[type="button"],
             input[type="button"]:hover,
             input[type="reset"],
             input[type="reset"]:hover,
             input[type="submit"],
             input[type="submit"]:hover,
+            button,
             .button,
             .button:hover,
             #content #infinite-handle span button,

independent-publisher-2/style.css

@@ -655,7 +655,7 @@ input:active {
 
 .button,
 .more-link,
-button:not(.menu-toggle),
+button,
 input[type="button"],
 input[type="reset"],
 input[type="submit"],
@@ -685,13 +685,13 @@ input[type="submit"],
 .button:active,
 .more-link:focus,
 .more-link:active,
-button:not(.menu-toggle):focus,
+button:focus,
 input[type="button"]:focus,
 input[type="reset"]:focus,
 input[type="submit"]:focus,
 .posts-navigation .nav-links a:focus,
 #content #infinite-handle span button:focus,
-button:not(.menu-toggle):active,
+button:active,
 input[type="button"]:active,
 input[type="reset"]:active,
 input[type="submit"]:active,
@@ -704,7 +704,7 @@ input[type="submit"]:active,
 
 .button:hover,
 .more-link:hover,
-button:not(.menu-toggle):hover,
+button:hover,
 input[type="button"]:hover,
 input[type="reset"]:hover,
 input[type="submit"]:hover,
@@ -728,13 +728,13 @@ input[type="submit"]:hover,
 	text-align: center;
 }
 
-input + button:not(.menu-toggle),
+input + button,
 input + input[type="button"],
 input + input[type="reset"],
 input + input[type="submit"],
 input + .posts-navigation .nav-links a,
 input + #content #infinite-handle span button,
-label + button:not(.menu-toggle),
+label + button,
 label + input[type="button"],
 label + input[type="reset"],
 label + input[type="submit"],

seedlet-blocks/theme.json

@@ -239,6 +239,9 @@
 					}
 				}
 			},
+			"layout": {
+				"contentSize": "620px"
+			},
 			"list": {
 				"spacing": {
 					"padding": {

skatepark/child-theme.json

@@ -143,24 +143,24 @@
 					"slug": "tiny"
 				},
 				{
-					"name": "Extra Small",
+					"name": "Small",
 					"size": "16px",
 					"slug": "small"
 				},
 				{
-					"name": "Small",
+					"name": "Normal",
 					"size": "20px",
 					"slug": "normal"
 				},
 				{
 					"name": "Medium",
 					"size": "24px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
 					"name": "Large",
 					"size": "min(max(28px, 5vw), 36px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				{
 					"name": "Extra Large",
@@ -180,7 +180,14 @@
 				"typography": {
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"letterSpacing": "0.1em",
+					"letterSpacing": "0.1em"
+				}
+			},
+			"core/site-title": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontWeight": 900,
+					"letterSpacing": "0.05em",
 					"textTransform": "uppercase"
 				}
 			}
@@ -189,45 +196,48 @@
 			"h1": {
 				"typography": {
 					"fontSize": "min(max(48px, 7vw), 72px)",
-					"lineHeight": 1.2,
-					"fontWeight": "700"
+					"fontWeight": "700",
+					"lineHeight": 1.2
 				}
 			},
 			"h2": {
 				"typography": {
 					"fontSize": "min(max(36px, 5vw), 64px)",
-					"lineHeight": 1.2,
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": 1.2
 				}
 			},
 			"h3": {
 				"typography": {
 					"fontSize": "min(max(30px, 5vw), 48px)",
-					"lineHeight": 1.4,
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": 1.3
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontSize": "20px",
-					"lineHeight": 1.3,
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "900",
+					"letterSpacing": "0.1em",
+					"lineHeight": 1.3,
 					"textTransform": "uppercase"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "16px",
-					"lineHeight": 1.3,
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "900",
+					"letterSpacing": "0.1em",
+					"lineHeight": 1.3,
 					"textTransform": "uppercase"
 				}
 			},
 			"h6": {
 				"typography": {
-					"fontSize": "14px",
-					"lineHeight": 1.3,
+					"fontSize": "var(--wp--preset--font-size--tiny)",
 					"fontWeight": "900",
+					"letterSpacing": "0.1em",
+					"lineHeight": 1.3,
 					"textTransform": "uppercase"
 				}
 			}

skatepark/theme.json

@@ -317,24 +317,24 @@
 					"slug": "tiny"
 				},
 				{
-					"name": "Extra Small",
+					"name": "Small",
 					"size": "16px",
 					"slug": "small"
 				},
 				{
-					"name": "Small",
+					"name": "Normal",
 					"size": "20px",
 					"slug": "normal"
 				},
 				{
 					"name": "Medium",
 					"size": "24px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				{
 					"name": "Large",
 					"size": "min(max(28px, 5vw), 36px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				{
 					"name": "Extra Large",
@@ -359,8 +359,7 @@
 					"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"
+					"letterSpacing": "0.1em"
 				}
 			},
 			"core/code": {
@@ -430,8 +429,10 @@
 			},
 			"core/site-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontWeight": 900,
+					"letterSpacing": "0.05em",
+					"textTransform": "uppercase"
 				}
 			},
 			"core/quote": {
@@ -476,7 +477,7 @@
 				"typography": {
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
-					"lineHeight": 1.4,
+					"lineHeight": 1.3,
 					"fontSize": "min(max(30px, 5vw), 48px)"
 				}
 			},
@@ -485,7 +486,8 @@
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 				}
 			},
@@ -494,7 +496,8 @@
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
-					"fontSize": "16px",
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 				}
 			},
@@ -503,7 +506,8 @@
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
-					"fontSize": "14px",
+					"fontSize": "var(--wp--preset--font-size--tiny)",
+					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 				}
 			},