Merge branch 'trunk' into automate-changelogs-and-versions

# Conflicts:
#	videomaker/package-lock.json
#	videomaker/package.json

blockbase/README.md

@@ -1,20 +1,25 @@
 # About Blockbase
+
 The purpose of Blockbase is to provide a "ponyfill" that allows for 100% "configuration expression" of design.  Any aspect of configurable design that Gutenberg does not yet take into account is expressed in theme.json 'custom' properties.
 
 The goal is for the ponyfill styling to reflect what Gutenberg will style, from a given configuration, once that work is complete.
 
+Follow Blockbase development over at [https://blockbasetheme.com/blog/](https://blockbasetheme.com/blog/)
+
 ## Building
+
 Blockbase uses SCSS to compile the CSS used to ponyfill Gutenberg.  Building Blockbase isn't necessary to use it - either as a theme or as a parent theme - but making changes does require the .scss file to be recompiled.
 The easist way to do so is to use `node` to install and run the necessary dependencies via `npm install`. 
 Then after making changes to the *.scss files run `npm run build` to compile.
 You can use `npm start` and it will be in 'watch mode' recompiling the .scss files any time any changes are made.
+
 ## Creating a Blockbase child theme the easy way
 
-Use the [Create Blockbase Theme](https://github.com/Automattic/create-blockbase-theme) utility.
+Use the [Create Blockbase Theme](https://github.com/Automattic/create-blockbase-theme) plugin.
 
 Install Blockbase (or any Blockbase child)
 Use the Customizer and/or Full Site Editor to tweak the design to your liking.
-Install the Create Blockbase Theme utility 
+Install the Create Blockbase Theme plugin 
 Use it to export a new child theme of Blockbase.
 
 ## Creating a Blockbase child theme manually
@@ -61,9 +66,11 @@ The `theme.json` file defines the look and feel of your theme; colors, fonts, sp
 Simple themes will be able to define everything they need using only a theme.json file, but for more complex themes, an additional CSS file can be useful. Blockbase uses node to compile SCSS files.  You may want your child theme to take advantage of the same utilities, but child themes do not need to be built with using any build tools.
 
 ## `functions.php` and `theme.css`
+
 Blockbase will load a theme.css file for each of its children. This file lives at childtheme/assets/theme.css. You may wish to add a functions.php file to add block styles or patterns to your theme, but it's not necessary.
 
 Together these files should give you a strong foundation for a Blockbase child theme.
 
 ## Keeping up to date
+
 Blockbase child themes are in a strong position to keep in step with Full Site Editing changes, while being usable in production now. However they do come with a maintenance burden. As Full Site Editing matures, Blockbase will continue to change with it; Blockbase child themes will need to be kept up to date with these developments so that they can take advantage of the new features.

blockbase/block-templates/index.html

@@ -30,4 +30,4 @@
 </main>
 <!-- /wp:query -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->

blockbase/readme.txt

@@ -15,6 +15,7 @@ Blockbase is a simple theme that supports full-site editing. It comes with a set
 == About Blockbase ==
 
 For more information see our README.md file.
+Read the release notes at https://blockbasetheme.com/category/release-notes/
 
 == Changelog ==
 

blockbase/sass/blocks/_navigation.scss

@@ -35,6 +35,7 @@
 		.wp-block-navigation-item {
 			align-items: flex-start;
 		}
+
 		.wp-block-navigation__responsive-container-content .has-child { // Needed for specificity to beat the navigation block CSS
 			.wp-block-navigation__submenu-container {
 				font-size: var(--wp--preset--font-size--normal);

blockbase/theme.json

@@ -535,7 +535,7 @@
 					"fontFamily": "var(--wp--preset--font-family--heading-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
-					"fontSize": "32px"
+					"fontSize": "var(--wp--preset--font-size--huge)"
 				},
 				"spacing": {
 					"margin": {

russell/block-template-parts/footer.html

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

videomaker/assets/theme.css

@@ -103,12 +103,19 @@ div.post-meta a {
 	align-items: flex-end;
 }
 
+.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container {
+	font-size: var(--wp--preset--font-size--large);
+	font-weight: 200;
+}
+
 .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__container {
 	row-gap: 1rem;
 }
 
 .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content {
 	align-items: flex-start;
+	margin: 0 auto;
+	max-width: 800px;
 }
 
 .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .wp-block-navigation-item {
@@ -124,13 +131,18 @@ div.post-meta a {
 }
 
 .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content {
-	justify-content: space-between;
+	flex-wrap: nowrap;
+	justify-content: center;
 }
 
 .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container ul.wp-block-social-links {
 	padding-bottom: calc( var(--wp--custom--gap--vertical) * 2);
 }
 
+.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .has-child .wp-block-navigation__submenu-container {
+	font-size: var(--wp--preset--font-size--medium);
+}
+
 footer > .wp-block-group {
 	align-items: center;
 	justify-content: space-between;

videomaker/block-template-parts/header.html

@@ -7,6 +7,6 @@
 		<!-- wp:site-tagline /-->
 	</div>
 	<!-- /wp:group -->
-	<!-- wp:navigation {"overlayMenu":"always","__unstableLocation":"primary","className":"is-style-blockbase-navigation-improved-responsive","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->
+	<!-- wp:navigation {"overlayMenu":"always","__unstableLocation":"primary","__unstableSocialLinks":"social","className":"is-style-blockbase-navigation-improved-responsive","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->
 </header>
 <!-- /wp:group -->

videomaker/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "videomaker",
-  "version": "0.0.38",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

videomaker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "videomaker",
-  "version": "0.0.38",
+  "version": "1.0.0",
   "description": "",
   "main": "style.css",
   "devDependencies": {

videomaker/readme.txt

@@ -36,9 +36,24 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
-Videomaker uses the following resources created by XXX:
+Videomaker uses the following resources:
 
+Videos
 License: CC0
-Source: ???
-
-Used in block patterns.
+Source: https://www.pexels.com/video/video-of-school-of-fish-854012/
+		https://www.pexels.com/video/watercrafts-docked-853917/
+		https://www.pexels.com/video/boats-floating-at-the-sea-853856/
+		https://www.pexels.com/video/man-working-during-dawn-854069/
+		https://www.pexels.com/video/mixing-cocktail-drinks-854128/
+		https://www.pexels.com/video/black-and-white-video-of-busy-street-854141/
+
+Images
+License: CC0
+Source: https://pxhere.com/en/photo/559804
+		https://stocksnap.io/photo/people-hands-91UQMKOMCW
+		https://stocksnap.io/photo/camera-lens-0RG77S4ZNE
+		https://stocksnap.io/photo/people-man-NSV3ZCAJXT
+		https://stocksnap.io/photo/people-man-6O7JXC5DC5
+		https://stocksnap.io/photo/camera-gopro-IOO3SM5ZEH
+
+Included in theme screenshot and in block patterns.

videomaker/sass/_navigation.scss

@@ -5,12 +5,17 @@
 
 .wp-block-navigation.is-style-blockbase-navigation-improved-responsive {
 	&.is-responsive .is-menu-open.wp-block-navigation__responsive-container {
+		font-size: var(--wp--preset--font-size--large);
+		font-weight: 200;
+
 		.wp-block-navigation__container {
 			row-gap: 1rem;
 		}
 
 		.wp-block-navigation__responsive-container-content { // Needed for specificity to beat the navigation block CSS
 			align-items: flex-start;
+			margin: 0 auto;
+			max-width: 800px; // This should match the content width
 
 			.wp-block-navigation-item {
 				row-gap: 0rem;
@@ -25,10 +30,17 @@
 			}
 		}
 		.wp-block-navigation__responsive-container-content {
-			justify-content: space-between;
+			flex-wrap: nowrap;
+			justify-content: center;
 		}
 		ul.wp-block-social-links {
 			padding-bottom: calc( var(--wp--custom--gap--vertical) * 2 );
 		}
+
+		.wp-block-navigation__responsive-container-content .has-child { // Needed for specificity to beat the navigation block CSS
+			.wp-block-navigation__submenu-container {
+				font-size: var(--wp--preset--font-size--medium);
+			}
+		}
 	}
 }

videomaker/style.css

@@ -7,7 +7,7 @@ Description: Videomaker is a free, minimalistic WordPress theme ideal for film d
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 0.0.37
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase