Rebase trunk.

altofocus/index.php

@@ -31,18 +31,20 @@ get_header(); ?>
 			$feautured_id_array = altofocus_get_featured_post_ids();
 
 			/* Start the Loop */
-			while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 
-				/*
-				 * Include the Post-Format-specific template for the content.
-				 * If you want to override this in a child theme, then include a file
-				 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-				 */
-				get_template_part( 'components/post/content', get_post_format() );
+			/*
+			 * Include the Post-Format-specific template for the content.
+			 * If you want to override this in a child theme, then include a file
+			 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+			 */
+			get_template_part( 'components/post/content', get_post_format() );
 
 			endwhile;
 
-			the_posts_navigation(); ?>
+			the_posts_navigation();
+		?>
 
 		</main>
 
@@ -58,5 +60,5 @@ get_header(); ?>
 
 	</div>
 <?php
-// get_sidebar();
+get_sidebar();
 get_footer();

altofocus/page.php

@@ -18,7 +18,8 @@ get_header(); ?>
 		<main id="main" class="site-main" role="main">
 
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'components/page/content', 'page' );
 
@@ -34,4 +35,4 @@ get_header(); ?>
 		</main>
 	</div>
 <?php
-get_footer();
+get_footer();

altofocus/style.css

@@ -5,7 +5,7 @@ Theme URI: https://wordpress.com/themes/altofocus/
 Author: Automattic, Inc
 Author URI: http://automattic.com
 Description: AltoFocus is a theme for photographers, artists, and other creative types in search of a simple and easy way to display their work.
-Version: 1.0.9-wpcom
+Version: 1.0.10-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: altofocus

barnsbury/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "barnsbury",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

barnsbury/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barnsbury",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "description": "Barnsbury",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

barnsbury/sass/_extra-child-theme.scss

@@ -72,6 +72,13 @@ a {
 			margin-top: 0;
 			margin-bottom: 0;
 		}
+
+		&.has-logo:not(.has-title-and-tagline) {
+			grid-template-areas:
+				"site-logo main-navigation"
+				"site-logo social-navigation";
+		}
+
 	}
 
 	.site-logo {

barnsbury/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.2.9
+Version: 1.2.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

barnsbury/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.2.9
+Version: 1.2.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -4046,6 +4046,9 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 		margin-top: 0;
 		margin-bottom: 0;
 	}
+	.site-header.has-logo:not(.has-title-and-tagline) {
+		grid-template-areas: "site-logo main-navigation" "site-logo social-navigation";
+	}
 	.site-logo {
 		grid-area: site-logo;
 		margin-bottom: 16px;

barnsbury/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.2.9
+Version: 1.2.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -4075,6 +4075,9 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 		margin-top: 0;
 		margin-bottom: 0;
 	}
+	.site-header.has-logo:not(.has-title-and-tagline) {
+		grid-template-areas: "site-logo main-navigation" "site-logo social-navigation";
+	}
 	.site-logo {
 		grid-area: site-logo;
 		margin-bottom: 16px;

illustratr/style.css

@@ -4,7 +4,7 @@ Theme URI: https://wordpress.com/themes/illustratr/
 Author: Automattic
 Author URI: https://wordpress.com/themes/
 Description: A minimalist portfolio theme.
-Version: 1.3.8-wpcom
+Version: 1.3.9-wpcom
 License: GNU General Public License
 License URI: license.txt
 Text Domain: illustratr
@@ -785,28 +785,12 @@ Alignments
 	float: left;
 	margin: 20px 40px 20px 0;
 }
-@media screen and (min-width: 1220px) {
-	.alignleft {
-		margin-left: -130px;
-	}
-	.alignleft + .alignleft {
-		margin-left: 0;
-	}
-}
 
 .alignright {
 	display: inline;
 	float: right;
 	margin: 20px 0 20px 40px;
 }
-@media screen and (min-width: 1220px) {
-	.alignright {
-		margin-right: -130px;
-	}
-	.alignright + .alignright {
-		margin-right: 0;
-	}
-}
 
 .aligncenter {
 	clear: both;

package-dotorg.sh

@@ -2,7 +2,8 @@
 if [[ "$1" != "" ]]; then
     THEME="$1"
 	find $THEME/assets/sass/*.scss -type f -exec sed -i '' 's/-wpcom//g' {} \; 
-	find $THEME/assets/sass/*.scss -type f -exec sed -i '' 's/auto-loading-homepage, //g' {} \; 
+	find $THEME/assets/sass/*.scss -type f -exec sed -i '' 's/, auto-loading-homepage//g' {} \; 
+	find $THEME/assets/sass/*.scss -type f -exec sed -i '' 's/, jetpack-global-styles//g' {} \; 
 	cd $THEME && npm run build;
 	mkdir $THEME;
 	rsync -avz --exclude $THEME --exclude-from '../dotorg-exclude.txt' ./ $THEME

seedlet/archive.php

@@ -18,7 +18,7 @@ get_header();
 
 			<header class="page-header default-max-width">
 				<?php
-					the_archive_title( '<h1 class="page-title">', '</h1>' );
+					the_archive_title();
 				?>
 			</header><!-- .page-header -->
 

seedlet/assets/sass/style.scss

@@ -4,7 +4,7 @@ Theme URI: https://wordpress.com/theme/seedlet
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Seedlet is a free WordPress theme. A two-column layout and classically elegant typography creates a refined site that gives your works and images space to breathe - and shine. Seedlet was built to be the perfect partner to the block editor, and supports all the latest blocks. Writing, audio, illustrations, photography, video - use Seedlet to engage and direct visitors' eyes, without your theme getting in the way. And the responsive design shifts naturally between desktop and mobile devices. Seedlet is a great option for professionals and creatives looking for a sophisticated vibe. Whether you're looking to create a blog or a robust site promoting your business, do with simplicity, style, and Seedlet.
-Requires at least: 4.9.6
+Requires at least: 5.4
 Tested up to: 5.5
 Requires PHP: 5.6.2
 Version: 1.1.4-wpcom

seedlet/functions.php

@@ -108,18 +108,11 @@ if ( ! function_exists( 'seedlet_setup' ) ) :
 
 		$editor_stylesheet_path = './assets/css/style-editor.css';
 
-		// Note, the is_IE global variable is defined by WordPress and is used
-		// to detect if the current browser is internet explorer.
-		global $is_IE;
-		if ( $is_IE ) {
-			$editor_stylesheet_path = './assets/css/ie-editor.css';
-		}
-
 		// Enqueue editor styles.
 		add_editor_style(
 			array(
 				seedlet_fonts_url(),
-				$editor_stylesheet_path,
+				'./assets/css/style-editor.css',
 			)
 		);
 

seedlet/inc/template-functions.php

@@ -75,37 +75,49 @@ add_filter( 'comment_form_defaults', 'seedlet_comment_form_defaults' );
 /**
  * Filters the default archive titles.
  */
-function seedlet_get_the_archive_title() {
+function seedlet_get_the_archive_title( $title, $original_title, $prefix ) {
 	if ( is_category() ) {
-		$title = __( 'Category Archives: ', 'seedlet' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
+		$prefix = '<span class="archive-prefix">' . __( 'Category Archives: ', 'seedlet' ) . '</span>';
+		$title  = '<span class="page-description">' . single_term_title( '', false ) . '</span>';
 	} elseif ( is_tag() ) {
-		$title = __( 'Tag Archives: ', 'seedlet' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
+		$prefix = '<span class="archive-prefix">' . __( 'Tag Archives: ', 'seedlet' ) . ' </span>';
+		$title  = '<span class="page-description">' . single_term_title( '', false ) . '</span>';
 	} elseif ( is_author() ) {
-		$title = __( 'Author Archives: ', 'seedlet' ) . '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
+		$prefix = '<span class="archive-prefix">' . __( 'Author Archives: ', 'seedlet' ) . ' </span>';
+		$title  = '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
 	} elseif ( is_year() ) {
-		$title = __( 'Yearly Archives: ', 'seedlet' ) . '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'seedlet' ) ) . '</span>';
+		$prefix = '<span class="archive-prefix">' . __( 'Yearly Archives: ', 'seedlet' ) . ' </span>';
+		$title  = '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'seedlet' ) ) . '</span>';
 	} elseif ( is_month() ) {
-		$title = __( 'Monthly Archives: ', 'seedlet' ) . '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'seedlet' ) ) . '</span>';
+		$prefix = '<span class="archive-prefix">' . __( 'Monthly Archives: ', 'seedlet' ) . ' </span>';
+		$title  = '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'seedlet' ) ) . '</span>';
 	} elseif ( is_day() ) {
-		$title = __( 'Daily Archives: ', 'seedlet' ) . '<span class="page-description">' . get_the_date() . '</span>';
+		$prefix = '<span class="archive-prefix">' . __( 'Daily Archives: ', 'seedlet' ) . ' </span>';
+		$title  = '<span class="page-description">' . get_the_date() . '</span>';
 	} elseif ( is_post_type_archive() ) {
-		$cpt = get_post_type_object( get_queried_object()->name );
+		$prefix = '';
+		$cpt    = get_post_type_object( get_queried_object()->name );
 		/* translators: %s: Post type singular name */
-		$title = sprintf( esc_html__( '%s Archives', 'seedlet' ),
+		$title = sprintf(
+			esc_html__( '%s Archives', 'seedlet' ),
 			$cpt->labels->singular_name
 		);
 	} elseif ( is_tax() ) {
-		$tax = get_taxonomy( get_queried_object()->taxonomy );
+		$prefix = '';
+		$tax    = get_taxonomy( get_queried_object()->taxonomy );
 		/* translators: %s: Taxonomy singular name */
-		$title = sprintf( esc_html__( '%s Archives', 'seedlet' ),
+		$title = sprintf(
+			esc_html__( '%s Archives', 'seedlet' ),
 			$tax->labels->singular_name
 		);
 	} else {
-		$title = __( 'Archives:', 'seedlet' );
+		$prefix = '';
+		$title  = '<span class="archive-prefix">' . __( 'Archives: ', 'seedlet' ) . ' </span>';
 	}
-	return $title;
+
+	return '<h1 class="page-title">' . $prefix . $title . '</h1>';
 }
-add_filter( 'get_the_archive_title', 'seedlet_get_the_archive_title' );
+add_filter( 'get_the_archive_title', 'seedlet_get_the_archive_title', 10, 3 );
 
 /**
  * Determines if post thumbnail can be displayed.

seedlet/style-rtl.css

@@ -4,7 +4,7 @@ Theme URI: https://wordpress.com/theme/seedlet
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Seedlet is a free WordPress theme. A two-column layout and classically elegant typography creates a refined site that gives your works and images space to breathe - and shine. Seedlet was built to be the perfect partner to the block editor, and supports all the latest blocks. Writing, audio, illustrations, photography, video - use Seedlet to engage and direct visitors' eyes, without your theme getting in the way. And the responsive design shifts naturally between desktop and mobile devices. Seedlet is a great option for professionals and creatives looking for a sophisticated vibe. Whether you're looking to create a blog or a robust site promoting your business, do with simplicity, style, and Seedlet.
-Requires at least: 4.9.6
+Requires at least: 5.4
 Tested up to: 5.5
 Requires PHP: 5.6.2
 Version: 1.1.4-wpcom

seedlet/style.css

@@ -4,7 +4,7 @@ Theme URI: https://wordpress.com/theme/seedlet
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Seedlet is a free WordPress theme. A two-column layout and classically elegant typography creates a refined site that gives your works and images space to breathe - and shine. Seedlet was built to be the perfect partner to the block editor, and supports all the latest blocks. Writing, audio, illustrations, photography, video - use Seedlet to engage and direct visitors' eyes, without your theme getting in the way. And the responsive design shifts naturally between desktop and mobile devices. Seedlet is a great option for professionals and creatives looking for a sophisticated vibe. Whether you're looking to create a blog or a robust site promoting your business, do with simplicity, style, and Seedlet.
-Requires at least: 4.9.6
+Requires at least: 5.4
 Tested up to: 5.5
 Requires PHP: 5.6.2
 Version: 1.1.4-wpcom

spearhead/assets/sass/style.scss

@@ -4,8 +4,10 @@ Theme URI: https://wordpress.com/theme/spearhead
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Share your podcast with the world using Spearhead.
-Requires at least: WordPress 5.4
-Version: 1.2.1
+Requires at least: 5.4
+Tested up to: 5.5
+Requires PHP: 5.6.2
+Version: 1.2.2
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: seedlet

spearhead/style-rtl.css

@@ -4,7 +4,9 @@ Theme URI: https://wordpress.com/theme/spearhead
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Share your podcast with the world using Spearhead.
-Requires at least: WordPress 5.4
+Requires at least: 5.4
+Tested up to: 5.5
+Requires PHP: 5.6.2
 Version: 1.2.2
 License: GNU General Public License v2 or later
 License URI: LICENSE

spearhead/style.css

@@ -4,7 +4,9 @@ Theme URI: https://wordpress.com/theme/spearhead
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Share your podcast with the world using Spearhead.
-Requires at least: WordPress 5.4
+Requires at least: 5.4
+Tested up to: 5.5
+Requires PHP: 5.6.2
 Version: 1.2.2
 License: GNU General Public License v2 or later
 License URI: LICENSE