Merge 'master' into pr/255, resolve conflict.

.travis.yml

@@ -50,6 +50,8 @@ before_script:
     - theme_slug=$(basename $(pwd))
     - theme_dir=$WP_DEVELOP_DIR/src/wp-content/themes/$theme_slug
     - cd ..
+    # Avoid conflict with stock twentynineteen theme
+    - if [ -d $theme_dir ]; then rm -r $theme_dir; fi
     - mv $theme_slug $theme_dir
     # Set up WordPress configuration.
     - cd $WP_DEVELOP_DIR

404.php

@@ -6,28 +6,28 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 get_header();
 ?>
 
-	<div id="primary" class="content-area">
+	<section id="primary" class="content-area">
 		<main id="main" class="site-main">
 
-			<section class="error-404 not-found">
+			<div class="error-404 not-found">
 				<header class="page-header">
 					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'twentynineteen' ); ?></h1>
 				</header><!-- .page-header -->
 
 				<div class="page-content">
 					<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentynineteen' ); ?></p>
-
 					<?php get_search_form(); ?>
 				</div><!-- .page-content -->
-			</section><!-- .error-404 -->
+			</div><!-- .error-404 -->
 
 		</main><!-- #main -->
-	</div><!-- #primary -->
+	</section><!-- #primary -->
 
 <?php
 get_footer();

CONTRIBUTORS.md

@@ -1,24 +1,52 @@
-WordPress.org Contributor Usernames
+# Contributor Usernames
 
 Version 1.0:
 
-@allancole
-@karmatosed
-@kjellr
-@yingling017
-@mrasharirfan
-@milana_cap
-@fabiankaegy
-@westonruter
-@aaronjorbin
-@netweb
-@b-07
-@khleomix
-@audrasjb
-@nielslange
-@mmaumio
-@richsalvucci
-@littlebigthing
-@dimadin
-@joyously
-@anevins12
+| GitHub Username | WordPress.org Username|
+| --------------- | --------------------- |
+| @allancole | @allancole |
+| @karmatosed | @karmatosed |
+| @kjellr | @kjellr |
+| @yingling017 | @yingling017 |
+| @mrasharirfan | @mrasharirfan |
+| @milana_cap | @milana_cap |
+| @fabiankaegy | @fabiankaegy |
+| @westonruter | @westonruter |
+| @aaronjorbin | @jorbin |
+| @ntwb | @netweb |
+| @b-07 | @b-07 |
+| @khleomix | @khleomix |
+| @audrasjb | @audrasjb |
+| @nielslange | @nielslange |
+| @mmaumio | @mmaumio |
+| @richsalvucci | @richsalvucci |
+| @littlebigthing | @littlebigthing |
+| @dimadin | @dimadin |
+| @joyously | @joyously |
+| @anevins12 | @anevins |
+| @peterwilsoncc | @peterwilsoncc |
+| @DannyCooper | @dannycooper |
+| @iCaleb | @icaleb |
+| @siriokun | @siriokun |
+| @briannaorg | @technosiren |
+| @00travelgirl00 | @travel_girl |
+| @shahjehanali1 | @azchughtai |
+| @ianbelanger79 | @ianbelanger |
+| @nadim1992 | |
+| @ismail-elkorchi | @ismailelkorchi |
+| @nativeinside | |
+| @iamchetanp  | @chetan200891 |
+| @icaleb | @icaleb |
+| @grappler | @grapplerulrich |
+| @ocean90 | @ocean90 |
+| @joshfeck | |
+| @frankew | |
+| @abdulwahab610 | @abdulwahab610 |
+| @mendezcode | @mendezcode |
+| @eliorivero | @eliorivero |
+| @melchoyce | @melchoyce |
+| @jasmussen | @joen |
+| @laurelfulford | @laurelfulford |
+| @mdawaffe | @mdawaffe |
+| @kraftbj | @kraftbj |
+| @dereksmart | @dsmart |

README.md

@@ -23,11 +23,11 @@ Twenty Nineteen is a Gutenberg-ready theme for WordPress.
 4. Go to https://codex.wordpress.org/Twenty_Nineteen for a guide on how to customize this theme.
 5. Navigate to Appearance > Customize in your admin panel and customize to taste.
 
- 
+
 ## Copyright
 
 Twenty Nineteen WordPress Theme, Copyright 2018 WordPress.org
-Twenty Nineteen is distributed under the terms of the GNU GPL
+Twenty Nineteen is distributed under the terms of the GNU GPL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

archive.php

@@ -6,12 +6,13 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 get_header();
 ?>
 
-	<div id="primary" class="content-area">
+	<section id="primary" class="content-area">
 		<main id="main" class="site-main">
 
 		<?php if ( have_posts() ) : ?>
@@ -34,7 +35,7 @@
 				 * 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( 'template-parts/content/content' );
+				get_template_part( 'template-parts/content/content', 'excerpt' );
 
 				// End the loop.
 			endwhile;
@@ -50,7 +51,7 @@
 		?>
 
 		</main><!-- .site-main -->
-	</div><!-- .content-area -->
+	</section><!-- .content-area -->
 
 <?php
 get_footer();

classes/class-twentynineteen-svg-icons.php

@@ -4,6 +4,7 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 /**
@@ -32,7 +33,7 @@ public static function get_svg( $group, $icon, $size ) {
 			$arr = array();
 		}
 		if ( array_key_exists( $icon, $arr ) ) {
-			$repl = sprintf( '<svg id="%s-icon-%s" class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" ', $group, $icon, $size, $size );
+			$repl = sprintf( '<svg class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" focusable="false" ', $size, $size );
 			$svg  = preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.
 			$svg  = preg_replace( "/([\n\t]+)/", ' ', $svg ); // Remove newlines & tabs.
 			$svg  = preg_replace( '/>\s*</', '><', $svg ); // Remove white space between SVG tags.
@@ -70,14 +71,14 @@ public static function get_social_link_svg( $uri, $size ) {
 	 * @var array
 	 */
 	static $ui_icons = array(
-		'link'          => /* material-design – link */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'link'                   => /* material-design – link */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <path d="M0 0h24v24H0z" fill="none"/>
     <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/>
 </svg>',
 
-		'watch'         => /* material-design – watch-later */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'watch'                  => /* material-design – watch-later */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <defs>
         <path id="a" d="M0 0h24v24H0V0z"/>
     </defs>
@@ -87,68 +88,68 @@ public static function get_social_link_svg( $uri, $size ) {
     <path clip-path="url(#b)" d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zm4.2 14.2L11 13V7h1.5v5.2l4.5 2.7-.8 1.3z"/>
 </svg>',
 
-		'archive'       => /* material-design – folder */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'archive'                => /* material-design – folder */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/>
     <path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'tag' => /* material-design – local_offer */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'tag'                    => /* material-design – local_offer */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<path d="M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z"/>
 	<path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'comment' => /* material-design – comment */ '
+		'comment'                => /* material-design – comment */ '
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <path d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4-.01-18z"/>
     <path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'person'        => /* material-design – person */ '
+		'person'                 => /* material-design – person */ '
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
     <path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'edit'          => /* material-design – edit */ '
+		'edit'                   => /* material-design – edit */ '
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
     <path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'chevron_left'  => /* material-design – chevron_left */ '
+		'chevron_left'           => /* material-design – chevron_left */ '
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
     <path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'chevron_right' => /* material-design – chevron_right */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'chevron_right'          => /* material-design – chevron_right */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
     <path d="M0 0h24v24H0z" fill="none"/>
 </svg>',
 
-		'check'         => /* material-design – check */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'check'                  => /* material-design – check */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <path d="M0 0h24v24H0z" fill="none"/>
     <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
 </svg>',
 
 		'arrow_drop_down_circle' => /* material-design – arrow_drop_down_circle */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<path d="M0 0h24v24H0z" fill="none"/>
 	<path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 12l-4-4h8l-4 4z"/>
 </svg>',
 
-		'keyboard_arrow_down' => /* material-design – keyboard_arrow_down */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'keyboard_arrow_down'    => /* material-design – keyboard_arrow_down */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/>
 	<path fill="none" d="M0 0h24v24H0V0z"/>
 </svg>',
 
-		'keyboard_arrow_right' => /* material-design – keyboard_arrow_right */ '
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+		'keyboard_arrow_right'   => /* material-design – keyboard_arrow_right */ '
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<path d="M10 17l5-5-5-5v10z"/>
 	<path fill="none" d="M0 24V0h24v24H0z"/>
 </svg>',

classes/class-twentynineteen-walker-comment.php

@@ -4,6 +4,7 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 /**
@@ -54,7 +55,7 @@ protected function html5_comment( $comment, $depth, $args ) {
 
 							/* translators: %s: comment author link */
 							printf(
-								__( '%s <span class="screen-reader-text says">says:</span>' ),
+								__( '%s <span class="screen-reader-text says">says:</span>', 'twentynineteen' ),
 								sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
 							);
 						?>
@@ -69,12 +70,12 @@ protected function html5_comment( $comment, $depth, $args ) {
 						</a>
 						<?php
 							$edit_comment_icon = twentynineteen_get_icon_svg( 'edit', 16 );
-							edit_comment_link( __( 'Edit' ), '<span class="edit-link-sep">&mdash;</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
+							edit_comment_link( __( 'Edit', 'twentynineteen' ), '<span class="edit-link-sep">&mdash;</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
 						?>
 					</div><!-- .comment-metadata -->
 
 					<?php if ( '0' == $comment->comment_approved ) : ?>
-					<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
+					<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentynineteen' ); ?></p>
 					<?php endif; ?>
 				</footer><!-- .comment-meta -->
 

comments.php

@@ -9,6 +9,7 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 /*
@@ -84,17 +85,6 @@
 		</ol><!-- .comment-list -->
 		<?php
 
-		// Show comment form at bottom if showing newest comments at the bottom.
-		if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
-			?>
-			<div class="comment-form-flex">
-				<span class="screen-reader-text"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></span>
-				<?php twentynineteen_comment_form( 'asc' ); ?>
-				<h2 class="comments-title" aria-hidden="true"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></h2>
-			</div>
-			<?php
-		endif;
-
 		// Show comment navigation
 		if ( have_comments() ) :
 			$prev_icon     = twentynineteen_get_icon_svg( 'chevron_left', 22 );
@@ -108,6 +98,17 @@
 			);
 		endif;
 
+		// Show comment form at bottom if showing newest comments at the bottom.
+		if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
+			?>
+			<div class="comment-form-flex">
+				<span class="screen-reader-text"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></span>
+				<?php twentynineteen_comment_form( 'asc' ); ?>
+				<h2 class="comments-title" aria-hidden="true"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></h2>
+			</div>
+			<?php
+		endif;
+
 		// If comments are closed and there are comments, let's leave a little note, shall we?
 		if ( ! comments_open() ) :
 			?>

footer.php

@@ -8,6 +8,7 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 ?>
@@ -16,7 +17,9 @@
 
 	<footer id="colophon" class="site-footer">
 		<div class="site-info">
-			<a class="site-name" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>,
+			<?php if ( ! empty( get_bloginfo( 'name' ) ) ) : ?>
+				<a class="site-name" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>,
+			<?php endif; ?>
 			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentynineteen' ) ); ?>" class="imprint">
 				<?php printf( __( 'Proudly powered by %s', 'twentynineteen' ), 'WordPress' ); ?>.
 			</a>

functions.php

@@ -6,6 +6,7 @@
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 if ( ! function_exists( 'twentynineteen_setup' ) ) :