Merge branch 'trunk' into club/fluid-typography

Automattic · Aug 4, 2022 · 10a463e · 10a463e
2 parents e650612 + 4d2a79c
commit 10a463e
Show file tree

Hide file tree

Showing 1,162 changed files with 16,444 additions and 4,010 deletions.
diff --git a/alves/package.json b/alves/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alves",
-  "version": "1.5.19",
+  "version": "1.5.20",
   "description": "Alves",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

diff --git a/alves/sass/style-child-theme.scss b/alves/sass/style-child-theme.scss
@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.19
+Version: 1.5.20
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

diff --git a/alves/style-editor.css b/alves/style-editor.css
@@ -297,6 +297,11 @@ object {
 	max-width: 100%;
 }
 
+/* Center-align getty image embeds */
+.getty.embed.image {
+	display: block !important;
+}
+
 /**
  * Blocks
  * - These styles replace key Gutenberg Block styles for fonts, colors, and

diff --git a/alves/style-rtl.css b/alves/style-rtl.css
@@ -1,12 +1,12 @@
 @charset "UTF-8";
 /*
 Theme Name: Alves
-Theme URI: https://github.com/Automattic/themes/varia
+Theme URI: https://wordpress.com/theme/alves
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.16
+Version: 1.5.19
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -1153,6 +1153,11 @@ object {
 	max-width: 100%;
 }
 
+/* Center-align getty image embeds */
+.getty.embed.image {
+	display: block !important;
+}
+
 /**
  * Blocks
  * - These styles replace key Gutenberg Block styles for fonts, colors, and

diff --git a/alves/style.css b/alves/style.css
@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.19
+Version: 1.5.20
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -1153,6 +1153,11 @@ object {
 	max-width: 100%;
 }
 
+/* Center-align getty image embeds */
+.getty.embed.image {
+	display: block !important;
+}
+
 /**
  * Blocks
  * - These styles replace key Gutenberg Block styles for fonts, colors, and

diff --git a/antonia/readme.txt b/antonia/readme.txt
@@ -12,6 +12,12 @@ Antonia is a theme for selling products with the help of payments block.
 
 == Changelog ==
 
+= 0.0.4 =
+* Typography fixes (#6260)
+
+= 0.0.3 =
+* Migrate antonia fonts to new Blockbase format (#6268)
+
 = 0.0.2 =
 * Update theme url (#6076)
 

diff --git a/antonia/style.css b/antonia/style.css
@@ -7,7 +7,7 @@ Description: Antonia is a theme for selling products with the help of payments b
 Requires at least: 5.8
 Tested up to: 5.9
 Requires PHP: 5.7
-Version: 0.0.2
+Version: 0.0.4
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/antonia/theme.json b/antonia/theme.json
@@ -11,13 +11,15 @@
 		"blocks": {
 			"core/heading": {
 				"typography": {
+                    			"fontFamily": "var:preset|font-family|dm-sans",
 					"fontStyle": "normal",
-					"lineHeight": "1.4",
-					"fontWeight": "300"
+					"lineHeight": "1.3",
+					"fontWeight": "700"
 				}
 			},
 			"core/post-title": {
 				"typography": {
+                    			"fontFamily": "var:preset|font-family|dm-sans",
 					"lineHeight": "1.4"
 				}
 			},
@@ -28,6 +30,7 @@
 			}
 		},
 		"typography": {
+            		"fontFamily": "var:preset|font-family|inter",
 			"fontStyle": "normal",
 			"fontWeight": "400",
 			"fontSize": "var:preset|font-size|small"
@@ -69,24 +72,6 @@
 					"name": "Tertiary"
 				}
 			]
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Inter\", sans-serif",
-					"slug": "body-font",
-					"name": "Body (Inter)",
-					"google": "family=Inter:wght@100..900",
-					"fontSlug": "inter"
-				},
-				{
-					"fontFamily": "\"DM Sans\", sans-serif",
-					"slug": "heading-font",
-					"name": "Heading (DM Sans)",
-					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700",
-					"fontSlug": "dm-sans"
-				}
-			]
 		}
 	}
 }
diff --git a/appleton/readme.txt b/appleton/readme.txt
@@ -12,6 +12,9 @@ Appleton is a theme for creative professionals, such as photographers, designers
 
 == Changelog ==
 
+= 0.0.5 =
+* Blockbase 3 (#6167)
+
 = 0.0.4 =
 * Appleton: Fix case on screenshot.png file. (#6051)
 

diff --git a/appleton/style.css b/appleton/style.css
@@ -7,7 +7,7 @@ Description: Appleton is a theme for creative professionals, such as photographe
 Requires at least: 5.8
 Tested up to: 5.9
 Requires PHP: 5.7
-Version: 0.0.4
+Version: 0.0.5
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/appleton/theme.json b/appleton/theme.json
@@ -28,6 +28,7 @@
 			}
 		},
 		"typography": {
+			"fontFamily": "var:preset|font-family|inter",
 			"fontStyle": "normal",
 			"fontWeight": "400",
 			"fontSize": "var:preset|font-size|small"
@@ -74,24 +75,6 @@
 					"name": "Tertiary"
 				}
 			]
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Inter\", sans-serif",
-					"slug": "body-font",
-					"name": "Body (Inter)",
-					"google": "family=Inter:wght@100..900",
-					"fontSlug": "inter"
-				},
-				{
-					"fontFamily": "\"Inter\", sans-serif",
-					"slug": "heading-font",
-					"name": "Heading (Inter)",
-					"google": "family=Inter:wght@100..900",
-					"fontSlug": "inter"
-				}
-			]
 		}
 	}
 }
diff --git a/arbutus/block-templates/page.html b/arbutus/block-templates/page.html
@@ -3,7 +3,7 @@
 <!-- wp:group {"tagName":"main"} -->
 <main class="wp-block-group"><!-- wp:post-featured-image {"align":"full"} /-->
 
-<!-- wp:post-content {"layout":{"inherit":true}} /--></main>
+<!-- wp:post-content {"layout":{"inherit":true},"lock":{"move":false,"remove":true}} /--></main>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":40} -->

diff --git a/arbutus/block-templates/single.html b/arbutus/block-templates/single.html
@@ -7,7 +7,7 @@
 <div class="wp-block-group" style="padding-top:20px;padding-bottom:0px"><!-- wp:post-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.3"}},"textColor":"primary"} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
+<!-- wp:post-content {"layout":{"inherit":true},"lock":{"move":false,"remove":true}} /-->
 
 <!-- wp:template-part {"slug":"post-meta-icons"} /-->
 </main>
@@ -18,7 +18,7 @@
 <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:post-comments /--></div>
+<!-- wp:pattern {"slug":"blockbase/comments"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/arbutus/readme.txt b/arbutus/readme.txt
@@ -12,6 +12,12 @@ Arbutus is a simple blogging theme that supports full-site editing. It comes wit
 
 == Changelog ==
 
+= 0.0.15 =
+* Blockbase: Locked post content blocks  (#6299)
+
+= 0.0.14 =
+* Blockbase 3 (#6167)
+
 = 0.0.13 =
 * Update all /pub themes so the theme-uri points to `https://wordpress.com/theme/<slug>` (#6033)
 

diff --git a/arbutus/style.css b/arbutus/style.css
@@ -7,7 +7,7 @@ Description: Arbutus is a simple blogging theme that supports full-site editing.
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 0.0.13
+Version: 0.0.15
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/arbutus/theme.json b/arbutus/theme.json
@@ -45,24 +45,6 @@
 			"gap": {
 				"vertical": "min(40px, 5vw)"
 			}
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "\"Roboto\", sans-serif",
-					"fontSlug": "roboto",
-					"slug": "body-font",
-					"name": "Body (Roboto)",
-					"google": "family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,800;1,900"
-				},
-				{
-					"fontFamily": "\"Roboto\", sans-serif",
-					"fontSlug": "roboto",
-					"slug": "heading-font",
-					"name": "Headings (Roboto)",
-					"google": "family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,800;1,900"
-				}
-			]
 		}
 	},
 	"styles": {
@@ -82,6 +64,9 @@
 					"fontSize": "48px"
 				}
 			}
+		},
+		"typography": {
+			"fontFamily": "var:preset|font-family|roboto"
 		}
 	}
 }
diff --git a/archeo/readme.txt b/archeo/readme.txt
@@ -12,6 +12,9 @@ A theme inspired by Mayan history and culture.
 
 == Changelog ==
 
+= 1.0.13 =
+* Fix/missing tags (#6303)
+
 = 1.0.12 =
 * [Test] Archeo link interactivity states (#6101)
 

diff --git a/archeo/style.css b/archeo/style.css
@@ -7,11 +7,11 @@ Description: A theme inspired by Mayan history and culture
 Requires at least: 5.8
 Tested up to: 5.9
 Requires PHP: 5.7
-Version: 1.0.12
+Version: 1.0.13
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: archeo
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage, blog-homepage
 
 Archeo WordPress Theme, (C) 2022 Automattic, Inc.
 Archeo is distributed under the terms of the GNU GPL.

diff --git a/attar/readme.txt b/attar/readme.txt
@@ -12,6 +12,9 @@ Attar is a minimal, product-oriented theme.
 
 == Changelog ==
 
+= 0.0.4 =
+* Blockbase 3 (#6167)
+
 = 1.0.0 =
 * Initial release
 

diff --git a/attar/style.css b/attar/style.css
@@ -7,7 +7,7 @@ Description: Attar is a minimal, product-oriented theme.
 Requires at least: 5.9
 Tested up to: 5.9
 Requires PHP: 5.7
-Version: 0.0.3
+Version: 0.0.4
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/attar/theme.json b/attar/theme.json
@@ -17,24 +17,6 @@
                 }
             ]
         },
-        "typography": {
-            "fontFamilies": [
-                {
-                    "fontFamily": "\"Inter\", sans-serif",
-                    "slug": "body-font",
-                    "name": "Body (Inter)",
-                    "google": "family=Inter:wght@100..900",
-                    "fontSlug": "inter"
-                },
-                {
-                    "fontFamily": "\"DM Sans\", sans-serif",
-                    "slug": "heading-font",
-                    "name": "Heading (DM Sans)",
-                    "google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700\"",
-                    "fontSlug": "dm-sans"
-                }
-            ]
-        },
         "custom": {
             "color": {
                 "foreground": "var(--wp--preset--color--foreground)",
@@ -44,5 +26,22 @@
                 "tertiary": "var(--wp--preset--color--background)"
             }
         }
+    },
+    "styles": {
+        "blocks": {
+            "core/heading": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|dm-sans"
+                }
+            },
+            "core/post-title": {
+                "typography": {
+			        "fontFamily": "var:preset|font-family|dm-sans"
+                }
+            }
+        },
+        "typography": {
+			"fontFamily": "var:preset|font-family|inter"
+        }
     }
 }
diff --git a/balasana/package.json b/balasana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "balasana",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "Balasana",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

diff --git a/balasana/sass/style-child-theme.scss b/balasana/sass/style-child-theme.scss
@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.18
+Version: 1.3.19
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia