From 1ad81b49093bdefb56eb58f50be3dc098f940883 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 8 Sep 2017 18:13:43 +0000
Subject: [PATCH 01/62] Bundled Themes: Remove "called called" and "can can"
 dittography.

Props johnpgreen.
Fixes #41836.
Built from https://develop.svn.wordpress.org/trunk@41349


git-svn-id: http://core.svn.wordpress.org/trunk@41182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php  | 2 +-
 category.php | 2 +-
 tag.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/archive.php b/archive.php
index f71ecf90e..78314cfb8 100644
--- a/archive.php
+++ b/archive.php
@@ -42,7 +42,7 @@ get_header(); ?>
 			while ( have_posts() ) : the_post();
 
 				/* Include the post format-specific template for the content. If you want to
-				 * this in a child theme then include a file called called content-___.php
+				 * this in a child theme then include a file called content-___.php
 				 * (where ___ is the post format) and that will be used instead.
 				 */
 				get_template_part( 'content', get_post_format() );
diff --git a/category.php b/category.php
index 02f132605..458063066 100644
--- a/category.php
+++ b/category.php
@@ -30,7 +30,7 @@ get_header(); ?>
 			while ( have_posts() ) : the_post();
 
 				/* Include the post format-specific template for the content. If you want to
-				 * this in a child theme then include a file called called content-___.php
+				 * this in a child theme then include a file called content-___.php
 				 * (where ___ is the post format) and that will be used instead.
 				 */
 				get_template_part( 'content', get_post_format() );
diff --git a/tag.php b/tag.php
index 1742df4ad..7715302ca 100644
--- a/tag.php
+++ b/tag.php
@@ -31,7 +31,7 @@ get_header(); ?>
 
 				/*
 				 * Include the post format-specific template for the content. If you want to
-				 * this in a child theme then include a file called called content-___.php
+				 * this in a child theme then include a file called content-___.php
 				 * (where ___ is the post format) and that will be used instead.
 				 */
 				get_template_part( 'content', get_post_format() );

From 03ef2f7d056bd8ed729b806533dbbee4d97bb92d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 4 Oct 2017 23:53:47 +0000
Subject: [PATCH 02/62] Bundled Themes: Change tag cloud format to a list
 (`<ul>`) for better semantics and accessibility.

List markup allows screen reader users to know in advance how many tags are within the list.

Props xkon, davidakennedy.
Fixes #40138.
Built from https://develop.svn.wordpress.org/trunk@41756


git-svn-id: http://core.svn.wordpress.org/trunk@41590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 20 ++++++++++++++++++++
 style.css     | 15 ++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index 2dc2cd8bd..68d44aaed 100644
--- a/functions.php
+++ b/functions.php
@@ -559,3 +559,23 @@ function twentytwelve_customize_preview_js() {
 	wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20141120', true );
 }
 add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
+
+
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Twelve 2.4
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentytwelve_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentytwelve_widget_tag_cloud_args' );
diff --git a/style.css b/style.css
index dd5dffbb3..0a6329c09 100644
--- a/style.css
+++ b/style.css
@@ -1450,6 +1450,20 @@ a.comment-edit-link:hover {
 	display: block;
 	text-align: right;
 }
+.tagcloud ul {
+	list-style-type: none;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+}
+
+.widget-area .widget.widget_tag_cloud li {
+	line-height: 1;
+}
+.template-front-page .widget-area .widget.widget_tag_cloud li {
+	margin: 0;
+}
 
 /* =Plugins
 ----------------------------------------------- */
@@ -1460,7 +1474,6 @@ img#wpstats {
 	margin: 0 auto 1.714285714rem;
 }
 
-
 /* =Media queries
 -------------------------------------------------------------- */
 

From 4b5c9c977728a056b22da41064dde5e6008d3f98 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 5 Oct 2017 00:02:48 +0000
Subject: [PATCH 03/62] Bundled Themes: Restore double line breaks before media
 queries.

See #40138.
Built from https://develop.svn.wordpress.org/trunk@41757


git-svn-id: http://core.svn.wordpress.org/trunk@41591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style.css b/style.css
index 0a6329c09..4e559ac27 100644
--- a/style.css
+++ b/style.css
@@ -1474,6 +1474,7 @@ img#wpstats {
 	margin: 0 auto 1.714285714rem;
 }
 
+
 /* =Media queries
 -------------------------------------------------------------- */
 

From 7fd6f21b3d449adafd01624e57b49a4862ceba62 Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Wed, 25 Oct 2017 02:17:47 +0000
Subject: [PATCH 04/62] Bundled Themes: Make sure new gallery widgets look good
 in themes

Twenty Ten: Reduces image size and removes image borders for galleries in widget areas.
Twenty Eleven: Reduces image size and removes image borders for galleries in widget areas.
Twenty Twelve: Reduces image size for some gallery sizes in widget areas.
Twenty Thirteen: Ensure proper clearing for images, hide captions for some gallery column combos and ensure good display for galleries in widget areas.
Twenty Fourteen: Ensure proper clearing for images and hide captions for some gallery column combos for galleries in widget areas.
Twenty Seventeen: Hide captions for some gallery column combos for galleries in widget areas.

Props joyously, williampatton, davidakennedy, melchoyce, crunnells.

Fixes #41969.

Built from https://develop.svn.wordpress.org/trunk@42019


git-svn-id: http://core.svn.wordpress.org/trunk@41853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 style.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/style.css b/style.css
index 4e559ac27..e7eb66a4e 100644
--- a/style.css
+++ b/style.css
@@ -1465,6 +1465,18 @@ a.comment-edit-link:hover {
 	margin: 0;
 }
 
+.widget-area .gallery-columns-2.gallery-size-full .gallery-icon img,
+.widget-area .gallery-columns-3.gallery-size-full .gallery-icon img,
+.widget-area .gallery-columns-4.gallery-size-full .gallery-icon img,
+.widget-area .gallery-columns-5.gallery-size-full .gallery-icon img,
+.widget-area .gallery-columns-6 .gallery-icon img,
+.widget-area .gallery-columns-7 .gallery-icon img,
+.widget-area .gallery-columns-8 .gallery-icon img,
+.widget-area .gallery-columns-9 .gallery-icon img {
+	height: auto;
+	max-width: 80%;
+}
+
 /* =Plugins
 ----------------------------------------------- */
 

From d009df70b3cb45e4ddfd2fb8c204da17109101c0 Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Wed, 1 Nov 2017 22:43:47 +0000
Subject: [PATCH 05/62] Bundled Themes: Bump version numbers and update
 changelogs for 4.9 release

* Also, updates POT files for Twenty Ten and Twenty Eleven.

Props lemacarl, maedahbatool, mrahmadawais, davidakennedy.

Fixes #42090.

Built from https://develop.svn.wordpress.org/trunk@42105


git-svn-id: http://core.svn.wordpress.org/trunk@41934 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 9 +++++++--
 style.css  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index 9e66e4dba..a21e87057 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 === Twenty Twelve ===
 Contributors: the WordPress team
 Requires at least: WordPress 3.5
-Tested up to: WordPress 4.9-trunk
-Stable tag: 2.3
+Tested up to: WordPress 5.0-trunk
+Stable tag: 2.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 2.4 =
+* Released: November 14, 2017
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.4
+
 = 2.3 =
 * Released: June 8, 2017
 
diff --git a/style.css b/style.css
index e7eb66a4e..9c4dce365 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.3
+Version: 2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From f9d0b32a36a98ac38b651d5e9ab009401b021521 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 30 Nov 2017 23:11:00 +0000
Subject: [PATCH 06/62] Code is Poetry. WordPress' code just... wasn't. This is
 now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.


Built from https://develop.svn.wordpress.org/trunk@42343


git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 404.php                       |   2 +-
 archive.php                   |  13 +-
 author.php                    |   8 +-
 category.php                  |   3 +-
 comments.php                  |  25 ++-
 content-page.php              |   9 +-
 content.php                   |  15 +-
 footer.php                    |   2 +-
 functions.php                 | 356 +++++++++++++++++++---------------
 header.php                    |  11 +-
 image.php                     |  63 ++++--
 inc/custom-header.php         |  31 +--
 index.php                     |  11 +-
 page-templates/front-page.php |   7 +-
 page-templates/full-width.php |   7 +-
 page.php                      |   7 +-
 search.php                    |   7 +-
 sidebar-front.php             |   5 +-
 sidebar.php                   |   2 +-
 single.php                    |   7 +-
 tag.php                       |   3 +-
 21 files changed, 366 insertions(+), 228 deletions(-)

diff --git a/404.php b/404.php
index db3ef811b..8b039ecee 100644
--- a/404.php
+++ b/404.php
@@ -26,4 +26,4 @@ get_header(); ?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/archive.php b/archive.php
index 78314cfb8..cf0611c45 100644
--- a/archive.php
+++ b/archive.php
@@ -24,9 +24,10 @@ get_header(); ?>
 
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php
-					if ( is_day() ) :
-						printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+				<h1 class="archive-title">
+				<?php
+				if ( is_day() ) :
+					printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
 					elseif ( is_month() ) :
 						printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
 					elseif ( is_year() ) :
@@ -34,12 +35,14 @@ get_header(); ?>
 					else :
 						_e( 'Archives', 'twentytwelve' );
 					endif;
-				?></h1>
+				?>
+				</h1>
 			</header><!-- .archive-header -->
 
 			<?php
 			/* 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
 				 * this in a child theme then include a file called content-___.php
diff --git a/author.php b/author.php
index 9a55c3419..ace43e7bd 100644
--- a/author.php
+++ b/author.php
@@ -44,7 +44,8 @@ get_header(); ?>
 
 			<?php
 			// If a user has filled out their description, show a bio on their entries.
-			if ( get_the_author_meta( 'description' ) ) : ?>
+			if ( get_the_author_meta( 'description' ) ) :
+			?>
 			<div class="author-info">
 				<div class="author-avatar">
 					<?php
@@ -67,7 +68,10 @@ get_header(); ?>
 			<?php endif; ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/category.php b/category.php
index 458063066..0625a7d6c 100644
--- a/category.php
+++ b/category.php
@@ -27,7 +27,8 @@ get_header(); ?>
 
 			<?php
 			/* 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
 				 * this in a child theme then include a file called content-___.php
diff --git a/comments.php b/comments.php
index d6a733efe..19f5941da 100644
--- a/comments.php
+++ b/comments.php
@@ -17,8 +17,9 @@
  * the visitor has not yet entered the password we will
  * return early without loading the comments.
  */
-if ( post_password_required() )
+if ( post_password_required() ) {
 	return;
+}
 ?>
 
 <div id="comments" class="comments-area">
@@ -28,13 +29,22 @@ if ( post_password_required() )
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
-				printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+				printf(
+					_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
+					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
+				);
 			?>
 		</h2>
 
 		<ol class="commentlist">
-			<?php wp_list_comments( array( 'callback' => 'twentytwelve_comment', 'style' => 'ol' ) ); ?>
+			<?php
+			wp_list_comments(
+				array(
+					'callback' => 'twentytwelve_comment',
+					'style'    => 'ol',
+				)
+			);
+?>
 		</ol><!-- .commentlist -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@@ -49,12 +59,13 @@ if ( post_password_required() )
 		/* If there are no comments and comments are closed, let's leave a note.
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
-		if ( ! comments_open() && get_comments_number() ) : ?>
-		<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentytwelve' ); ?></p>
+		if ( ! comments_open() && get_comments_number() ) :
+		?>
+		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
 		<?php endif; ?>
 
 	<?php endif; // have_comments() ?>
 
 	<?php comment_form(); ?>
 
-</div><!-- #comments .comments-area -->
\ No newline at end of file
+</div><!-- #comments .comments-area -->
diff --git a/content-page.php b/content-page.php
index 0abcbf791..d1553444b 100644
--- a/content-page.php
+++ b/content-page.php
@@ -18,7 +18,14 @@
 
 		<div class="entry-content">
 			<?php the_content(); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 		<footer class="entry-meta">
 			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/content.php b/content.php
index 56493ed0b..901b9bd87 100644
--- a/content.php
+++ b/content.php
@@ -17,9 +17,11 @@
 		</div>
 		<?php endif; ?>
 		<header class="entry-header">
-			<?php if ( ! post_password_required() && ! is_attachment() ) :
+			<?php
+			if ( ! post_password_required() && ! is_attachment() ) :
 				the_post_thumbnail();
-			endif; ?>
+			endif;
+			?>
 
 			<?php if ( is_single() ) : ?>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
@@ -42,7 +44,14 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/footer.php b/footer.php
index fe31e596d..b65e115d3 100644
--- a/footer.php
+++ b/footer.php
@@ -20,4 +20,4 @@
 
 <?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/functions.php b/functions.php
index 68d44aaed..31fc28204 100644
--- a/functions.php
+++ b/functions.php
@@ -23,8 +23,9 @@
  */
 
 // Set up the content width value based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 625;
+}
 
 /**
  * Twenty Twelve setup.
@@ -35,7 +36,7 @@ if ( ! isset( $content_width ) )
  * @uses load_theme_textdomain() For translation/localization support.
  * @uses add_editor_style() To add a Visual Editor stylesheet.
  * @uses add_theme_support() To add support for post thumbnails, automatic feed links,
- * 	custom background, and post formats.
+ *  custom background, and post formats.
  * @uses register_nav_menu() To add support for navigation menus.
  * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
  *
@@ -67,9 +68,11 @@ function twentytwelve_setup() {
 	 * This theme supports custom background color and image,
 	 * and here we also set up the default background color.
 	 */
-	add_theme_support( 'custom-background', array(
-		'default-color' => 'e6e6e6',
-	) );
+	add_theme_support(
+		'custom-background', array(
+			'default-color' => 'e6e6e6',
+		)
+	);
 
 	// This theme uses a custom image size for featured images, displayed on "standard" posts.
 	add_theme_support( 'post-thumbnails' );
@@ -109,18 +112,19 @@ function twentytwelve_get_font_url() {
 		 */
 		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
 
-		if ( 'cyrillic' == $subset )
+		if ( 'cyrillic' == $subset ) {
 			$subsets .= ',cyrillic,cyrillic-ext';
-		elseif ( 'greek' == $subset )
+		} elseif ( 'greek' == $subset ) {
 			$subsets .= ',greek,greek-ext';
-		elseif ( 'vietnamese' == $subset )
+		} elseif ( 'vietnamese' == $subset ) {
 			$subsets .= ',vietnamese';
+		}
 
 		$query_args = array(
 			'family' => 'Open+Sans:400italic,700italic,400,700',
 			'subset' => $subsets,
 		);
-		$font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
 	}
 
 	return $font_url;
@@ -138,15 +142,17 @@ function twentytwelve_scripts_styles() {
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
+	}
 
 	// Adds JavaScript for handling the navigation menu hide-and-show behavior.
 	wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
 
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
+	if ( ! empty( $font_url ) ) {
 		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	}
 
 	// Loads our main stylesheet.
 	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
@@ -197,11 +203,13 @@ add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
 function twentytwelve_mce_css( $mce_css ) {
 	$font_url = twentytwelve_get_font_url();
 
-	if ( empty( $font_url ) )
+	if ( empty( $font_url ) ) {
 		return $mce_css;
+	}
 
-	if ( ! empty( $mce_css ) )
+	if ( ! empty( $mce_css ) ) {
 		$mce_css .= ',';
+	}
 
 	$mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
 
@@ -224,20 +232,23 @@ add_filter( 'mce_css', 'twentytwelve_mce_css' );
 function twentytwelve_wp_title( $title, $sep ) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if ( is_feed() ) {
 		return $title;
+	}
 
 	// Add the site name.
 	$title .= get_bloginfo( 'name', 'display' );
 
 	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	if ( $site_description && ( is_home() || is_front_page() ) ) {
 		$title = "$title $sep $site_description";
+	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
+	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
+	}
 
 	return $title;
 }
@@ -251,8 +262,9 @@ add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
@@ -265,168 +277,190 @@ add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_widgets_init() {
-	register_sidebar( array(
-		'name' => __( 'Main Sidebar', 'twentytwelve' ),
-		'id' => 'sidebar-1',
-		'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Main Sidebar', 'twentytwelve' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'First Front Page Widget Area', 'twentytwelve' ),
-		'id' => 'sidebar-2',
-		'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'First Front Page Widget Area', 'twentytwelve' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
-		'id' => 'sidebar-3',
-		'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Second Front Page Widget Area', 'twentytwelve' ),
+			'id'            => 'sidebar-3',
+			'description'   => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentytwelve_widgets_init' );
 
 if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
-/**
- * Displays navigation to next/previous pages when applicable.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_content_nav( $html_id ) {
-	global $wp_query;
+	/**
+	 * Displays navigation to next/previous pages when applicable.
+	 *
+	 * @since Twenty Twelve 1.0
+	 */
+	function twentytwelve_content_nav( $html_id ) {
+		global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
-			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
-		</nav><!-- .navigation -->
-	<?php endif;
-}
+		if ( $wp_query->max_num_pages > 1 ) : ?>
+			<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
+				<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
+				<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
+				<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
+			</nav><!-- .navigation -->
+		<?php
+	endif;
+	}
 endif;
 
 if ( ! function_exists( 'twentytwelve_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments template
- * simply create your own twentytwelve_comment(), and that function will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case 'pingback' :
-		case 'trackback' :
-		// Display trackbacks differently than normal comments.
-	?>
-	<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
+	/**
+	 * Template for comments and pingbacks.
+	 *
+	 * To override this walker in a child theme without modifying the comments template
+	 * simply create your own twentytwelve_comment(), and that function will be used instead.
+	 *
+	 * Used as a callback by wp_list_comments() for displaying the comments.
+	 *
+	 * @since Twenty Twelve 1.0
+	 */
+	function twentytwelve_comment( $comment, $args, $depth ) {
+		$GLOBALS['comment'] = $comment;
+		switch ( $comment->comment_type ) :
+			case 'pingback':
+			case 'trackback':
+				// Display trackbacks differently than normal comments.
+		?>
+		<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
 		<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
 	<?php
-			break;
-		default :
-		// Proceed with normal comments.
-		global $post;
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+				break;
+			default:
+				// Proceed with normal comments.
+				global $post;
+		?>
+		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<header class="comment-meta comment-author vcard">
 				<?php
 					echo get_avatar( $comment, 44 );
-					printf( '<cite><b class="fn">%1$s</b> %2$s</cite>',
+					printf(
+						'<cite><b class="fn">%1$s</b> %2$s</cite>',
 						get_comment_author_link(),
 						// If current post author is also comment author, make it known visually.
 						( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : ''
 					);
-					printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+					printf(
+						'<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
 						esc_url( get_comment_link( $comment->comment_ID ) ),
 						get_comment_time( 'c' ),
 						/* translators: 1: date, 2: time */
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
-				?>
-			</header><!-- .comment-meta -->
+					?>
+				</header><!-- .comment-meta -->
 
-			<?php if ( '0' == $comment->comment_approved ) : ?>
+				<?php if ( '0' == $comment->comment_approved ) : ?>
 				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
 			<?php endif; ?>
 
-			<section class="comment-content comment">
+				<section class="comment-content comment">
 				<?php comment_text(); ?>
 				<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
-			</section><!-- .comment-content -->
+				</section><!-- .comment-content -->
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentytwelve' ), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</article><!-- #comment-## -->
-	<?php
-		break;
-	endswitch; // end comment_type check
-}
+				<div class="reply">
+				<?php
+				comment_reply_link(
+					array_merge(
+						$args, array(
+							'reply_text' => __( 'Reply', 'twentytwelve' ),
+							'after'      => ' <span>&darr;</span>',
+							'depth'      => $depth,
+							'max_depth'  => $args['max_depth'],
+						)
+					)
+				);
+?>
+				</div><!-- .reply -->
+			</article><!-- #comment-## -->
+		<?php
+				break;
+		endswitch; // end comment_type check
+	}
 endif;
 
 if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
-/**
- * Set up post entry meta.
- *
- * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
- *
- * Create your own twentytwelve_entry_meta() to override in a child theme.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_entry_meta() {
-	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+	/**
+	 * Set up post entry meta.
+	 *
+	 * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
+	 *
+	 * Create your own twentytwelve_entry_meta() to override in a child theme.
+	 *
+	 * @since Twenty Twelve 1.0
+	 */
+	function twentytwelve_entry_meta() {
+		// Translators: used between list items, there is a space after the comma.
+		$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
 
-	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+		// Translators: used between list items, there is a space after the comma.
+		$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
 
-	$date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() )
-	);
+		$date = sprintf(
+			'<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
+			esc_url( get_permalink() ),
+			esc_attr( get_the_time() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() )
+		);
 
-	$author = sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
-		get_the_author()
-	);
+		$author = sprintf(
+			'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
+			get_the_author()
+		);
 
-	// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
-	if ( $tag_list ) {
-		$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} elseif ( $categories_list ) {
-		$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} else {
-		$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
+		if ( $tag_list ) {
+			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		} elseif ( $categories_list ) {
+			$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		} else {
+			$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		}
+
+		printf(
+			$utility_text,
+			$categories_list,
+			$tag_list,
+			$date,
+			$author
+		);
 	}
-
-	printf(
-		$utility_text,
-		$categories_list,
-		$tag_list,
-		$date,
-		$author
-	);
-}
 endif;
 
 /**
@@ -450,30 +484,36 @@ function twentytwelve_body_class( $classes ) {
 	$background_color = get_background_color();
 	$background_image = get_background_image();
 
-	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
+	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) ) {
 		$classes[] = 'full-width';
+	}
 
 	if ( is_page_template( 'page-templates/front-page.php' ) ) {
 		$classes[] = 'template-front-page';
-		if ( has_post_thumbnail() )
+		if ( has_post_thumbnail() ) {
 			$classes[] = 'has-post-thumbnail';
-		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+		}
+		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) ) {
 			$classes[] = 'two-sidebars';
+		}
 	}
 
 	if ( empty( $background_image ) ) {
-		if ( empty( $background_color ) )
+		if ( empty( $background_color ) ) {
 			$classes[] = 'custom-background-empty';
-		elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
+		} elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
 			$classes[] = 'custom-background-white';
+		}
 	}
 
 	// Enable custom font class only if the font CSS is queued to load.
-	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) )
+	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) ) {
 		$classes[] = 'custom-font-enabled';
+	}
 
-	if ( ! is_multi_author() )
+	if ( ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
 	return $classes;
 }
@@ -510,16 +550,20 @@ function twentytwelve_customize_register( $wp_customize ) {
 	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '.site-title > a',
-			'container_inclusive' => false,
-			'render_callback' => 'twentytwelve_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '.site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentytwelve_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '.site-title > a',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentytwelve_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '.site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentytwelve_customize_partial_blogdescription',
+			)
+		);
 	}
 }
 add_action( 'customize_register', 'twentytwelve_customize_register' );
diff --git a/header.php b/header.php
index c3b99d6f3..2b95b498e 100644
--- a/header.php
+++ b/header.php
@@ -42,7 +42,14 @@
 		<nav id="site-navigation" class="main-navigation" role="navigation">
 			<button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
 			<a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
-			<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
+			<?php
+			wp_nav_menu(
+				array(
+					'theme_location' => 'primary',
+					'menu_class'     => 'nav-menu',
+				)
+			);
+?>
 		</nav><!-- #site-navigation -->
 
 		<?php if ( get_header_image() ) : ?>
@@ -50,4 +57,4 @@
 		<?php endif; ?>
 	</header><!-- #masthead -->
 
-	<div id="main" class="wrapper">
\ No newline at end of file
+	<div id="main" class="wrapper">
diff --git a/image.php b/image.php
index 976e017d5..d2d228ba6 100644
--- a/image.php
+++ b/image.php
@@ -14,7 +14,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-		<?php while ( have_posts() ) : the_post(); ?>
+		<?php
+		while ( have_posts() ) :
+			the_post();
+?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
 					<header class="entry-header">
@@ -23,7 +26,8 @@ get_header(); ?>
 						<footer class="entry-meta">
 							<?php
 								$metadata = wp_get_attachment_metadata();
-								printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
+								printf(
+									__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
 									esc_attr( get_the_date( 'c' ) ),
 									esc_html( get_the_date() ),
 									esc_url( wp_get_attachment_url() ),
@@ -52,10 +56,22 @@ get_header(); ?>
  * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
  * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
  */
-$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+$attachments = array_values(
+	get_children(
+		array(
+			'post_parent'    => $post->post_parent,
+			'post_status'    => 'inherit',
+			'post_type'      => 'attachment',
+			'post_mime_type' => 'image',
+			'order'          => 'ASC',
+			'orderby'        => 'menu_order ID',
+		)
+	)
+);
 foreach ( $attachments as $k => $attachment ) :
-	if ( $attachment->ID == $post->ID )
+	if ( $attachment->ID == $post->ID ) {
 		break;
+	}
 endforeach;
 
 // If there is more than 1 attachment in a gallery
@@ -73,20 +89,22 @@ else :
 	$next_attachment_url = wp_get_attachment_url();
 endif;
 ?>
-								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
-								/**
- 								 * Filter the image attachment size to use.
-								 *
-								 * @since Twenty Twelve 1.0
-								 *
-								 * @param array $size {
-								 *     @type int The attachment height in pixels.
-								 *     @type int The attachment width in pixels.
-								 * }
-								 */
-								$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
-								echo wp_get_attachment_image( $post->ID, $attachment_size );
-								?></a>
+								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
+													<?php
+													/**
+													 * Filter the image attachment size to use.
+													 *
+													 * @since Twenty Twelve 1.0
+													 *
+													 * @param array $size {
+													 *     @type int The attachment height in pixels.
+													 *     @type int The attachment width in pixels.
+													 * }
+													 */
+													$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
+													echo wp_get_attachment_image( $post->ID, $attachment_size );
+								?>
+								</a>
 
 								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
 								<div class="entry-caption">
@@ -99,7 +117,14 @@ endif;
 
 						<div class="entry-description">
 							<?php the_content(); ?>
-							<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+							<?php
+							wp_link_pages(
+								array(
+									'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
+									'after'  => '</div>',
+								)
+							);
+?>
 						</div><!-- .entry-description -->
 
 					</div><!-- .entry-content -->
diff --git a/inc/custom-header.php b/inc/custom-header.php
index baedf18b5..c243dc65a 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -54,8 +54,9 @@ add_action( 'after_setup_theme', 'twentytwelve_custom_header_setup' );
  */
 function twentytwelve_custom_header_fonts() {
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
+	if ( ! empty( $font_url ) ) {
 		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	}
 }
 add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' );
 
@@ -70,24 +71,25 @@ function twentytwelve_header_style() {
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail
-	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
+	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
 		return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>
 	<style type="text/css" id="twentytwelve-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+	if ( ! display_header_text() ) :
 	?>
-		.site-title,
-		.site-description {
-			position: absolute;
-			clip: rect(1px 1px 1px 1px); /* IE7 */
-			clip: rect(1px, 1px, 1px, 1px);
-		}
+	.site-title,
+	.site-description {
+		position: absolute;
+		clip: rect(1px 1px 1px 1px); /* IE7 */
+		clip: rect(1px, 1px, 1px, 1px);
+	}
 	<?php
-		// If the user has set a custom color for the text, use that.
+	// If the user has set a custom color for the text, use that.
 		else :
 	?>
 		.site-header h1 a,
@@ -155,9 +157,12 @@ function twentytwelve_admin_header_image() {
 	<div id="headimg">
 		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
 		<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
-		<?php $header_image = get_header_image();
-		if ( ! empty( $header_image ) ) : ?>
+		<?php
+		$header_image = get_header_image();
+		if ( ! empty( $header_image ) ) :
+		?>
 			<img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" />
 		<?php endif; ?>
 	</div>
-<?php }
+<?php
+}
diff --git a/index.php b/index.php
index 7420be53e..47e5c6424 100644
--- a/index.php
+++ b/index.php
@@ -21,7 +21,10 @@ get_header(); ?>
 		<?php if ( have_posts() ) : ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -31,7 +34,8 @@ get_header(); ?>
 
 			<article id="post-0" class="post no-results not-found">
 
-			<?php if ( current_user_can( 'edit_posts' ) ) :
+			<?php
+			if ( current_user_can( 'edit_posts' ) ) :
 				// Show a different message to a logged-in user who can add posts.
 			?>
 				<header class="entry-header">
@@ -42,7 +46,8 @@ get_header(); ?>
 					<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
 				</div><!-- .entry-content -->
 
-			<?php else :
+			<?php
+			else :
 				// Show the default message to everyone else.
 			?>
 				<header class="entry-header">
diff --git a/page-templates/front-page.php b/page-templates/front-page.php
index 9ae4f27dd..9561179a2 100644
--- a/page-templates/front-page.php
+++ b/page-templates/front-page.php
@@ -17,7 +17,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php if ( has_post_thumbnail() ) : ?>
 					<div class="entry-page-image">
 						<?php the_post_thumbnail(); ?>
@@ -32,4 +35,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar( 'front' ); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/page-templates/full-width.php b/page-templates/full-width.php
index b0ce333c2..463d923d3 100644
--- a/page-templates/full-width.php
+++ b/page-templates/full-width.php
@@ -19,7 +19,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
@@ -27,4 +30,4 @@ get_header(); ?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/page.php b/page.php
index b06cd1f20..32934195d 100644
--- a/page.php
+++ b/page.php
@@ -17,7 +17,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
@@ -26,4 +29,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/search.php b/search.php
index 97a309b12..9f4021706 100644
--- a/search.php
+++ b/search.php
@@ -21,7 +21,10 @@ get_header(); ?>
 			<?php twentytwelve_content_nav( 'nav-above' ); ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -46,4 +49,4 @@ get_header(); ?>
 	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/sidebar-front.php b/sidebar-front.php
index 990a09fec..5f1193537 100644
--- a/sidebar-front.php
+++ b/sidebar-front.php
@@ -15,8 +15,9 @@
  *
  * If none of the sidebars have widgets, then let's bail early.
  */
-if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
+if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) ) {
 	return;
+}
 
 // If we get this far, we have widgets. Let do this.
 ?>
@@ -32,4 +33,4 @@ if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
 		<?php dynamic_sidebar( 'sidebar-3' ); ?>
 	</div><!-- .second -->
 	<?php endif; ?>
-</div><!-- #secondary -->
\ No newline at end of file
+</div><!-- #secondary -->
diff --git a/sidebar.php b/sidebar.php
index a59dcc49b..ca9dbddb7 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -14,4 +14,4 @@
 		<div id="secondary" class="widget-area" role="complementary">
 			<?php dynamic_sidebar( 'sidebar-1' ); ?>
 		</div><!-- #secondary -->
-	<?php endif; ?>
\ No newline at end of file
+	<?php endif; ?>
diff --git a/single.php b/single.php
index 38175246f..17a900c38 100644
--- a/single.php
+++ b/single.php
@@ -12,7 +12,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 
 				<?php get_template_part( 'content', get_post_format() ); ?>
 
@@ -30,4 +33,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/tag.php b/tag.php
index 7715302ca..515521c78 100644
--- a/tag.php
+++ b/tag.php
@@ -27,7 +27,8 @@ get_header(); ?>
 
 			<?php
 			/* 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

From bdfb728d3c336490c0a5c1034ae45117736efde3 Mon Sep 17 00:00:00 2001
From: iandunn <iandunn@git.wordpress.org>
Date: Tue, 1 May 2018 06:28:21 +0000
Subject: [PATCH 07/62] Bundled Themes: Add link to privacy policy page in
 footer.

If a privacy policy has been set, then a link to it will automatically be shown in the footer.

The element containing the "Proudly powered by WordPress" link was chosen for the new policy link, in order to minimize visual conflicts with custom CSS that was written before the new link existed. Unfortunately, some minor conflicts are expected and unavoidable. Adding this link is required as part of GDPR compliance, and the benefits outweigh the downsides.

To further mitigate the conflicts, a new `imprint` class was added to the "Proudly powered..." link, in order to facilitate targeting each link invididually with custom styles.

Props xkon, laurelfulford, birgire, azaozz, iandunn.
See #43715.

Built from https://develop.svn.wordpress.org/trunk@43051


git-svn-id: http://core.svn.wordpress.org/trunk@42880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 footer.php | 9 ++++++++-
 style.css  | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/footer.php b/footer.php
index b65e115d3..05e52e2bd 100644
--- a/footer.php
+++ b/footer.php
@@ -13,7 +13,14 @@
 	<footer id="colophon" role="contentinfo">
 		<div class="site-info">
 			<?php do_action( 'twentytwelve_credits' ); ?>
-			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
+			<?php
+			if ( function_exists( 'the_privacy_policy_link' ) ) {
+				the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+			}
+			?>
+			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>">
+				<?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?>
+			</a>
 		</div><!-- .site-info -->
 	</footer><!-- #colophon -->
 </div><!-- #page -->
diff --git a/style.css b/style.css
index 9c4dce365..6f1253999 100644
--- a/style.css
+++ b/style.css
@@ -694,6 +694,12 @@ footer[role="contentinfo"] a {
 footer[role="contentinfo"] a:hover {
 	color: #21759b;
 }
+.site-info span[role=separator] {
+	padding: 0 0.3em 0 0.6em;
+}
+.site-info span[role=separator]::before {
+	content: '\002f';
+}
 
 
 /* =Main content and comment content

From 708ec0587233ad0f1e1bbababd89aac41ee852a5 Mon Sep 17 00:00:00 2001
From: iandunn <iandunn@git.wordpress.org>
Date: Wed, 2 May 2018 22:00:49 +0000
Subject: [PATCH 08/62] Comments: Move comment consent `input` outside the
 `label` for a11y.

Non-wrapping `label`s are more widely supported by assitive technologies. The CSS changes account for the element re-ordering, and tweak the formatting for improved readability.

Props afercia, xkon, laurelfulford, azaozz.
Fixes #43436.

Built from https://develop.svn.wordpress.org/trunk@43125


git-svn-id: http://core.svn.wordpress.org/trunk@42954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 rtl.css   | 3 +++
 style.css | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/rtl.css b/rtl.css
index 45740f2d5..e43fca3ba 100644
--- a/rtl.css
+++ b/rtl.css
@@ -134,6 +134,9 @@ label ~ span.required {
 	margin: -18px -16px 0 0;
 	margin: -1.285714286rem -1.142857143rem 0 0;
 }
+#respond #wp-comment-cookies-consent {
+	margin: 0 0 0 10px;
+}
 
 
 /* =Front page template styling
diff --git a/style.css b/style.css
index 6f1253999..0c0141da4 100644
--- a/style.css
+++ b/style.css
@@ -1360,6 +1360,12 @@ a.comment-edit-link:hover {
 	line-height: 2;
 	color: #5e5e5e;
 }
+#respond #wp-comment-cookies-consent {
+	margin: 0 10px 0 0;
+}
+#respond .comment-form-cookies-consent label {
+	display: inline;
+}
 .required {
 	color: red;
 }

From d3dee1547785b470ffe32c34021e3c0dd0ddd0cd Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Thu, 17 May 2018 17:07:22 +0000
Subject: [PATCH 09/62] Bundled Themes: Bump version numbers and update
 changelogs for 4.9.6 release

* Also, updates POT files for Twenty Ten and Twenty Eleven.

Props earnjam, laurelfulford.

Fixes #43915.

Built from https://develop.svn.wordpress.org/trunk@43293


git-svn-id: http://core.svn.wordpress.org/trunk@43122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 9 +++++++--
 style.css  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index a21e87057..a6b1e6b87 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: the WordPress team
 Requires at least: WordPress 3.5
 Tested up to: WordPress 5.0-trunk
-Stable tag: 2.4
+Stable tag: 2.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -22,7 +22,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or
 
 == Copyright ==
 
-Twenty Twelve WordPress Theme, Copyright 2012-2017 WordPress.org & Automattic.com
+Twenty Twelve WordPress Theme, Copyright 2012-2018 WordPress.org & Automattic.com
 Twenty Twelve is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 2.5 =
+* Released: May 17, 2018
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.5
+
 = 2.4 =
 * Released: November 14, 2017
 
diff --git a/style.css b/style.css
index 0c0141da4..c5df75f42 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.4
+Version: 2.5
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From f7d8a35517746df90d79f1c8c122a7c9ade15c97 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 17 Aug 2018 01:51:36 +0000
Subject: [PATCH 10/62] Coding Standards: Upgrade WPCS to 1.0.0

WPCS 1.0.0 includes a bunch of new auto-fixers, which drops the number of coding standards issues across WordPress significantly. Prior to running the auto-fixers, there were 15,312 issues detected. With this commit, we now drop to 4,769 issues.

This change includes three notable additions:
- Multiline function calls must now put each parameter on a new line.
- Auto-formatting files is now part of the `grunt precommit` script.
- Auto-fixable coding standards issues will now cause Travis failures.

Fixes #44600.


Built from https://develop.svn.wordpress.org/trunk@43571


git-svn-id: http://core.svn.wordpress.org/trunk@43400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php                   |  2 +-
 author.php                    |  4 +--
 comments.php                  |  7 ++--
 content-page.php              |  4 +--
 content.php                   |  2 +-
 functions.php                 | 26 ++++++++------
 header.php                    |  2 +-
 image.php                     | 68 +++++++++++++++++------------------
 inc/custom-header.php         | 16 ++++-----
 index.php                     |  8 ++---
 page-templates/front-page.php |  2 +-
 page-templates/full-width.php |  2 +-
 page.php                      |  2 +-
 search.php                    |  2 +-
 single.php                    |  2 +-
 15 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/archive.php b/archive.php
index cf0611c45..edd947ef0 100644
--- a/archive.php
+++ b/archive.php
@@ -35,7 +35,7 @@ get_header(); ?>
 					else :
 						_e( 'Archives', 'twentytwelve' );
 					endif;
-				?>
+					?>
 				</h1>
 			</header><!-- .archive-header -->
 
diff --git a/author.php b/author.php
index ace43e7bd..0dbd267d6 100644
--- a/author.php
+++ b/author.php
@@ -45,7 +45,7 @@ get_header(); ?>
 			<?php
 			// If a user has filled out their description, show a bio on their entries.
 			if ( get_the_author_meta( 'description' ) ) :
-			?>
+				?>
 			<div class="author-info">
 				<div class="author-avatar">
 					<?php
@@ -71,7 +71,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/comments.php b/comments.php
index 19f5941da..010c1aedf 100644
--- a/comments.php
+++ b/comments.php
@@ -31,7 +31,8 @@ if ( post_password_required() ) {
 			<?php
 				printf(
 					_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
+					number_format_i18n( get_comments_number() ),
+					'<span>' . get_the_title() . '</span>'
 				);
 			?>
 		</h2>
@@ -44,7 +45,7 @@ if ( post_password_required() ) {
 					'style'    => 'ol',
 				)
 			);
-?>
+			?>
 		</ol><!-- .commentlist -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@@ -60,7 +61,7 @@ if ( post_password_required() ) {
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
 		if ( ! comments_open() && get_comments_number() ) :
-		?>
+			?>
 		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
 		<?php endif; ?>
 
diff --git a/content-page.php b/content-page.php
index d1553444b..3511b75f3 100644
--- a/content-page.php
+++ b/content-page.php
@@ -11,7 +11,7 @@
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="entry-header">
 			<?php if ( ! is_page_template( 'page-templates/front-page.php' ) ) : ?>
-			<?php the_post_thumbnail(); ?>
+				<?php the_post_thumbnail(); ?>
 			<?php endif; ?>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
 		</header>
@@ -25,7 +25,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<footer class="entry-meta">
 			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/content.php b/content.php
index 901b9bd87..2eab91d0f 100644
--- a/content.php
+++ b/content.php
@@ -51,7 +51,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/functions.php b/functions.php
index 31fc28204..10744c569 100644
--- a/functions.php
+++ b/functions.php
@@ -69,7 +69,8 @@ function twentytwelve_setup() {
 	 * and here we also set up the default background color.
 	 */
 	add_theme_support(
-		'custom-background', array(
+		'custom-background',
+		array(
 			'default-color' => 'e6e6e6',
 		)
 	);
@@ -330,7 +331,7 @@ if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
 				<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
 				<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
 			</nav><!-- .navigation -->
-		<?php
+			<?php
 	endif;
 	}
 endif;
@@ -352,15 +353,15 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 			case 'pingback':
 			case 'trackback':
 				// Display trackbacks differently than normal comments.
-		?>
+				?>
 		<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
 		<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
-	<?php
+				<?php
 				break;
 			default:
 				// Proceed with normal comments.
 				global $post;
-		?>
+				?>
 		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<header class="comment-meta comment-author vcard">
@@ -379,7 +380,7 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 						/* translators: 1: date, 2: time */
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
-					?>
+				?>
 				</header><!-- .comment-meta -->
 
 				<?php if ( '0' == $comment->comment_approved ) : ?>
@@ -395,7 +396,8 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 				<?php
 				comment_reply_link(
 					array_merge(
-						$args, array(
+						$args,
+						array(
 							'reply_text' => __( 'Reply', 'twentytwelve' ),
 							'after'      => ' <span>&darr;</span>',
 							'depth'      => $depth,
@@ -403,10 +405,10 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 						)
 					)
 				);
-?>
+				?>
 				</div><!-- .reply -->
 			</article><!-- #comment-## -->
-		<?php
+				<?php
 				break;
 		endswitch; // end comment_type check
 	}
@@ -551,14 +553,16 @@ function twentytwelve_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '.site-title > a',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentytwelve_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '.site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentytwelve_customize_partial_blogdescription',
diff --git a/header.php b/header.php
index 2b95b498e..cbd555c31 100644
--- a/header.php
+++ b/header.php
@@ -49,7 +49,7 @@
 					'menu_class'     => 'nav-menu',
 				)
 			);
-?>
+			?>
 		</nav><!-- #site-navigation -->
 
 		<?php if ( get_header_image() ) : ?>
diff --git a/image.php b/image.php
index d2d228ba6..76d3a549a 100644
--- a/image.php
+++ b/image.php
@@ -17,7 +17,7 @@ get_header(); ?>
 		<?php
 		while ( have_posts() ) :
 			the_post();
-?>
+			?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
 					<header class="entry-header">
@@ -51,39 +51,39 @@ get_header(); ?>
 
 						<div class="entry-attachment">
 							<div class="attachment">
-<?php
-/*
- * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
- * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
- */
-$attachments = array_values(
-	get_children(
-		array(
-			'post_parent'    => $post->post_parent,
-			'post_status'    => 'inherit',
-			'post_type'      => 'attachment',
-			'post_mime_type' => 'image',
-			'order'          => 'ASC',
-			'orderby'        => 'menu_order ID',
-		)
-	)
-);
-foreach ( $attachments as $k => $attachment ) :
-	if ( $attachment->ID == $post->ID ) {
-		break;
-	}
+			<?php
+			/*
+			* Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
+			* or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
+			*/
+			$attachments = array_values(
+				get_children(
+					array(
+						'post_parent'    => $post->post_parent,
+						'post_status'    => 'inherit',
+						'post_type'      => 'attachment',
+						'post_mime_type' => 'image',
+						'order'          => 'ASC',
+						'orderby'        => 'menu_order ID',
+					)
+				)
+			);
+			foreach ( $attachments as $k => $attachment ) :
+				if ( $attachment->ID == $post->ID ) {
+					break;
+				}
 endforeach;
 
-// If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) :
-	$k++;
-	if ( isset( $attachments[ $k ] ) ) :
-		// get the URL of the next image attachment
-		$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-	else :
-		// or get the URL of the first image attachment
-		$next_attachment_url = get_attachment_link( $attachments[0]->ID );
-	endif;
+			// If there is more than 1 attachment in a gallery
+			if ( count( $attachments ) > 1 ) :
+				$k++;
+				if ( isset( $attachments[ $k ] ) ) :
+					// get the URL of the next image attachment
+					$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+				else :
+					// or get the URL of the first image attachment
+					$next_attachment_url = get_attachment_link( $attachments[0]->ID );
+				endif;
 else :
 	// or, if there's only 1 image, get the URL of the image
 	$next_attachment_url = wp_get_attachment_url();
@@ -103,7 +103,7 @@ endif;
 													 */
 													$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
 													echo wp_get_attachment_image( $post->ID, $attachment_size );
-								?>
+													?>
 								</a>
 
 								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
@@ -124,7 +124,7 @@ endif;
 									'after'  => '</div>',
 								)
 							);
-?>
+							?>
 						</div><!-- .entry-description -->
 
 					</div><!-- .entry-content -->
diff --git a/inc/custom-header.php b/inc/custom-header.php
index c243dc65a..636309b7c 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -81,17 +81,17 @@ function twentytwelve_header_style() {
 	<?php
 		// Has the text been hidden?
 	if ( ! display_header_text() ) :
-	?>
+		?>
 	.site-title,
 	.site-description {
 		position: absolute;
 		clip: rect(1px 1px 1px 1px); /* IE7 */
 		clip: rect(1px, 1px, 1px, 1px);
 	}
-	<?php
-	// If the user has set a custom color for the text, use that.
+		<?php
+		// If the user has set a custom color for the text, use that.
 		else :
-	?>
+			?>
 		.site-header h1 a,
 		.site-header h2 {
 			color: #<?php echo $text_color; ?>;
@@ -107,7 +107,7 @@ function twentytwelve_header_style() {
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_admin_header_style() {
-?>
+	?>
 	<style type="text/css" id="twentytwelve-admin-header-css">
 	.appearance_page_custom-header #headimg {
 		border: none;
@@ -138,7 +138,7 @@ function twentytwelve_admin_header_style() {
 		max-width: <?php echo get_theme_support( 'custom-header', 'max-width' ); ?>px;
 	}
 	</style>
-<?php
+	<?php
 }
 
 /**
@@ -160,9 +160,9 @@ function twentytwelve_admin_header_image() {
 		<?php
 		$header_image = get_header_image();
 		if ( ! empty( $header_image ) ) :
-		?>
+			?>
 			<img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" />
 		<?php endif; ?>
 	</div>
-<?php
+	<?php
 }
diff --git a/index.php b/index.php
index 47e5c6424..e201be0ca 100644
--- a/index.php
+++ b/index.php
@@ -24,7 +24,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -37,7 +37,7 @@ get_header(); ?>
 			<?php
 			if ( current_user_can( 'edit_posts' ) ) :
 				// Show a different message to a logged-in user who can add posts.
-			?>
+				?>
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1>
 				</header>
@@ -46,10 +46,10 @@ get_header(); ?>
 					<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
 				</div><!-- .entry-content -->
 
-			<?php
+				<?php
 			else :
 				// Show the default message to everyone else.
-			?>
+				?>
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
 				</header>
diff --git a/page-templates/front-page.php b/page-templates/front-page.php
index 9561179a2..72efd0102 100644
--- a/page-templates/front-page.php
+++ b/page-templates/front-page.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php if ( has_post_thumbnail() ) : ?>
 					<div class="entry-page-image">
 						<?php the_post_thumbnail(); ?>
diff --git a/page-templates/full-width.php b/page-templates/full-width.php
index 463d923d3..13a1b39be 100644
--- a/page-templates/full-width.php
+++ b/page-templates/full-width.php
@@ -22,7 +22,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
diff --git a/page.php b/page.php
index 32934195d..cf75606bd 100644
--- a/page.php
+++ b/page.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
diff --git a/search.php b/search.php
index 9f4021706..39ca14b18 100644
--- a/search.php
+++ b/search.php
@@ -24,7 +24,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/single.php b/single.php
index 17a900c38..10165cec3 100644
--- a/single.php
+++ b/single.php
@@ -15,7 +15,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 
 				<?php get_template_part( 'content', get_post_format() ); ?>
 

From e5a978a81dfeae564fadaacd0dbbf85419277ad6 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Fri, 14 Dec 2018 01:55:38 +0000
Subject: [PATCH 11/62] Twenty Twelve: Add styles and support for the new
 block-based editor.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This update adds styles and theme support related to the new block-based editor to enhance the experience of using it with Twenty Twelve.

These are the specific changes made to this theme:

- Add `blocks.css`, to style blocks on the front end, to make sure they match the theme’s existing HTML element styles.
- Add `editor-blocks.css` to style blocks in the editor, to make sure they match the theme’s existing HTML element styles.
- Add theme support for `editor-styles`, to pull the existing editor stylesheet into the new editor.
- Add theme support for `wp-block-styles`, to load the default block styles on the front end.
- Add theme support for `editor-color-palette`, to load a color palette based on the theme’s color scheme into the block-based editor.

Props ianbelanger, crunnells, laurelfulford, davidakennedy.

Merges [43795] to trunk.

Fixes #45040.
Built from https://develop.svn.wordpress.org/trunk@44140


git-svn-id: http://core.svn.wordpress.org/trunk@43970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css        | 387 ++++++++++++++++++++++++++++++++++++++
 css/editor-blocks.css | 424 ++++++++++++++++++++++++++++++++++++++++++
 functions.php         |  54 ++++++
 3 files changed, 865 insertions(+)
 create mode 100644 css/blocks.css
 create mode 100644 css/editor-blocks.css

diff --git a/css/blocks.css b/css/blocks.css
new file mode 100644
index 000000000..b3e3efb78
--- /dev/null
+++ b/css/blocks.css
@@ -0,0 +1,387 @@
+/*
+Theme Name: Twenty Twelve
+Description: Used to style Gutenberg Blocks.
+*/
+
+/*--------------------------------------------------------------
+>>> TABLE OF CONTENTS:
+----------------------------------------------------------------
+1.0 General Block Styles
+2.0 Blocks - Common Blocks
+3.0 Blocks - Formatting
+4.0 Blocks - Layout Elements
+5.0 Blocks - Widgets
+6.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+/*--------------------------------------------------------------
+1.0 General Block Styles
+--------------------------------------------------------------*/
+
+/* Captions */
+
+[class^="wp-block-"] figcaption {
+	color: #757575;
+	font-size: 12px;
+	font-size: 0.857142857rem;
+	line-height: 2;
+	font-style: italic;
+	text-align: left;
+}
+
+[class^="wp-block-"].alignleft,
+[class^="wp-block-"] .alignleft {
+	margin-right: 24px;
+}
+
+[class^="wp-block-"].alignright,
+[class^="wp-block-"] .alignright {
+	margin-left: 24px;
+}
+
+.rtl [class^="wp-block-"] figcaption {
+	text-align: right;
+}
+
+/*--------------------------------------------------------------
+2.0 Blocks - Common Blocks
+--------------------------------------------------------------*/
+
+/* Paragraph */
+
+p.has-drop-cap:not(:focus)::first-letter {
+	font-size: 5em;
+	margin-top: 0.1em;
+}
+
+/* Image */
+
+.wp-block-image figure:not(.aligncenter) {
+	line-height: 0;
+	margin: 0 1.714285714rem;
+}
+
+.wp-block-image figure.alignleft {
+	margin: 0.857142857rem 1.714285714rem 0.857142857rem 0;
+}
+
+.wp-block-image figure.alignright {
+	margin: 0.857142857rem 0 0.857142857rem 1.714285714rem;
+}
+
+.wp-block-image figcaption {
+	padding-top: 0.75em;
+}
+
+[class^="wp-block-"].alignleft,
+[class^="wp-block-"] .alignleft,
+[class^="wp-block-"].alignright,
+[class^="wp-block-"] .alignright {
+
+}
+
+/* Gallery */
+
+.wp-block-gallery {
+	margin-bottom: 24px;
+	margin-bottom: 1.714285714rem;
+}
+
+.wp-block-gallery .blocks-gallery-image figcaption,
+.wp-block-gallery .blocks-gallery-item figcaption {
+	left: 0;
+	right: 0;
+	text-align: center;
+	width: auto;
+}
+
+/* Quote */
+
+.wp-block-quote:not(.is-large):not(.is-style-large) {
+	border: 0;
+	padding: 1.714285714rem;
+	padding: 24px;
+}
+
+.wp-block-quote {
+	padding: 1.714285714rem;
+	padding: 24px;
+}
+
+.wp-block-quote cite {
+	color: inherit;
+	font-size: inherit;
+	font-style: italic;
+}
+
+.wp-block-quote.is-large p,
+.wp-block-quote.is-style-large p {
+	font-size: 20px;
+}
+
+/* Audio */
+
+.wp-block-audio audio {
+	display: block;
+	margin-bottom: 1.714285714rem;
+	width: 100%;
+}
+
+/* Cover Image */
+
+.wp-block-cover-image.aligncenter {
+	display: flex;
+}
+
+/* File */
+
+.wp-block-file .wp-block-file__button {
+	background-color: #e6e6e6;
+	background-repeat: repeat-x;
+	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	border: 1px solid #d2d2d2;
+	border-radius: 3px;
+	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+	color: #7c7c7c;
+	font-family: inherit;
+	font-size: 11px;
+	font-size: 0.785714286rem;
+	font-weight: normal;
+	line-height: 1.428571429;
+	padding: 6px 10px;
+	padding: 0.428571429rem 0.714285714rem;
+}
+
+.wp-block-file .wp-block-file__button:hover,
+.wp-block-file .wp-block-file__button:focus {
+	background-color: #ebebeb;
+	background-image: -moz-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+	background-repeat: repeat-x;
+	color: #5e5e5e;
+}
+
+.wp-block-file .wp-block-file__button:focus {
+	background-color: #e1e1e1;
+	background-image: -moz-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+	background-repeat: repeat-x;
+	border-color: transparent;
+	box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
+	color: #757575;
+}
+
+.rtl .wp-block-file * + .wp-block-file__button {
+	margin-left: 0.75em;
+	margin-right: 0;
+}
+
+/* Video */
+
+.wp-block-video video:not(:last-child) {
+	margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+3.0 Blocks - Formatting
+--------------------------------------------------------------*/
+
+/* Code */
+
+pre.wp-block-code {
+	border: 0;
+	padding: 0;
+}
+
+/* Pullquote */
+
+.wp-block-pullquote__citation,
+.wp-block-pullquote cite,
+.wp-block-pullquote footer {
+	font-size: 14px;
+	text-transform: none;
+}
+
+/* Table */
+
+.wp-block-table {
+	border-bottom: 1px solid #ededed;
+	border-collapse: collapse;
+	border-spacing: 0;
+	font-size: 14px;
+	line-height: 2;
+	margin: 0 0 20px;
+	width: 100%;
+}
+
+.wp-block-table th {
+	border: 0;
+	font-weight: bold;
+	padding: 6px 10px 6px 0;
+	text-transform: uppercase;
+}
+
+.wp-block-table td {
+	border: 0;
+	border-top: 1px solid #ededed;
+	padding: 6px 10px 6px 0;
+}
+
+/*--------------------------------------------------------------
+4.0 Blocks - Layout Elements
+--------------------------------------------------------------*/
+
+/* Buttons */
+
+.wp-block-button .wp-block-button__link,
+.wp-block-button .wp-block-button__link:visited {
+	background-color: #e6e6e6;
+	background-repeat: repeat-x;
+	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	border: 1px solid #d2d2d2;
+	border-radius: 3px;
+	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+	color: #7c7c7c;
+	font-family: inherit;
+	font-size: 11px;
+	font-size: 0.785714286rem;
+	font-weight: normal;
+	line-height: 1.428571429;
+	padding: 6px 10px;
+	padding: 0.428571429rem 0.714285714rem;
+}
+
+.wp-block-button .wp-block-button__link:hover,
+.wp-block-button .wp-block-button__link:focus {
+	background-color: #ebebeb;
+	background-image: -moz-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+	background-repeat: repeat-x;
+	color: #5e5e5e;
+}
+
+.wp-block-button .wp-block-button__link:active {
+	background-color: #e1e1e1;
+	background-image: -moz-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+	background-repeat: repeat-x;
+	border-color: transparent;
+	box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
+	color: #757575;
+}
+
+/* Separator */
+
+.wp-block-separator {
+	border: 0;
+}
+
+/*--------------------------------------------------------------
+5.0 Blocks - Widgets
+--------------------------------------------------------------*/
+
+/* Latest Comments */
+
+.wp-block-latest-comments {
+	margin: 0;
+	padding: 0;
+}
+
+.wp-block-latest-comments .avatar,
+.wp-block-latest-comments__comment-avatar {
+	border-radius: 0;
+	box-shadow: none;
+}
+
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-excerpt,
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-meta {
+	margin-left: 60px;
+}
+
+.wp-block-latest-comments__comment,
+.wp-block-latest-comments__comment-excerpt,
+.wp-block-latest-comments__comment-excerpt p {
+	font-size: 14px;
+}
+
+.wp-block-latest-comments__comment-excerpt p:last-child {
+	margin-bottom: 0;
+}
+
+.wp-block-latest-comments__comment-date {
+	color: #5e5e5e;
+}
+
+.wp-block-latest-comments .wp-block-latest-comments__comment {
+	margin: 0;
+	padding: 24px 0;
+	padding: 1.714285714rem 0 0;
+}
+
+.wp-block-latest-comments article {
+	margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+6.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+.has-blue-color {
+	color: #21759b;
+}
+
+.has-blue-background-color {
+	background-color: #21759b;
+}
+
+.has-dark-gray-color {
+	color: #373737;
+}
+
+.has-dark-gray-background-color {
+	background-color: #373737;
+}
+
+.has-medium-gray-color {
+	color: #9f9f9f;
+}
+
+.has-medium-gray-background-color {
+	background-color: #9f9f9f;
+}
+
+.has-light-gray-color {
+	color: #e6e6e6;
+}
+
+.has-light-gray-background-color {
+	background-color: #e6e6e6;
+}
+
+.has-white-color {
+	color: #fff;
+}
+
+.has-white-background-color {
+	background-color: #fff;
+}
diff --git a/css/editor-blocks.css b/css/editor-blocks.css
new file mode 100644
index 000000000..fc3cf223f
--- /dev/null
+++ b/css/editor-blocks.css
@@ -0,0 +1,424 @@
+/*
+Theme Name: Twenty Twelve
+Description: Used to style Gutenberg Blocks in the editor.
+*/
+
+/*--------------------------------------------------------------
+>>> TABLE OF CONTENTS:
+----------------------------------------------------------------
+1.0 General Typography
+2.0 General Block Styles
+3.0 Blocks - Common Blocks
+4.0 Blocks - Formatting
+5.0 Blocks - Layout Elements
+6.0 Blocks - Widgets
+--------------------------------------------------------------*/
+
+/*--------------------------------------------------------------
+1.0 General Typography
+--------------------------------------------------------------*/
+
+.edit-post-visual-editor .editor-block-list__block,
+.edit-post-visual-editor .editor-block-list__block p,
+.editor-default-block-appender input[type="text"].editor-default-block-appender__content {
+	font-size: 14px;
+}
+
+.edit-post-visual-editor .editor-block-list__block {
+	color: #444;
+}
+
+.editor-post-title__block .editor-post-title__input {
+	font-family: "Open Sans", Helvetica, Arial, sans-serif;
+	font-size: 20px;
+	font-weight: 400;
+}
+
+@media screen and (min-width: 600px) {
+	.editor-post-title__block .editor-post-title__input {
+		font-size: 22px;
+	}
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h1 {
+	font-size: 21px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h2 {
+	font-size: 18px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h3 {
+	font-size: 16px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h4 {
+	font-size: 14px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h5 {
+	font-size: 13px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h6 {
+	font-size: 12px;
+}
+
+/*--------------------------------------------------------------
+2.0 General Block Styles
+--------------------------------------------------------------*/
+
+/* Main column width */
+
+body.gutenberg-editor-page .edit-post-visual-editor .editor-post-title__block,
+body.gutenberg-editor-page .edit-post-visual-editor .editor-default-block-appender,
+body.gutenberg-editor-page .edit-post-visual-editor .editor-block-list__block {
+	max-width: 655px;
+}
+
+/* Link styles */
+
+.edit-post-visual-editor a,
+.editor-block-list__block a,
+.wp-block-freeform.block-library-rich-text__tinymce a {
+	color: #21759b;
+}
+
+/* List styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce ol,
+.wp-block-freeform.block-library-rich-text__tinymce ul:not(.wp-block-gallery),
+.block-library-list ol.editor-rich-text__tinymce,
+.block-library-list ul.editor-rich-text__tinymce:not(.wp-block-gallery) {
+	padding-left: 0;
+	padding-right: 0;
+}
+
+/* Quote styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote {
+	border: 0;
+	font-style: italic;
+	padding: 24px;
+}
+
+/* Table styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce th {
+	font-size: 11px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce td {
+	font-size: 12px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce th,
+.wp-block-freeform.block-library-rich-text__tinymce td {
+	padding-left: 0;
+	padding-right: 0;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce th,
+.rtl .wp-block-freeform.block-library-rich-text__tinymce td {
+	text-align: right;
+}
+
+/* Code styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce code {
+	background-color: transparent;
+	font-size: 12px;
+}
+
+/* Pre styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce pre {
+	font-size: 12px;
+}
+
+/* Captions */
+
+[class^="wp-block-"] figcaption,
+[class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body {
+	color: #757575;
+	font-size: 12px;
+	line-height: 2;
+	font-style: italic;
+	text-align: left;
+}
+
+.rtl [class^="wp-block-"] figcaption,
+.rtl [class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body {
+	text-align: right;
+}
+
+/* Definition Lists */
+
+.wp-block-freeform.block-library-rich-text__tinymce dt {
+	margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+3.0 Blocks - Common Blocks
+--------------------------------------------------------------*/
+
+/* Paragraph */
+
+p.has-drop-cap:not(:focus)::first-letter {
+	font-size: 5em;
+	margin-top: 0.1em;
+}
+
+/* Image */
+
+.wp-block-image {
+	margin-left: 0;
+	margin-right: 0;
+}
+
+/* Gallery */
+
+.wp-block-gallery {
+	margin-bottom: 24px;
+}
+
+.wp-block-gallery figcaption,
+.wp-block-gallery figcaption.editor-rich-text__tinymce.mce-content-body {
+	color: #fff;
+	text-align: center;
+}
+
+/* Quote */
+
+.wp-block-quote,
+.wp-block-quote:not(.is-large):not(.is-style-large) {
+	padding: 24px;
+}
+
+.wp-block-quote p {
+	font-style: italic;
+}
+
+.wp-block-quote:not(.is-large):not(.is-style-large) {
+	border: 0;
+}
+
+.wp-block-quote.is-large p,
+.wp-block-quote.is-style-large p {
+	font-size: 20px;
+}
+
+.wp-block-quote .wp-block-quote__citation {
+	color: inherit;
+	font-style: italic;
+}
+
+.wp-block-quote.is-large .wp-block-quote__citation,
+.wp-block-quote.is-style-large .wp-block-quote__citation {
+	font-size: 18px;
+}
+
+/* Cover Image */
+
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p {
+	font-size: 28px;
+}
+
+/* File */
+
+.wp-block-file .wp-block-file__textlink {
+	color: #21759b;
+	text-decoration: underline;
+}
+
+.wp-block-file .wp-block-file__button,
+.wp-block-button .wp-block-button__link:hover {
+	background-color: #e6e6e6;
+	background-repeat: repeat-x;
+	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	border: 1px solid #d2d2d2;
+	border-radius: 3px;
+	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+	color: #7c7c7c;
+	font-family: inherit;
+	font-size: 11px;
+	font-weight: normal;
+	line-height: 1.428571429;
+	padding: 6px 10px;
+}
+
+/*--------------------------------------------------------------
+4.0 Blocks - Formatting
+--------------------------------------------------------------*/
+
+/* Verse */
+
+.editor-block-list__block .wp-block-verse pre {
+	font-size: 12px;
+}
+
+/* Code */
+
+.wp-block-code {
+	border: 0;
+	font-size: 12px;
+	line-height: 2;
+	padding: 0;
+}
+
+.wp-block-html .CodeMirror-sizer {
+	line-height: 1.7;
+}
+
+/* Preformatted */
+
+.editor-block-list__block .wp-block-preformatted pre {
+	font-size: 12px;
+}
+
+/* Pullquote */
+
+.wp-block-pullquote {
+	font-style: italic;
+}
+
+.edit-post-visual-editor .wp-block-pullquote {
+	margin: 0;
+}
+
+.wp-block-pullquote .wp-block-pullquote__citation,
+.wp-block-pullquote cite {
+	font-size: 14px;
+	text-transform: none;
+}
+
+/* Table */
+
+.wp-block-table {
+	border-bottom: 1px solid #ededed;
+	border-collapse: collapse;
+	border-spacing: 0;
+	font-size: 14px;
+	line-height: 2;
+	margin: 0 0 20px;
+	width: 100%;
+}
+
+.editor-block-list__block .wp-block-table th {
+	border: 0;
+	font-size: 11px;
+	font-weight: bold;
+	text-transform: uppercase;
+}
+
+.editor-block-list__block .wp-block-table td {
+	border: 0;
+	border-top: 1px solid #ededed;
+	font-size: 12px;
+	padding: 0;
+}
+
+.wp-block-table__cell-content {
+	padding: 6px 10px 6px 0;
+}
+
+/*--------------------------------------------------------------
+5.0 Blocks - Layout Elements
+--------------------------------------------------------------*/
+
+/* Buttons */
+
+.wp-block-button .wp-block-button__link,
+.wp-block-button .wp-block-button__link:hover {
+	background-color: #e6e6e6;
+	background-repeat: repeat-x;
+	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	border: 1px solid #d2d2d2;
+	border-radius: 3px;
+	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+	color: #7c7c7c;
+	font-family: inherit;
+	font-size: 11px;
+	font-weight: normal;
+	line-height: 1.428571429;
+	padding: 6px 10px;
+}
+
+/* Separator */
+
+.editor-block-list__block hr.wp-block-separator {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+/*--------------------------------------------------------------
+6.0 Blocks - Widgets
+--------------------------------------------------------------*/
+
+/* Archives */
+.gutenberg ul.wp-block-archives {
+	padding-left: 0;
+}
+
+/* Categories */
+
+.gutenberg .wp-block-categories ul {
+	padding-left: 0;
+}
+
+/* Latest Comments */
+
+.editor-block-list__block .wp-block-latest-comments {
+	margin: 0;
+	padding: 0;
+}
+
+.wp-block-latest-comments .avatar,
+.wp-block-latest-comments__comment-avatar {
+	border-radius: 0;
+	box-shadow: none;
+}
+
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-excerpt,
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-meta {
+	margin-left: 60px;
+}
+
+.wp-block-latest-comments__comment,
+.wp-block-latest-comments__comment-excerpt,
+.wp-block-latest-comments__comment-excerpt p {
+	font-size: 14px;
+}
+
+.wp-block-latest-comments__comment-excerpt p:last-child {
+	margin-bottom: 0;
+}
+
+.wp-block-latest-comments__comment-date {
+	color: #5e5e5e;
+}
+
+.wp-block-latest-comments .wp-block-latest-comments__comment {
+	margin: 0;
+	padding: 24px 0;
+}
+
+.wp-block-latest-comments article {
+	border-bottom: 4px double #ededed;
+	padding-bottom: 2em;
+}
+
+/* Latest Posts */
+
+.gutenberg .wp-block-latest-posts {
+	padding-left: 0;
+	padding-right: 0;
+}
diff --git a/functions.php b/functions.php
index 10744c569..62d3a9a74 100644
--- a/functions.php
+++ b/functions.php
@@ -55,6 +55,44 @@ function twentytwelve_setup() {
 	// This theme styles the visual editor with editor-style.css to match the theme style.
 	add_editor_style();
 
+	// Load regular editor styles into the new block-based editor.
+	add_theme_support( 'editor-styles' );
+
+	// Load default block styles.
+	add_theme_support( 'wp-block-styles' );
+
+	// Add support for custom color scheme.
+	add_theme_support(
+		'editor-color-palette',
+		array(
+			array(
+				'name'  => __( 'Blue', 'twentytwelve' ),
+				'slug'  => 'blue',
+				'color' => '#21759b',
+			),
+			array(
+				'name'  => __( 'Dark Gray', 'twentytwelve' ),
+				'slug'  => 'dark-gray',
+				'color' => '#444',
+			),
+			array(
+				'name'  => __( 'Medium Gray', 'twentytwelve' ),
+				'slug'  => 'medium-gray',
+				'color' => '#9f9f9f',
+			),
+			array(
+				'name'  => __( 'Light Gray', 'twentytwelve' ),
+				'slug'  => 'light-gray',
+				'color' => '#e6e6e6',
+			),
+			array(
+				'name'  => __( 'White', 'twentytwelve' ),
+				'slug'  => 'white',
+				'color' => '#fff',
+			),
+		)
+	);
+
 	// Adds RSS feed links to <head> for posts and comments.
 	add_theme_support( 'automatic-feed-links' );
 
@@ -158,12 +196,28 @@ function twentytwelve_scripts_styles() {
 	// Loads our main stylesheet.
 	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
 
+	// Theme block stylesheet.
+	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181018' );
+
 	// Loads the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
 	$wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
 }
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
 
+/**
+ * Enqueue editor styles for Gutenberg
+ *
+ * @since Twenty Twelve 2.6
+ */
+function twentytwelve_block_editor_styles() {
+	// Block styles.
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css' );
+	// Add custom fonts.
+	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
+}
+add_action( 'enqueue_block_editor_assets', 'twentytwelve_block_editor_styles' );
+
 /**
  * Add preconnect for Google Fonts.
  *

From 0715ee43f5167e8d48ddd6605ddb876f3b36a283 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Fri, 14 Dec 2018 02:55:39 +0000
Subject: [PATCH 12/62] Bundled Themes: Expand initial block editor support.

A handful of items were missed when adding initial support for the new block editor to bundled themes in [43793]-[43800]. This adds support for those missed items.

Props pento, davidakennedy, laurelfulford.

Merges [43869], [43870], [43871], [43872], [43873], [43874], [43875], [43876] to trunk.

Fixes #45238, #45239, #45240, #45242, #45243, #45244, #45245, #45246.
Built from https://develop.svn.wordpress.org/trunk@44152


git-svn-id: http://core.svn.wordpress.org/trunk@43982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css        | 25 +++++++++++++++++++++++--
 css/editor-blocks.css | 30 ++++++++++++++++++++++++------
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/css/blocks.css b/css/blocks.css
index b3e3efb78..f19748190 100644
--- a/css/blocks.css
+++ b/css/blocks.css
@@ -127,9 +127,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	width: 100%;
 }
 
-/* Cover Image */
+/* Cover */
 
-.wp-block-cover-image.aligncenter {
+.wp-block-cover-image.aligncenter,
+.wp-block-cover.aligncenter {
 	display: flex;
 }
 
@@ -296,10 +297,30 @@ pre.wp-block-code {
 	border: 0;
 }
 
+/* Media & Text */
+
+.wp-block-media-text {
+	margin-bottom: 24px;
+	margin-bottom: 1.714285714rem;
+}
+
+.wp-block-media-text *:last-child {
+	margin-bottom: 0;
+}
+
 /*--------------------------------------------------------------
 5.0 Blocks - Widgets
 --------------------------------------------------------------*/
 
+/* Archives, Categories & Latest Posts */
+
+.wp-block-archives.aligncenter,
+.wp-block-categories.aligncenter,
+.wp-block-latest-posts.aligncenter {
+	list-style-position: inside;
+	text-align: center;
+}
+
 /* Latest Comments */
 
 .wp-block-latest-comments {
diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index fc3cf223f..7b40361ed 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -24,6 +24,10 @@ Description: Used to style Gutenberg Blocks in the editor.
 	font-size: 14px;
 }
 
+.editor-default-block-appender input[type="text"].editor-default-block-appender__content {
+	font-family: "Open Sans", Helvetica, Arial, sans-serif;
+}
+
 .edit-post-visual-editor .editor-block-list__block {
 	color: #444;
 }
@@ -70,10 +74,8 @@ Description: Used to style Gutenberg Blocks in the editor.
 
 /* Main column width */
 
-body.gutenberg-editor-page .edit-post-visual-editor .editor-post-title__block,
-body.gutenberg-editor-page .edit-post-visual-editor .editor-default-block-appender,
-body.gutenberg-editor-page .edit-post-visual-editor .editor-block-list__block {
-	max-width: 655px;
+.wp-block {
+	max-width: 655px; /* 625px + 30px for padding */
 }
 
 /* Link styles */
@@ -218,9 +220,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	font-size: 18px;
 }
 
-/* Cover Image */
+/* Cover */
 
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p {
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p,
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover p {
 	font-size: 28px;
 }
 
@@ -359,11 +362,26 @@ p.has-drop-cap:not(:focus)::first-letter {
 	margin-right: auto;
 }
 
+/* Media & Text */
+
+.wp-block-media-text *:last-child {
+	margin-bottom: 0;
+}
+
 /*--------------------------------------------------------------
 6.0 Blocks - Widgets
 --------------------------------------------------------------*/
 
+/* Archives, Categories & Latest Posts */
+
+[data-align="center"] .wp-block-archives ul,
+[data-align="center"] .wp-block-categories ul,
+[data-align="center"] .wp-block-latest-posts ul {
+	list-style-position: inside;
+}
+
 /* Archives */
+
 .gutenberg ul.wp-block-archives {
 	padding-left: 0;
 }

From 3db4c01c9b822f53f2caf97e3c647e487a7343c6 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 17 Dec 2018 03:07:04 +0000
Subject: [PATCH 13/62] Bundled Themes: Add theme support for responsive embeds

Add `add_theme_support( 'responsive-embeds' );` to all of the responsive default themes as part of their block editor support. This makes sure any embeds coming from the new block-based editor maintain their aspect ratios at different screen sizes.

Merges [43868] into trunk.

Props laurelfulford.
Fixes #45274.
Built from https://develop.svn.wordpress.org/trunk@44227


git-svn-id: http://core.svn.wordpress.org/trunk@44057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/functions.php b/functions.php
index 62d3a9a74..9fedeecd5 100644
--- a/functions.php
+++ b/functions.php
@@ -61,6 +61,9 @@ function twentytwelve_setup() {
 	// Load default block styles.
 	add_theme_support( 'wp-block-styles' );
 
+	// Add support for responsive embeds.
+	add_theme_support( 'responsive-embeds' );
+
 	// Add support for custom color scheme.
 	add_theme_support(
 		'editor-color-palette',

From 178d1e3f5d98b4fc4271b080be0d21a4229cee3d Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 17 Dec 2018 19:38:53 +0000
Subject: [PATCH 14/62] Default Themes: Bump the version numbers and release
 dates.

The POT files for Twenty Ten and Eleven have also been updated.

Props laurelfulford, maedahbatool, mrahmadawais, pento.

Merges [43964] into trunk.

Fixes #45167.
Built from https://develop.svn.wordpress.org/trunk@44279


git-svn-id: http://core.svn.wordpress.org/trunk@44109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 7 ++++++-
 style.css  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index a6b1e6b87..ef92bef2d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: the WordPress team
 Requires at least: WordPress 3.5
 Tested up to: WordPress 5.0-trunk
-Stable tag: 2.5
+Stable tag: 2.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 2.6 =
+* Released: December 6, 2018
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.6
+
 = 2.5 =
 * Released: May 17, 2018
 
diff --git a/style.css b/style.css
index c5df75f42..4fd5be1a9 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.5
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From a8708d62cf271c8bd19bdda40238a5420aaf4886 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 19 Dec 2018 03:22:31 +0000
Subject: [PATCH 15/62] Twenty Twelve: Fix button block custom colors.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify some of the button block’s CSS selectors in the theme, to make sure the default colors don’t override the custom colors on the front end.

Also make sure the button’s gradient is not applied when a custom background color is added, since it will hide it.

Props laurelfulford.

Merges [44194] to trunk.

Fixes #45432.
Built from https://develop.svn.wordpress.org/trunk@44303


git-svn-id: http://core.svn.wordpress.org/trunk@44133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css        | 84 +++++++++++++++++++++++++++++--------------
 css/editor-blocks.css | 34 ++++++++++++------
 2 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/css/blocks.css b/css/blocks.css
index f19748190..554ddd3fe 100644
--- a/css/blocks.css
+++ b/css/blocks.css
@@ -244,19 +244,9 @@ pre.wp-block-code {
 
 /* Buttons */
 
-.wp-block-button .wp-block-button__link,
-.wp-block-button .wp-block-button__link:visited {
-	background-color: #e6e6e6;
-	background-repeat: repeat-x;
-	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+.wp-block-button .wp-block-button__link {
 	border: 1px solid #d2d2d2;
 	border-radius: 3px;
-	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
-	color: #7c7c7c;
 	font-family: inherit;
 	font-size: 11px;
 	font-size: 0.785714286rem;
@@ -266,20 +256,48 @@ pre.wp-block-code {
 	padding: 0.428571429rem 0.714285714rem;
 }
 
-.wp-block-button .wp-block-button__link:hover,
-.wp-block-button .wp-block-button__link:focus {
+.entry-content .wp-block-button__link,
+.entry-content .wp-block-button__link:visited {
+	background-color: #e6e6e6;
+	color: #7c7c7c;
+}
+
+.entry-content .wp-block-button__link:hover,
+.entry-content .wp-block-button__link:visited:hover,
+.entry-content .wp-block-button__link:focus {
 	background-color: #ebebeb;
+	color: #5e5e5e;
+}
+
+.entry-content .wp-block-button__link:active {
+	background-color: #e1e1e1;
+	color: #757575;
+}
+
+.wp-block-button__link:not(.has-background) {
+	background-repeat: repeat-x;
+	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+}
+
+.wp-block-button__link:not(.has-text-color) {
+	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+}
+
+.wp-block-button__link:not(.has-background):hover,
+.wp-block-button__link:not(.has-background):focus {
 	background-image: -moz-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
 	background-repeat: repeat-x;
-	color: #5e5e5e;
 }
 
-.wp-block-button .wp-block-button__link:active {
-	background-color: #e1e1e1;
+.wp-block-button__link:not(.has-background):active {
 	background-image: -moz-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
@@ -287,8 +305,10 @@ pre.wp-block-code {
 	background-image: linear-gradient(top, #ebebeb, #e1e1e1);
 	background-repeat: repeat-x;
 	border-color: transparent;
+}
+
+.wp-block-button__link:not(.has-text-color):active {
 	box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
-	color: #757575;
 }
 
 /* Separator */
@@ -367,42 +387,52 @@ pre.wp-block-code {
 6.0 Blocks - Colors
 --------------------------------------------------------------*/
 
-.has-blue-color {
+.entry-content .has-blue-color,
+.entry-content .has-blue-color:visited {
 	color: #21759b;
 }
 
-.has-blue-background-color {
+.entry-content .has-blue-background-color,
+.entry-content .has-blue-background-color:visited {
 	background-color: #21759b;
 }
 
-.has-dark-gray-color {
+.entry-content .has-dark-gray-color,
+.entry-content .has-dark-gray-color:visited {
 	color: #373737;
 }
 
-.has-dark-gray-background-color {
+.entry-content .has-dark-gray-background-color,
+.entry-content .has-dark-gray-background-color:visited {
 	background-color: #373737;
 }
 
-.has-medium-gray-color {
+.entry-content .has-medium-gray-color,
+.entry-content .has-medium-gray-color:visited {
 	color: #9f9f9f;
 }
 
-.has-medium-gray-background-color {
+.entry-content .has-medium-gray-background-color,
+.entry-content .has-medium-gray-background-color:visited {
 	background-color: #9f9f9f;
 }
 
-.has-light-gray-color {
+.entry-content .has-light-gray-color,
+.entry-content .has-light-gray-color:visited {
 	color: #e6e6e6;
 }
 
-.has-light-gray-background-color {
+.entry-content .has-light-gray-background-color,
+.entry-content .has-light-gray-background-color:visited {
 	background-color: #e6e6e6;
 }
 
-.has-white-color {
+.entry-content .has-white-color,
+.entry-content .has-white-color:visited {
 	color: #fff;
 }
 
-.has-white-background-color {
+.entry-content .has-white-background-color,
+.entry-content .has-white-background-color:visited {
 	background-color: #fff;
 }
diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index 7b40361ed..b8687a711 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -235,7 +235,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 }
 
 .wp-block-file .wp-block-file__button,
-.wp-block-button .wp-block-button__link:hover {
+.wp-block-button .wp-block-file__button:hover {
 	background-color: #e6e6e6;
 	background-repeat: repeat-x;
 	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
@@ -335,19 +335,14 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Buttons */
 
-.wp-block-button .wp-block-button__link,
-.wp-block-button .wp-block-button__link:hover {
+.wp-block-button__link {
 	background-color: #e6e6e6;
-	background-repeat: repeat-x;
-	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	color: #7c7c7c;
+}
+
+.wp-block-button .wp-block-button__link {
 	border: 1px solid #d2d2d2;
 	border-radius: 3px;
-	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
-	color: #7c7c7c;
 	font-family: inherit;
 	font-size: 11px;
 	font-weight: normal;
@@ -355,6 +350,23 @@ p.has-drop-cap:not(:focus)::first-letter {
 	padding: 6px 10px;
 }
 
+.wp-block-button .editor-rich-text__tinymce.mce-content-body {
+	line-height: 1.428571429;
+}
+
+.wp-block-button__link:not(.has-text-color) {
+	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+}
+
+.wp-block-button .wp-block-button__link:not(.has-background) {
+	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-repeat: repeat-x;
+}
+
 /* Separator */
 
 .editor-block-list__block hr.wp-block-separator {

From 59967a78325c8cc02b8f65fb7e45b20f5921f0a4 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 19 Dec 2018 03:29:51 +0000
Subject: [PATCH 16/62] Bundled Themes: Update default block appender selector.

The markup for the default block appender changed from a text input to a text area in the editor; this update makes the same change in the default theme styles.

Props laurelfulford.

Merges [44212] into trunk.

Fixes #45450.
Built from https://develop.svn.wordpress.org/trunk@44312


git-svn-id: http://core.svn.wordpress.org/trunk@44142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/editor-blocks.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index b8687a711..142127bc7 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -20,11 +20,11 @@ Description: Used to style Gutenberg Blocks in the editor.
 
 .edit-post-visual-editor .editor-block-list__block,
 .edit-post-visual-editor .editor-block-list__block p,
-.editor-default-block-appender input[type="text"].editor-default-block-appender__content {
+.editor-default-block-appender textarea.editor-default-block-appender__content {
 	font-size: 14px;
 }
 
-.editor-default-block-appender input[type="text"].editor-default-block-appender__content {
+.editor-default-block-appender textarea.editor-default-block-appender__content {
 	font-family: "Open Sans", Helvetica, Arial, sans-serif;
 }
 

From a916d85205c2738c3533f6eb2ee583388d8a4820 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 19 Dec 2018 03:30:41 +0000
Subject: [PATCH 17/62] =?UTF-8?q?Bundled=20Themes:=20Replace=20=E2=80=9CGu?=
 =?UTF-8?q?tenberg=E2=80=9D=20in=20code=20comments=20and=20classes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This update replaces the term “Gutenberg” in the themes code comments and classes with something more future-friendly.

Props laurelfulford.

Merges [44213] into trunk.

Fixes #45452.
Built from https://develop.svn.wordpress.org/trunk@44313


git-svn-id: http://core.svn.wordpress.org/trunk@44143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css        | 2 +-
 css/editor-blocks.css | 8 ++++----
 functions.php         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/css/blocks.css b/css/blocks.css
index 554ddd3fe..a03cef640 100644
--- a/css/blocks.css
+++ b/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Twelve
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index 142127bc7..99be72d4d 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Twelve
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
@@ -394,13 +394,13 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Archives */
 
-.gutenberg ul.wp-block-archives {
+.editor-block-list__block ul.wp-block-archives {
 	padding-left: 0;
 }
 
 /* Categories */
 
-.gutenberg .wp-block-categories ul {
+.editor-block-list__block .wp-block-categories ul {
 	padding-left: 0;
 }
 
@@ -448,7 +448,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Latest Posts */
 
-.gutenberg .wp-block-latest-posts {
+.editor-block-list__block .wp-block-latest-posts {
 	padding-left: 0;
 	padding-right: 0;
 }
diff --git a/functions.php b/functions.php
index 9fedeecd5..c76d661e6 100644
--- a/functions.php
+++ b/functions.php
@@ -209,7 +209,7 @@ function twentytwelve_scripts_styles() {
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Twelve 2.6
  */

From 872bb1e4471b5d3d7d0382f0bd1cc539182fb2dc Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Wed, 19 Dec 2018 03:38:04 +0000
Subject: [PATCH 18/62] Default Themes: Bump the version numbers and release
 dates.

Update the theme versions and release dates for the default themes, in time for WordPress 5.0.2.

The POT files for Twenty Ten and Twenty Eleven have also been updated.

Fixes #45681.


Built from https://develop.svn.wordpress.org/trunk@44322


git-svn-id: http://core.svn.wordpress.org/trunk@44152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 9 +++++++--
 style.css  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index ef92bef2d..af2434ff6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 === Twenty Twelve ===
 Contributors: the WordPress team
 Requires at least: WordPress 3.5
-Tested up to: WordPress 5.0-trunk
-Stable tag: 2.6
+Tested up to: WordPress 5.0
+Stable tag: 2.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 2.7 =
+* Released: December 19, 2018
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.7
+
 = 2.6 =
 * Released: December 6, 2018
 
diff --git a/style.css b/style.css
index 4fd5be1a9..b8f55546a 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.6
+Version: 2.7
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From e54d54d2150fdf052a995b3513c9e26252e352be Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Wed, 2 Jan 2019 03:53:53 +0000
Subject: [PATCH 19/62] Bundled Themes: Make sure button blocks respect
 settings.

When the original block editor styles were added to the existing default themes, the button blocks were styled to match how each theme styled the `button` tag.

However, the styles should respect the block editor's default style, "Rounded", and allow switching to the other styles, like "Outlined" and "Square".

Fixes #45541.


Built from https://develop.svn.wordpress.org/trunk@44381


git-svn-id: http://core.svn.wordpress.org/trunk@44211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css        |  9 +++++++--
 css/editor-blocks.css | 11 +++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/css/blocks.css b/css/blocks.css
index a03cef640..5a645daf8 100644
--- a/css/blocks.css
+++ b/css/blocks.css
@@ -246,7 +246,6 @@ pre.wp-block-code {
 
 .wp-block-button .wp-block-button__link {
 	border: 1px solid #d2d2d2;
-	border-radius: 3px;
 	font-family: inherit;
 	font-size: 11px;
 	font-size: 0.785714286rem;
@@ -262,6 +261,12 @@ pre.wp-block-code {
 	color: #7c7c7c;
 }
 
+.wp-block-button.is-style-outline .wp-block-button__link,
+.wp-block-button.is-style-outline .wp-block-button__link:visited {
+	background-color: inherit;
+	border-color: inherit;
+}
+
 .entry-content .wp-block-button__link:hover,
 .entry-content .wp-block-button__link:visited:hover,
 .entry-content .wp-block-button__link:focus {
@@ -274,7 +279,7 @@ pre.wp-block-code {
 	color: #757575;
 }
 
-.wp-block-button__link:not(.has-background) {
+.wp-block-button:not(.is-style-outline) .wp-block-button__link:not(.has-background) {
 	background-repeat: repeat-x;
 	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index 99be72d4d..bd5313b46 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -234,8 +234,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-decoration: underline;
 }
 
-.wp-block-file .wp-block-file__button,
-.wp-block-button .wp-block-file__button:hover {
+.wp-block-file .wp-block-file__button {
 	background-color: #e6e6e6;
 	background-repeat: repeat-x;
 	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
@@ -342,7 +341,6 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 .wp-block-button .wp-block-button__link {
 	border: 1px solid #d2d2d2;
-	border-radius: 3px;
 	font-family: inherit;
 	font-size: 11px;
 	font-weight: normal;
@@ -358,7 +356,12 @@ p.has-drop-cap:not(:focus)::first-letter {
 	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
 }
 
-.wp-block-button .wp-block-button__link:not(.has-background) {
+.wp-block-button.is-style-outline .wp-block-button__link {
+	background-color: inherit;
+	border-color: inherit;
+}
+
+.wp-block-button:not(.is-style-outline) .wp-block-button__link:not(.has-background) {
 	background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);

From e9b30739099a6186f9be56b3b454d7a20cbfc9e7 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Wed, 2 Jan 2019 18:04:50 +0000
Subject: [PATCH 20/62] Bundled Themes: Bump script and style version numbers.

When existing scripts or styles are updated in default themes, the version numbers in the enqueues should also be bumped to make sure the old files don't cache. This update bumps version numbers for changes since version 5.0, for themes Twenty Eleven through Twenty Nineteen.

Fixes #45679.


Built from https://develop.svn.wordpress.org/trunk@44382


git-svn-id: http://core.svn.wordpress.org/trunk@44212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index c76d661e6..95a7299a7 100644
--- a/functions.php
+++ b/functions.php
@@ -200,7 +200,7 @@ function twentytwelve_scripts_styles() {
 	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181018' );
+	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181230' );
 
 	// Loads the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
@@ -215,7 +215,7 @@ add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
  */
 function twentytwelve_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css' );
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
 	// Add custom fonts.
 	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
 }

From 5d0644fc72562b3811a97da734b3843f30917a27 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 7 Jan 2019 18:09:54 +0000
Subject: [PATCH 21/62] Twenty Twelve: Correct `padding` rule precedence for
 Quote block.

Props superpoincare.
Fixes #45794.
Built from https://develop.svn.wordpress.org/trunk@44432


git-svn-id: http://core.svn.wordpress.org/trunk@44263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/blocks.css b/css/blocks.css
index 5a645daf8..f72a61b76 100644
--- a/css/blocks.css
+++ b/css/blocks.css
@@ -99,13 +99,13 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 .wp-block-quote:not(.is-large):not(.is-style-large) {
 	border: 0;
-	padding: 1.714285714rem;
 	padding: 24px;
+	padding: 1.714285714rem;
 }
 
 .wp-block-quote {
-	padding: 1.714285714rem;
 	padding: 24px;
+	padding: 1.714285714rem;
 }
 
 .wp-block-quote cite {

From 049772a894a073ff41d7666aa4ec3b0a9afbc3b1 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 7 Jan 2019 18:58:50 +0000
Subject: [PATCH 22/62] Default Themes: Bump the version numbers and release
 dates.

Update the theme versions and release dates for the default themes, in time for WordPress 5.0.3.

The POT file for Twenty Eleven has also been updated.

Props laurelfulford.
Fixes #45792.
Built from https://develop.svn.wordpress.org/trunk@44435


git-svn-id: http://core.svn.wordpress.org/trunk@44266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 7 ++++++-
 style.css  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index af2434ff6..7f852f693 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: the WordPress team
 Requires at least: WordPress 3.5
 Tested up to: WordPress 5.0
-Stable tag: 2.7
+Stable tag: 2.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 2.8 =
+* Released: January 9, 2019
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.8
+
 = 2.7 =
 * Released: December 19, 2018
 
diff --git a/style.css b/style.css
index b8f55546a..3d59ad733 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.7
+Version: 2.8
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From 308af6f3d4e024202f21de334eec4bb082e16d20 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Wed, 9 Jan 2019 05:09:51 +0000
Subject: [PATCH 23/62] Docs: Update Codex references to the
 `Template_Hierarchy` page.

https://codex.wordpress.org/Template_Hierarchy redirects to https://developer.wordpress.org/themes/basics/template-hierarchy/, so we should link to the correct page.

Props kmeze, pento.
Fixes #45222.


Built from https://develop.svn.wordpress.org/trunk@44496


git-svn-id: http://core.svn.wordpress.org/trunk@44327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php  | 2 +-
 author.php   | 2 +-
 category.php | 2 +-
 image.php    | 2 +-
 index.php    | 2 +-
 tag.php      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/archive.php b/archive.php
index edd947ef0..44a0d6294 100644
--- a/archive.php
+++ b/archive.php
@@ -10,7 +10,7 @@
  * has tag.php for Tag archives, category.php for Category archives, and
  * author.php for Author archives.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
diff --git a/author.php b/author.php
index 0dbd267d6..0607a781f 100644
--- a/author.php
+++ b/author.php
@@ -4,7 +4,7 @@
  *
  * Used to display archive-type pages for posts by an author.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
diff --git a/category.php b/category.php
index 0625a7d6c..558946dcd 100644
--- a/category.php
+++ b/category.php
@@ -4,7 +4,7 @@
  *
  * Used to display archive-type pages for posts in a category.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
diff --git a/image.php b/image.php
index 76d3a549a..b6b1dc864 100644
--- a/image.php
+++ b/image.php
@@ -2,7 +2,7 @@
 /**
  * The template for displaying image attachments
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
diff --git a/index.php b/index.php
index e201be0ca..8b89fee3b 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
  * It is used to display a page when nothing more specific matches a query.
  * For example, it puts together the home page when no home.php file exists.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
diff --git a/tag.php b/tag.php
index 515521c78..1d094f47b 100644
--- a/tag.php
+++ b/tag.php
@@ -4,7 +4,7 @@
  *
  * Used to display archive-type pages for posts in a tag.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve

From cd2e6d25237b767d061250c9bd657eb08cada1f7 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Wed, 9 Jan 2019 06:11:51 +0000
Subject: [PATCH 24/62] Bundled Themes: Run the `pingback_url` through
 `esc_url()`.

Twenties Ten through Seventeen have been updated to properly escape the pingback URL. Twenty Nineteen is already escaping the URL.

Props soulseekah, sharaz.
Fixes #43717.


Built from https://develop.svn.wordpress.org/trunk@44500


git-svn-id: http://core.svn.wordpress.org/trunk@44331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/header.php b/header.php
index cbd555c31..107c0a185 100644
--- a/header.php
+++ b/header.php
@@ -23,7 +23,7 @@
 <meta name="viewport" content="width=device-width" />
 <title><?php wp_title( '|', true, 'right' ); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
-<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <?php // Loads HTML5 JavaScript file to add support for HTML5 elements in older IE versions. ?>
 <!--[if lt IE 9]>
 <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>

From 10adb1813df926369246b8f9fd2f30f67a9c7f2a Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 11 Jan 2019 06:04:49 +0000
Subject: [PATCH 25/62] Coding Standards: Fix the minor `WordPress.WP.I18n`
 violations.

`WordPress.WP.I18n.MissingTranslatorsComment` is in progress in #44360.

See #45934.


Built from https://develop.svn.wordpress.org/trunk@44562


git-svn-id: http://core.svn.wordpress.org/trunk@44393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 comments.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/comments.php b/comments.php
index 010c1aedf..5537fc460 100644
--- a/comments.php
+++ b/comments.php
@@ -29,11 +29,20 @@ if ( post_password_required() ) {
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
+			if ( 1 === get_comments_number() ) {
 				printf(
-					_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
+					/* translators: %s: The post title. */
+					__( 'One thought on &ldquo;%s&rdquo;', 'twentytwelve' ),
+					'<span>' . get_the_title() . '</span>'
+				);
+			} else {
+				printf(
+					/* translators: %1$s: The number of comments. %2$s: The post title. */
+					_n( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
 					number_format_i18n( get_comments_number() ),
 					'<span>' . get_the_title() . '</span>'
 				);
+			}
 			?>
 		</h2>
 

From c2c485568c875f3ee683d6b3f3d7fcd72420da57 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Thu, 7 Feb 2019 23:23:50 +0000
Subject: [PATCH 26/62] Default Themes: Bump the version numbers and release
 dates.

Update the theme versions and release dates for the default themes, in time for WordPress 5.1.

The POT files for Twenty Eleven and Twenty Ten have also been updated.

Fixes #46070.


Built from https://develop.svn.wordpress.org/trunk@44730


git-svn-id: http://core.svn.wordpress.org/trunk@44561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 7 ++++++-
 style.css  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 7f852f693..a5866f06a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: the WordPress team
 Requires at least: WordPress 3.5
 Tested up to: WordPress 5.0
-Stable tag: 2.8
+Stable tag: 2.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 2.9 =
+* Released: February 21, 2019
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.9
+
 = 2.8 =
 * Released: January 9, 2019
 
diff --git a/style.css b/style.css
index 3d59ad733..d5e9127b9 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.8
+Version: 2.9
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From c1c1abd211288dc9c1abe01e327de594a6adfe12 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Wed, 27 Mar 2019 21:59:52 +0000
Subject: [PATCH 27/62] Bundled Theme: trigger a new `wp_body_open` action
 immediately after the opening `body` tag.

* Enables inserting (asynchronous) JavaScript right after the opening `body` tag.
* Add a `wp_body_open` helper function that triggers the `wp_body_open` action.
* Call `wp_body_open` in core themes immediately after the opening `body` tag.

Props joostdevalk, valendesigns, nacin, saracup, jorbin, mikeschinkel, jonnybojangles, lgedeon, Willscrlt, Denis-de-Bernardy, lexiqueen, sky_76, welcher, westonruter, ramiy, joyously.
Fixes #12563.

Built from https://develop.svn.wordpress.org/trunk@45042


git-svn-id: http://core.svn.wordpress.org/trunk@44851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 header.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/header.php b/header.php
index 107c0a185..f8ff59907 100644
--- a/header.php
+++ b/header.php
@@ -32,6 +32,7 @@
 </head>
 
 <body <?php body_class(); ?>>
+<?php wp_body_open(); ?>
 <div id="page" class="hfeed site">
 	<header id="masthead" class="site-header" role="banner">
 		<hgroup>

From b718c32bed06eb9c78a68c0bd4ba22ffa89bd42d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 1 Apr 2019 11:56:52 +0000
Subject: [PATCH 28/62] Bundled Themes: Link to an updated documentation on
 child themes on developer.wordpress.org, instead of Codex.

Props man4toman, andraganescu.
Fixes #46450.
Built from https://develop.svn.wordpress.org/trunk@45081


git-svn-id: http://core.svn.wordpress.org/trunk@44890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/functions.php b/functions.php
index 95a7299a7..22c212edb 100644
--- a/functions.php
+++ b/functions.php
@@ -6,11 +6,13 @@
  * in the theme as custom template tags. Others are attached to action and
  * filter hooks in WordPress to change core functionality.
  *
- * When using a child theme (see https://codex.wordpress.org/Theme_Development and
- * https://codex.wordpress.org/Child_Themes), you can override certain functions
- * (those wrapped in a function_exists() call) by defining them first in your child theme's
- * functions.php file. The child theme's functions.php file is included before the parent
- * theme's file, so the child theme functions would be used.
+ * When using a child theme you can override certain functions (those wrapped
+ * in a function_exists() call) by defining them first in your child theme's
+ * functions.php file. The child theme's functions.php file is included before
+ * the parent theme's file, so the child theme functions would be used.
+ *
+ * @link https://codex.wordpress.org/Theme_Development
+ * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/
  *
  * Functions that are not pluggable (not wrapped in function_exists()) are instead attached
  * to a filter or action hook.

From 3f14f7ea2a585d3ad5b8109de3e6b5516aad45d4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 6 Apr 2019 16:17:50 +0000
Subject: [PATCH 29/62] Twenty Twelve: Correct `linear-gradient` direction
 argument syntax.

In CSS, the `linear-gradient` function requires that the direction value explicitly use `to` instead of an implicit `from`.

Props: ianbelanger, joyously, man4toman.
Fixes #46786.
Built from https://develop.svn.wordpress.org/trunk@45124


git-svn-id: http://core.svn.wordpress.org/trunk@44933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/blocks.css        | 12 ++++++------
 css/editor-blocks.css |  4 ++--
 style.css             |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/css/blocks.css b/css/blocks.css
index f72a61b76..a88ffcbfe 100644
--- a/css/blocks.css
+++ b/css/blocks.css
@@ -143,7 +143,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6);
 	border: 1px solid #d2d2d2;
 	border-radius: 3px;
 	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
@@ -164,7 +164,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
-	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: linear-gradient(to bottom, #f9f9f9, #ebebeb);
 	background-repeat: repeat-x;
 	color: #5e5e5e;
 }
@@ -175,7 +175,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
-	background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: linear-gradient(to bottom, #ebebeb, #e1e1e1);
 	background-repeat: repeat-x;
 	border-color: transparent;
 	box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
@@ -285,7 +285,7 @@ pre.wp-block-code {
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6);
 }
 
 .wp-block-button__link:not(.has-text-color) {
@@ -298,7 +298,7 @@ pre.wp-block-code {
 	background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
-	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: linear-gradient(to bottom, #f9f9f9, #ebebeb);
 	background-repeat: repeat-x;
 }
 
@@ -307,7 +307,7 @@ pre.wp-block-code {
 	background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
-	background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: linear-gradient(to bottom, #ebebeb, #e1e1e1);
 	background-repeat: repeat-x;
 	border-color: transparent;
 }
diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index bd5313b46..8c3d66cdb 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -241,7 +241,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6);
 	border: 1px solid #d2d2d2;
 	border-radius: 3px;
 	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
@@ -366,7 +366,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6);
 	background-repeat: repeat-x;
 }
 
diff --git a/style.css b/style.css
index d5e9127b9..3aebc50fa 100644
--- a/style.css
+++ b/style.css
@@ -255,7 +255,7 @@ article.post-password-required input[type=submit],
 	background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
 	background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
-	background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+	background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6);
 	border: 1px solid #d2d2d2;
 	border-radius: 3px;
 	box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
@@ -285,7 +285,7 @@ article.post-password-required input[type=submit]:hover {
 	background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
 	background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
-	background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+	background-image: linear-gradient(to bottom, #f9f9f9, #ebebeb);
 }
 .menu-toggle:active,
 .menu-toggle.toggled-on,
@@ -300,7 +300,7 @@ input[type="reset"]:active {
 	background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
 	background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
-	background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+	background-image: linear-gradient(to bottom, #ebebeb, #e1e1e1);
 	box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
 	border-color: transparent;
 }
@@ -1276,7 +1276,7 @@ article.format-quote .entry-content blockquote {
 	background-image: -ms-linear-gradient(top, #009cee, #0088d0);
 	background-image: -webkit-linear-gradient(top, #009cee, #0088d0);
 	background-image: -o-linear-gradient(top, #009cee, #0088d0);
-	background-image: linear-gradient(top, #009cee, #0088d0);
+	background-image: linear-gradient(to bottom, #009cee, #0088d0);
 	border-radius: 3px;
 	border: 1px solid #007cbd;
 }

From 67e75d5fb34b486f8466a88df7095c7b42f4a889 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 16 Apr 2019 14:56:51 +0000
Subject: [PATCH 30/62] Bundled Themes: Use the theme version when enqueuing
 theme specific stylesheets.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For many bundled theme related stylesheets, a version is either not specified, or specified as a hardcoded date string when enqueued. This is problematic when a stylesheet is updated and the version number is not (which has happened several times recently). This change ensures that all bundled theme related stylesheets use the theme’s version as the stylesheet version. This ensures cache busting for theme stylesheets every time a theme is updated and guarantees that users receive any new or updated styles included in the update when visiting the site for the first time after an update.

Props parsmizban, ianbelanger, dswebsme.
Fixes #39997.
Built from https://develop.svn.wordpress.org/trunk@45213


git-svn-id: http://core.svn.wordpress.org/trunk@45022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions.php b/functions.php
index 22c212edb..27681d220 100644
--- a/functions.php
+++ b/functions.php
@@ -199,13 +199,13 @@ function twentytwelve_scripts_styles() {
 	}
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
+	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181230' );
+	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), wp_get_theme()->get( 'Version' ) );
 
 	// Loads the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
+	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), wp_get_theme()->get( 'Version' ) );
 	$wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
 }
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
@@ -217,7 +217,7 @@ add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
  */
 function twentytwelve_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
 	// Add custom fonts.
 	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
 }

From 5d1aea0de0b410aefd1a4509ab9bce7b50992705 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 16 Apr 2019 18:22:52 +0000
Subject: [PATCH 31/62] Bundled Themes: Reverts [45213].

Reverting to address backward compatibility concerns in Twenty Eleven and Twenty Ten.

See #39997.
Built from https://develop.svn.wordpress.org/trunk@45218


git-svn-id: http://core.svn.wordpress.org/trunk@45027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions.php b/functions.php
index 27681d220..22c212edb 100644
--- a/functions.php
+++ b/functions.php
@@ -199,13 +199,13 @@ function twentytwelve_scripts_styles() {
 	}
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181230' );
 
 	// Loads the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
 	$wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
 }
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
@@ -217,7 +217,7 @@ add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
  */
 function twentytwelve_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
 	// Add custom fonts.
 	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
 }

From 27acbc2ef492afd292da99200667dadd5bc14df0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 19 Apr 2019 13:41:54 +0000
Subject: [PATCH 32/62] Bundled Themes: Update `readme.txt` files to pass Theme
 Review guidelines.

Props rabmalin.
Fixes #45871.
Built from https://develop.svn.wordpress.org/trunk@45250


git-svn-id: http://core.svn.wordpress.org/trunk@45059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index a5866f06a..57b999181 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,8 @@
 === Twenty Twelve ===
-Contributors: the WordPress team
+Contributors: wordpressdotorg
 Requires at least: WordPress 3.5
 Tested up to: WordPress 5.0
+Requires PHP: 5.2.4
 Stable tag: 2.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

From 369208ac1e75eb55817c73e41432523a47e2f2fe Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Tue, 23 Apr 2019 13:04:56 +0000
Subject: [PATCH 33/62] Bundled Theme: add a `wp_body_open` shim for older
 WordPress versions.

WordPress 5.2 adds the `wp_body_open()` function, and the default themes make use of it. This patch adds a shim for `wp_body_open` to bundled themes so this function will also work in older versions of WordPress.

Props lgedeon, johnbillion, timph, ramiy, pento.
Fixes #46679.


Built from https://develop.svn.wordpress.org/trunk@45256


git-svn-id: http://core.svn.wordpress.org/trunk@45065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index 22c212edb..ad89b2ac7 100644
--- a/functions.php
+++ b/functions.php
@@ -667,7 +667,6 @@ function twentytwelve_customize_preview_js() {
 }
 add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
 
-
 /**
  * Modifies tag cloud widget arguments to display all tags in the same font size
  * and use list format for better accessibility.
@@ -686,3 +685,21 @@ function twentytwelve_widget_tag_cloud_args( $args ) {
 	return $args;
 }
 add_filter( 'widget_tag_cloud_args', 'twentytwelve_widget_tag_cloud_args' );
+
+if ( ! function_exists( 'wp_body_open' ) ) :
+	/**
+	 * Fire the wp_body_open action.
+	 *
+	 * Added for backwards compatibility to support pre 5.2.0 WordPress versions.
+	 *
+	 * @since Twenty Twelve 3.0
+	 */
+	function wp_body_open() {
+		/**
+		 * Triggered after the opening <body> tag.
+		 *
+		 * @since Twenty Twelve 3.0
+		 */
+		do_action( 'wp_body_open' );
+	}
+endif;

From 0e1c520a46a8452e36a674d678f6b1970e71a799 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Tue, 7 May 2019 18:49:53 +0000
Subject: [PATCH 34/62] Default Themes: Bump the version numbers and release
 dates.

Update the theme versions and release dates for the default themes, in time for WordPress 5.2.

The POT files for Twenty Eleven and Twenty Ten have also been updated.

Fixes #47172.


Built from https://develop.svn.wordpress.org/trunk@45289


git-svn-id: http://core.svn.wordpress.org/trunk@45098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 7 ++++++-
 style.css  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 57b999181..6d3aa4534 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: wordpressdotorg
 Requires at least: WordPress 3.5
 Tested up to: WordPress 5.0
 Requires PHP: 5.2.4
-Stable tag: 2.9
+Stable tag: 3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -44,6 +44,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 3.0 =
+* Released: May 7, 2019
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.0
+
 = 2.9 =
 * Released: February 21, 2019
 
diff --git a/style.css b/style.css
index 3aebc50fa..d763bde4c 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.9
+Version: 3.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From b8920e6502a9d4c7f7488eee190f1f6fb9e6364c Mon Sep 17 00:00:00 2001
From: Felix Arntz <felix-arntz@leaves-and-love.net>
Date: Fri, 31 May 2019 10:10:54 +0000
Subject: [PATCH 35/62] Bundled Theme: Load Google fonts with
 `display=fallback` parameter for better UX in case the font cannot be loaded.

Providing this query parameter ensures the stylesheet contains the `font-display: fallback` rule. This changeset also updates the Open Sans font used by core accordingly.

Props westonruter.
Fixes #47282.

Built from https://develop.svn.wordpress.org/trunk@45485


git-svn-id: http://core.svn.wordpress.org/trunk@45296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index ad89b2ac7..2a3115599 100644
--- a/functions.php
+++ b/functions.php
@@ -165,8 +165,9 @@ function twentytwelve_get_font_url() {
 		}
 
 		$query_args = array(
-			'family' => 'Open+Sans:400italic,700italic,400,700',
-			'subset' => $subsets,
+			'family'  => urlencode( 'Open+Sans:400italic,700italic,400,700' ),
+			'subset'  => urlencode( $subsets ),
+			'display' => urlencode( 'fallback' ),
 		);
 		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
 	}

From 1eee82c903ac8adc8fc7dc74b2754aca4142e78c Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 12 Jun 2019 23:33:50 +0000
Subject: [PATCH 36/62] Bundled Theme: Fix malformed Google Font URL for Twenty
 Twelve due to double-encoding of `+`

Amends [45485].
Fixes #47282.

Built from https://develop.svn.wordpress.org/trunk@45525


git-svn-id: http://core.svn.wordpress.org/trunk@45336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index 2a3115599..53f699710 100644
--- a/functions.php
+++ b/functions.php
@@ -165,7 +165,7 @@ function twentytwelve_get_font_url() {
 		}
 
 		$query_args = array(
-			'family'  => urlencode( 'Open+Sans:400italic,700italic,400,700' ),
+			'family'  => urlencode( 'Open Sans:400italic,700italic,400,700' ),
 			'subset'  => urlencode( $subsets ),
 			'display' => urlencode( 'fallback' ),
 		);

From e23ae9ea877feafeb5941b830ac326ffc5321016 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Tue, 9 Jul 2019 01:10:00 +0000
Subject: [PATCH 37/62] Coding Standards: Add missing translator comments to
 the default themes.

All default themes now have translator comments for all strings with placeholders!

See #46732.

Built from https://develop.svn.wordpress.org/trunk@45609


git-svn-id: http://core.svn.wordpress.org/trunk@45420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php        | 21 ++++++++++++---------
 author.php         | 14 ++++++++++++--
 category.php       |  7 ++++++-
 content-aside.php  |  5 ++++-
 content-link.php   |  5 ++++-
 content-quote.php  |  5 ++++-
 content-status.php |  5 ++++-
 content.php        | 12 ++++++++++--
 footer.php         |  5 ++++-
 functions.php      |  6 +++++-
 image.php          |  1 +
 index.php          |  7 ++++++-
 search.php         |  7 ++++++-
 tag.php            |  7 ++++++-
 14 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/archive.php b/archive.php
index 44a0d6294..60c181b76 100644
--- a/archive.php
+++ b/archive.php
@@ -26,16 +26,19 @@ get_header(); ?>
 			<header class="archive-header">
 				<h1 class="archive-title">
 				<?php
-				if ( is_day() ) :
+				if ( is_day() ) {
+					/* translators: %s: date */
 					printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
-					elseif ( is_month() ) :
-						printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
-					elseif ( is_year() ) :
-						printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
-					else :
-						_e( 'Archives', 'twentytwelve' );
-					endif;
-					?>
+				} elseif ( is_month() ) {
+					/* translators: %s: date */
+					printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
+				} elseif ( is_year() ) {
+					/* translators: %s: date */
+					printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
+				} else {
+					_e( 'Archives', 'twentytwelve' );
+				}
+				?>
 				</h1>
 			</header><!-- .archive-header -->
 
diff --git a/author.php b/author.php
index 0607a781f..5f3da7a83 100644
--- a/author.php
+++ b/author.php
@@ -29,7 +29,12 @@ get_header(); ?>
 			?>
 
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
+				<h1 class="archive-title">
+				<?php
+				/* translators: author display name */
+				printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+				?>
+				</h1>
 			</header><!-- .archive-header -->
 
 			<?php
@@ -61,7 +66,12 @@ get_header(); ?>
 					?>
 				</div><!-- .author-avatar -->
 				<div class="author-description">
-					<h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
+					<h2>
+					<?php
+					/* translators: author display name */
+					printf( __( 'About %s', 'twentytwelve' ), get_the_author() );
+					?>
+					</h2>
 					<p><?php the_author_meta( 'description' ); ?></p>
 				</div><!-- .author-description	-->
 			</div><!-- .author-info -->
diff --git a/category.php b/category.php
index 558946dcd..c03be6ebe 100644
--- a/category.php
+++ b/category.php
@@ -18,7 +18,12 @@ get_header(); ?>
 
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' ); ?></h1>
+				<h1 class="archive-title">
+				<?php
+				/* translators: %s: category title */
+				printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+				?>
+				</h1>
 
 			<?php if ( category_description() ) : // Show an optional category description ?>
 				<div class="archive-meta"><?php echo category_description(); ?></div>
diff --git a/content-aside.php b/content-aside.php
index 4a84ae76d..c308e91af 100644
--- a/content-aside.php
+++ b/content-aside.php
@@ -6,6 +6,9 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
+
+/* translators: %s: post title */
+$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -17,7 +20,7 @@
 		</div><!-- .aside -->
 
 		<footer class="entry-meta">
-			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( $post_title ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?>
diff --git a/content-link.php b/content-link.php
index 31e4ec958..16a8514ae 100644
--- a/content-link.php
+++ b/content-link.php
@@ -6,6 +6,9 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
+
+/* translators: %s: post title */
+$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -15,7 +18,7 @@
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
-			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( $post_title ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?>
diff --git a/content-quote.php b/content-quote.php
index 0a98a96de..d4a635100 100644
--- a/content-quote.php
+++ b/content-quote.php
@@ -6,6 +6,9 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
+
+/* translators: %s: post title */
+$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -14,7 +17,7 @@
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
-			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( $post_title ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?>
diff --git a/content-status.php b/content-status.php
index 55b72db67..e6f1526fc 100644
--- a/content-status.php
+++ b/content-status.php
@@ -6,13 +6,16 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
+
+/* translators: %s: post title */
+$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<div class="entry-header">
 			<header>
 				<h1><?php the_author(); ?></h1>
-				<h2><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a></h2>
+				<h2><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( $post_title ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a></h2>
 			</header>
 			<?php
 			/**
diff --git a/content.php b/content.php
index 2eab91d0f..6f5af8a2f 100644
--- a/content.php
+++ b/content.php
@@ -68,11 +68,19 @@
 						?>
 					</div><!-- .author-avatar -->
 					<div class="author-description">
-						<h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
+						<h2>
+						<?php
+						/* translators: %s: author display name */
+						printf( __( 'About %s', 'twentytwelve' ), get_the_author() );
+						?>
+						</h2>
 						<p><?php the_author_meta( 'description' ); ?></p>
 						<div class="author-link">
 							<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
-								<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
+								<?php
+								/* translators: %s: author display name */
+								printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() );
+								?>
 							</a>
 						</div><!-- .author-link	-->
 					</div><!-- .author-description -->
diff --git a/footer.php b/footer.php
index 05e52e2bd..f06f19548 100644
--- a/footer.php
+++ b/footer.php
@@ -19,7 +19,10 @@
 			}
 			?>
 			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>">
-				<?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?>
+				<?php
+				/* translators: %s: WordPress */
+				printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' );
+				?>
 			</a>
 		</div><!-- .site-info -->
 	</footer><!-- #colophon -->
diff --git a/functions.php b/functions.php
index 53f699710..e8c7fbca9 100644
--- a/functions.php
+++ b/functions.php
@@ -308,6 +308,7 @@ function twentytwelve_wp_title( $title, $sep ) {
 
 	// Add a page number if necessary.
 	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+		/* translators: %s: page number */
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
 	}
 
@@ -502,16 +503,19 @@ if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 		$author = sprintf(
 			'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
 			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			/* translators: %s: author display name */
 			esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
 			get_the_author()
 		);
 
-		// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
 		if ( $tag_list ) {
+			/* translators: 1: category name, 2: tag name, 3: date, 4: author display name */
 			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		} elseif ( $categories_list ) {
+			/* translators: 1: category name, 3: date, 4: author display name */
 			$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		} else {
+			/* translators: 3: date, 4: author display name */
 			$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		}
 
diff --git a/image.php b/image.php
index b6b1dc864..f8d851e49 100644
--- a/image.php
+++ b/image.php
@@ -27,6 +27,7 @@ get_header(); ?>
 							<?php
 								$metadata = wp_get_attachment_metadata();
 								printf(
+									/* translators: 1: date, 2: date, 3: attachment URL, 4: image width in pixels, 5: image height in pixels, 6: post parent permalink, 7: post parent title, 8: post parent title */
 									__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
 									esc_attr( get_the_date( 'c' ) ),
 									esc_html( get_the_date() ),
diff --git a/index.php b/index.php
index 8b89fee3b..ab3d63a6a 100644
--- a/index.php
+++ b/index.php
@@ -43,7 +43,12 @@ get_header(); ?>
 				</header>
 
 				<div class="entry-content">
-					<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
+					<p>
+					<?php
+					/* translators: %s: post editor URL */
+					printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) );
+					?>
+					</p>
 				</div><!-- .entry-content -->
 
 				<?php
diff --git a/search.php b/search.php
index 39ca14b18..6bbaf2473 100644
--- a/search.php
+++ b/search.php
@@ -15,7 +15,12 @@ get_header(); ?>
 		<?php if ( have_posts() ) : ?>
 
 			<header class="page-header">
-				<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentytwelve' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+				<h1 class="page-title">
+				<?php
+				/* translators: %s: search query */
+				printf( __( 'Search Results for: %s', 'twentytwelve' ), '<span>' . get_search_query() . '</span>' );
+				?>
+				</h1>
 			</header>
 
 			<?php twentytwelve_content_nav( 'nav-above' ); ?>
diff --git a/tag.php b/tag.php
index 1d094f47b..668730b91 100644
--- a/tag.php
+++ b/tag.php
@@ -18,7 +18,12 @@ get_header(); ?>
 
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' ); ?></h1>
+				<h1 class="archive-title">
+				<?php
+				/* translators: %s: tag title */
+				printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+				?>
+				</h1>
 
 			<?php if ( tag_description() ) : // Show an optional tag description ?>
 				<div class="archive-meta"><?php echo tag_description(); ?></div>

From 449515bc89da0ed6e015cc3e98ccffa2b1a2b3af Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 25 Jul 2019 22:46:55 +0000
Subject: [PATCH 38/62] Bundled Themes: Replace Codex URLs with a corresponding
 HelpHub or DevHub article.

Props ianbelanger, tobifjellner, SergeyBiryukov.
See #47771.
Built from https://develop.svn.wordpress.org/trunk@45675


git-svn-id: http://core.svn.wordpress.org/trunk@45486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index e8c7fbca9..80a6e997b 100644
--- a/functions.php
+++ b/functions.php
@@ -11,13 +11,13 @@
  * functions.php file. The child theme's functions.php file is included before
  * the parent theme's file, so the child theme functions would be used.
  *
- * @link https://codex.wordpress.org/Theme_Development
+ * @link https://developer.wordpress.org/themes/basics/theme-functions/
  * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/
  *
  * Functions that are not pluggable (not wrapped in function_exists()) are instead attached
  * to a filter or action hook.
  *
- * For more information on hooks, actions, and filters, @link https://codex.wordpress.org/Plugin_API
+ * For more information on hooks, actions, and filters, @link https://developer.wordpress.org/plugins/
  *
  * @package WordPress
  * @subpackage Twenty_Twelve

From 9e91f029a341ad4553de8203028c2e052401a016 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 8 Aug 2019 01:25:58 +0000
Subject: [PATCH 39/62] Bundled Themes: Audit and update version numbers passed
 to `wp_enqueue_style()` to ensure proper cache busting.

Props dswebsme, ianbelanger, desrosj.
Fixes #46979.
Built from https://develop.svn.wordpress.org/trunk@45767


git-svn-id: http://core.svn.wordpress.org/trunk@45578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions.php b/functions.php
index 80a6e997b..18efd16d7 100644
--- a/functions.php
+++ b/functions.php
@@ -200,13 +200,13 @@ function twentytwelve_scripts_styles() {
 	}
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
+	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), '20190507' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181230' );
+	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20190406' );
 
 	// Loads the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
+	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20150214' );
 	$wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
 }
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
@@ -218,7 +218,7 @@ add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
  */
 function twentytwelve_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20190406' );
 	// Add custom fonts.
 	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
 }

From 1a4a00fce1dae9c5974ecdec1f3b00d513b5ccae Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 8 Aug 2019 01:29:58 +0000
Subject: [PATCH 40/62] Bundled Themes: Audit and update version numbers passed
 to `wp_enqueue_script()` to ensure proper cache busting.

Props dswebsme, ianbelanger, justinahinon.
Fixes #46981.
Built from https://develop.svn.wordpress.org/trunk@45768


git-svn-id: http://core.svn.wordpress.org/trunk@45579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 2 +-
 header.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index 18efd16d7..814c75f71 100644
--- a/functions.php
+++ b/functions.php
@@ -192,7 +192,7 @@ function twentytwelve_scripts_styles() {
 	}
 
 	// Adds JavaScript for handling the navigation menu hide-and-show behavior.
-	wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
+	wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20141205', true );
 
 	$font_url = twentytwelve_get_font_url();
 	if ( ! empty( $font_url ) ) {
diff --git a/header.php b/header.php
index f8ff59907..2888cd8ee 100644
--- a/header.php
+++ b/header.php
@@ -26,7 +26,7 @@
 <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <?php // Loads HTML5 JavaScript file to add support for HTML5 elements in older IE versions. ?>
 <!--[if lt IE 9]>
-<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
+<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js?ver=3.7.0" type="text/javascript"></script>
 <![endif]-->
 <?php wp_head(); ?>
 </head>

From c7b042d0ad24870e1bac9193a772a669ab287916 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 3 Sep 2019 00:41:05 +0000
Subject: [PATCH 41/62] I18N: Capitalize translator comments consistently, add
 trailing punctuation.

Includes minor code layout fixes.

See #44360.
Built from https://develop.svn.wordpress.org/trunk@45932


git-svn-id: http://core.svn.wordpress.org/trunk@45743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php        |  6 +++---
 author.php         |  4 ++--
 category.php       |  2 +-
 content-aside.php  |  2 +-
 content-link.php   |  2 +-
 content-quote.php  |  2 +-
 content-status.php |  2 +-
 content.php        |  4 ++--
 functions.php      | 22 ++++++++++++----------
 image.php          |  2 +-
 index.php          |  2 +-
 search.php         |  2 +-
 tag.php            |  2 +-
 13 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/archive.php b/archive.php
index 60c181b76..cb4d429f6 100644
--- a/archive.php
+++ b/archive.php
@@ -27,13 +27,13 @@ get_header(); ?>
 				<h1 class="archive-title">
 				<?php
 				if ( is_day() ) {
-					/* translators: %s: date */
+					/* translators: %s: Date. */
 					printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
 				} elseif ( is_month() ) {
-					/* translators: %s: date */
+					/* translators: %s: Date. */
 					printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
 				} elseif ( is_year() ) {
-					/* translators: %s: date */
+					/* translators: %s: Date. */
 					printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
 				} else {
 					_e( 'Archives', 'twentytwelve' );
diff --git a/author.php b/author.php
index 5f3da7a83..3a1e7a9f5 100644
--- a/author.php
+++ b/author.php
@@ -31,7 +31,7 @@ get_header(); ?>
 			<header class="archive-header">
 				<h1 class="archive-title">
 				<?php
-				/* translators: author display name */
+				/* translators: Author display name. */
 				printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
 				?>
 				</h1>
@@ -68,7 +68,7 @@ get_header(); ?>
 				<div class="author-description">
 					<h2>
 					<?php
-					/* translators: author display name */
+					/* translators: Author display name. */
 					printf( __( 'About %s', 'twentytwelve' ), get_the_author() );
 					?>
 					</h2>
diff --git a/category.php b/category.php
index c03be6ebe..5d68df545 100644
--- a/category.php
+++ b/category.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<header class="archive-header">
 				<h1 class="archive-title">
 				<?php
-				/* translators: %s: category title */
+				/* translators: %s: Category title. */
 				printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
 				?>
 				</h1>
diff --git a/content-aside.php b/content-aside.php
index c308e91af..52990b2bf 100644
--- a/content-aside.php
+++ b/content-aside.php
@@ -7,7 +7,7 @@
  * @since Twenty Twelve 1.0
  */
 
-/* translators: %s: post title */
+/* translators: %s: Post title. */
 $post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
diff --git a/content-link.php b/content-link.php
index 16a8514ae..743cef91e 100644
--- a/content-link.php
+++ b/content-link.php
@@ -7,7 +7,7 @@
  * @since Twenty Twelve 1.0
  */
 
-/* translators: %s: post title */
+/* translators: %s: Post title. */
 $post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
diff --git a/content-quote.php b/content-quote.php
index d4a635100..e59944485 100644
--- a/content-quote.php
+++ b/content-quote.php
@@ -7,7 +7,7 @@
  * @since Twenty Twelve 1.0
  */
 
-/* translators: %s: post title */
+/* translators: %s: Post title. */
 $post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
diff --git a/content-status.php b/content-status.php
index e6f1526fc..1518a2874 100644
--- a/content-status.php
+++ b/content-status.php
@@ -7,7 +7,7 @@
  * @since Twenty Twelve 1.0
  */
 
-/* translators: %s: post title */
+/* translators: %s: Post title. */
 $post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) );
 ?>
 
diff --git a/content.php b/content.php
index 6f5af8a2f..e323195e1 100644
--- a/content.php
+++ b/content.php
@@ -70,7 +70,7 @@
 					<div class="author-description">
 						<h2>
 						<?php
-						/* translators: %s: author display name */
+						/* translators: %s: Author display name. */
 						printf( __( 'About %s', 'twentytwelve' ), get_the_author() );
 						?>
 						</h2>
@@ -78,7 +78,7 @@
 						<div class="author-link">
 							<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
 								<?php
-								/* translators: %s: author display name */
+								/* translators: %s: Author display name. */
 								printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() );
 								?>
 							</a>
diff --git a/functions.php b/functions.php
index 814c75f71..65dbc9fdb 100644
--- a/functions.php
+++ b/functions.php
@@ -145,13 +145,15 @@ require( get_template_directory() . '/inc/custom-header.php' );
 function twentytwelve_get_font_url() {
 	$font_url = '';
 
-	/* translators: If there are characters in your language that are not supported
+	/*
+	 * translators: If there are characters in your language that are not supported
 	 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 	 */
 	if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
 		$subsets = 'latin,latin-ext';
 
-		/* translators: To add an additional Open Sans character subset specific to your language,
+		/*
+		 * translators: To add an additional Open Sans character subset specific to your language,
 		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 		 */
 		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
@@ -308,7 +310,7 @@ function twentytwelve_wp_title( $title, $sep ) {
 
 	// Add a page number if necessary.
 	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
-		/* translators: %s: page number */
+		/* translators: %s: Page number. */
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
 	}
 
@@ -438,7 +440,7 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 						'<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
 						esc_url( get_comment_link( $comment->comment_ID ) ),
 						get_comment_time( 'c' ),
-						/* translators: 1: date, 2: time */
+						/* translators: 1: Date, 2: Time. */
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
 				?>
@@ -486,10 +488,10 @@ if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 	 * @since Twenty Twelve 1.0
 	 */
 	function twentytwelve_entry_meta() {
-		// Translators: used between list items, there is a space after the comma.
+		/* translators: Used between list items, there is a space after the comma. */
 		$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
 
-		// Translators: used between list items, there is a space after the comma.
+		/* translators: Used between list items, there is a space after the comma. */
 		$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
 
 		$date = sprintf(
@@ -503,19 +505,19 @@ if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 		$author = sprintf(
 			'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
 			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-			/* translators: %s: author display name */
+			/* translators: %s: Author display name. */
 			esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
 			get_the_author()
 		);
 
 		if ( $tag_list ) {
-			/* translators: 1: category name, 2: tag name, 3: date, 4: author display name */
+			/* translators: 1: Category name, 2: Tag name, 3: Date, 4: Author display name. */
 			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		} elseif ( $categories_list ) {
-			/* translators: 1: category name, 3: date, 4: author display name */
+			/* translators: 1: Category name, 3: Date, 4: Author display name. */
 			$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		} else {
-			/* translators: 3: date, 4: author display name */
+			/* translators: 3: Date, 4: Author display name. */
 			$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		}
 
diff --git a/image.php b/image.php
index f8d851e49..1c7aff0b7 100644
--- a/image.php
+++ b/image.php
@@ -27,7 +27,7 @@ get_header(); ?>
 							<?php
 								$metadata = wp_get_attachment_metadata();
 								printf(
-									/* translators: 1: date, 2: date, 3: attachment URL, 4: image width in pixels, 5: image height in pixels, 6: post parent permalink, 7: post parent title, 8: post parent title */
+									/* translators: 1: Date, 2: Date, 3: Attachment URL, 4: Image width in pixels, 5: Image height in pixels, 6: Post parent permalink, 7: Post parent title, 8: Post parent title. */
 									__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
 									esc_attr( get_the_date( 'c' ) ),
 									esc_html( get_the_date() ),
diff --git a/index.php b/index.php
index ab3d63a6a..c8bdc64a5 100644
--- a/index.php
+++ b/index.php
@@ -45,7 +45,7 @@ get_header(); ?>
 				<div class="entry-content">
 					<p>
 					<?php
-					/* translators: %s: post editor URL */
+					/* translators: %s: Post editor URL. */
 					printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) );
 					?>
 					</p>
diff --git a/search.php b/search.php
index 6bbaf2473..51c84522a 100644
--- a/search.php
+++ b/search.php
@@ -17,7 +17,7 @@ get_header(); ?>
 			<header class="page-header">
 				<h1 class="page-title">
 				<?php
-				/* translators: %s: search query */
+				/* translators: %s: Search query. */
 				printf( __( 'Search Results for: %s', 'twentytwelve' ), '<span>' . get_search_query() . '</span>' );
 				?>
 				</h1>
diff --git a/tag.php b/tag.php
index 668730b91..6d42da5bc 100644
--- a/tag.php
+++ b/tag.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<header class="archive-header">
 				<h1 class="archive-title">
 				<?php
-				/* translators: %s: tag title */
+				/* translators: %s: Tag title. */
 				printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
 				?>
 				</h1>

From bfbbc3957fab9c3e5da85bc8320626e9b357a059 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 14 Sep 2019 21:00:56 +0000
Subject: [PATCH 42/62] Bundled Themes: Update the message shown when a comment
 is awaiting moderation.

If the commenter doesn't have cookies set, they won't see the comment preview again. Showing an expanded message will help offset any confusion if they revisit the site later, and their comment is still in moderation, but they can't see it anymore.

Props birgire, superpoincare.
Fixes #47461. See #43857.
Built from https://develop.svn.wordpress.org/trunk@46117


git-svn-id: http://core.svn.wordpress.org/trunk@45929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index 65dbc9fdb..04da105b0 100644
--- a/functions.php
+++ b/functions.php
@@ -446,9 +446,18 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 				?>
 				</header><!-- .comment-meta -->
 
+				<?php
+				$commenter = wp_get_current_commenter();
+				if ( $commenter['comment_author_email'] ) {
+					$moderation_note = __( 'Your comment is awaiting moderation.', 'twentytwelve' );
+				} else {
+					$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.', 'twentytwelve' );
+				}
+				?>
+
 				<?php if ( '0' == $comment->comment_approved ) : ?>
-				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
-			<?php endif; ?>
+				<p class="comment-awaiting-moderation"><?php echo $moderation_note; ?></p>
+				<?php endif; ?>
 
 				<section class="comment-content comment">
 				<?php comment_text(); ?>

From ebdf33868dda26eeed1499be53e7d57238a0e0a1 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Thu, 7 Nov 2019 15:19:04 +0000
Subject: [PATCH 43/62] Bundled Themes: Standardize the Required PHP and Tested
 Up To headers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change makes several changes to ensure consistency and accuracy for default theme headers:

- Removes `WordPress` from `Requires at least` headers.
- Ensures the `Requires at least` and `Requires PHP` headers are present in every default theme’s `style.css` file.
- Ensures `Tested up to` is present in every `readme.txt` file.
- Removes any headers not processed in both the `style.css` and `readme.txt` files for each theme.

Props Otto42, afragen.
Fixes #48517.
Built from https://develop.svn.wordpress.org/trunk@46676


git-svn-id: http://core.svn.wordpress.org/trunk@46476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 4 +---
 style.css  | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index 6d3aa4534..8e088dbf2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,6 @@
 === Twenty Twelve ===
 Contributors: wordpressdotorg
-Requires at least: WordPress 3.5
-Tested up to: WordPress 5.0
-Requires PHP: 5.2.4
+Tested up to: 5.0
 Stable tag: 3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/style.css b/style.css
index d763bde4c..f79b30937 100644
--- a/style.css
+++ b/style.css
@@ -5,6 +5,8 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
 Version: 3.0
+Requires at least: 3.5
+Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

From f57133b776376891168d2bcbdf10d870e3a4bfe6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 12 Nov 2019 17:51:02 +0000
Subject: [PATCH 44/62] Bundled Themes: Update copyright year in `readme.txt`
 for Twenty Twelve and Twenty Twenty.

Follow-up to [46719].

See #48566.
Built from https://develop.svn.wordpress.org/trunk@46720


git-svn-id: http://core.svn.wordpress.org/trunk@46520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 8e088dbf2..e157f7822 100644
--- a/readme.txt
+++ b/readme.txt
@@ -21,7 +21,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or
 
 == Copyright ==
 
-Twenty Twelve WordPress Theme, Copyright 2012-2018 WordPress.org & Automattic.com
+Twenty Twelve WordPress Theme, Copyright 2012-2019 WordPress.org & Automattic.com
 Twenty Twelve is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify

From 66efeeb4a7b44636ad8b1bca3e8b5e5d11e2181e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 1 Jan 2020 03:53:01 +0000
Subject: [PATCH 45/62] Happy New Year!

Update copyright year to 2020 in bundled themes' `readme.txt`.
Built from https://develop.svn.wordpress.org/trunk@47026


git-svn-id: http://core.svn.wordpress.org/trunk@46826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index e157f7822..b15147793 100644
--- a/readme.txt
+++ b/readme.txt
@@ -21,7 +21,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or
 
 == Copyright ==
 
-Twenty Twelve WordPress Theme, Copyright 2012-2019 WordPress.org & Automattic.com
+Twenty Twelve WordPress Theme, Copyright 2012-2020 WordPress.org & Automattic.com
 Twenty Twelve is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify

From 8f8d1f6a00ac301e0138110c7d54d3c226fa1efa Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 29 Jan 2020 00:45:18 +0000
Subject: [PATCH 46/62] Docs: Improve inline comments per the documentation
 standards.

Includes minor code layout fixes for better readability.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47122


git-svn-id: http://core.svn.wordpress.org/trunk@46922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php                   |  7 ++---
 author.php                    | 12 +++++----
 category.php                  |  9 ++++---
 comments.php                  |  7 ++---
 content.php                   | 15 ++++++-----
 functions.php                 |  6 ++---
 image.php                     | 48 +++++++++++++++++------------------
 inc/custom-header.php         |  2 +-
 index.php                     |  6 ++---
 js/theme-customizer.js        |  2 +-
 page-templates/front-page.php |  2 +-
 page-templates/full-width.php |  2 +-
 page.php                      |  2 +-
 search.php                    |  2 +-
 single.php                    |  2 +-
 tag.php                       |  8 +++---
 16 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/archive.php b/archive.php
index cb4d429f6..b44a1c6c9 100644
--- a/archive.php
+++ b/archive.php
@@ -43,12 +43,13 @@ get_header(); ?>
 			</header><!-- .archive-header -->
 
 			<?php
-			/* Start the Loop */
+			// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
 
-				/* Include the post format-specific template for the content. If you want to
-				 * this in a child theme then include a file called content-___.php
+				/*
+				 * Include the post format-specific template for the content. If you want
+				 * to use this in a child theme then include a file called content-___.php
 				 * (where ___ is the post format) and that will be used instead.
 				 */
 				get_template_part( 'content', get_post_format() );
diff --git a/author.php b/author.php
index 3a1e7a9f5..120ee066e 100644
--- a/author.php
+++ b/author.php
@@ -19,7 +19,8 @@ get_header(); ?>
 		<?php if ( have_posts() ) : ?>
 
 			<?php
-				/* Queue the first post, that way we know
+				/*
+				 * Queue the first post, that way we know
 				 * what author we're dealing with (if that is the case).
 				 *
 				 * We reset this later so we can run the loop
@@ -38,9 +39,10 @@ get_header(); ?>
 			</header><!-- .archive-header -->
 
 			<?php
-				/* Since we called the_post() above, we need to
-				 * rewind the loop back to the beginning that way
-				 * we can run the loop properly, in full.
+				/*
+				 * Since we called the_post() above, we need
+				 * to rewind the loop back to the beginning.
+				 * That way we can run the loop properly, in full.
 				 */
 				rewind_posts();
 			?>
@@ -77,8 +79,8 @@ get_header(); ?>
 			</div><!-- .author-info -->
 			<?php endif; ?>
 
-			<?php /* Start the Loop */ ?>
 			<?php
+			// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
 				?>
diff --git a/category.php b/category.php
index 5d68df545..ec8ce43f9 100644
--- a/category.php
+++ b/category.php
@@ -25,18 +25,19 @@ get_header(); ?>
 				?>
 				</h1>
 
-			<?php if ( category_description() ) : // Show an optional category description ?>
+			<?php if ( category_description() ) : // Show an optional category description. ?>
 				<div class="archive-meta"><?php echo category_description(); ?></div>
 			<?php endif; ?>
 			</header><!-- .archive-header -->
 
 			<?php
-			/* Start the Loop */
+			// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
 
-				/* Include the post format-specific template for the content. If you want to
-				 * this in a child theme then include a file called content-___.php
+				/*
+				 * Include the post format-specific template for the content. If you want
+				 * to use this in a child theme then include a file called content-___.php
 				 * (where ___ is the post format) and that will be used instead.
 				 */
 				get_template_part( 'content', get_post_format() );
diff --git a/comments.php b/comments.php
index 5537fc460..f78cb379a 100644
--- a/comments.php
+++ b/comments.php
@@ -57,16 +57,17 @@ if ( post_password_required() ) {
 			?>
 		</ol><!-- .commentlist -->
 
-		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
 		<nav id="comment-nav-below" class="navigation" role="navigation">
 			<h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'twentytwelve' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentytwelve' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentytwelve' ) ); ?></div>
 		</nav>
-		<?php endif; // check for comment navigation ?>
+		<?php endif; // Check for comment navigation. ?>
 
 		<?php
-		/* If there are no comments and comments are closed, let's leave a note.
+		/*
+		 * If there are no comments and comments are closed, let's leave a note.
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
 		if ( ! comments_open() && get_comments_number() ) :
diff --git a/content.php b/content.php
index e323195e1..102f0f814 100644
--- a/content.php
+++ b/content.php
@@ -37,7 +37,7 @@
 			<?php endif; // comments_open() ?>
 		</header><!-- .entry-header -->
 
-		<?php if ( is_search() ) : // Only display Excerpts for Search ?>
+		<?php if ( is_search() ) : // Only display excerpts for search. ?>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
@@ -58,7 +58,10 @@
 		<footer class="entry-meta">
 			<?php twentytwelve_entry_meta(); ?>
 			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
-			<?php if ( is_singular() && get_the_author_meta( 'description' ) && is_multi_author() ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries. ?>
+			<?php
+			// If a user has filled out their description and this is a multi-author blog, show a bio on their entries.
+			if ( is_singular() && get_the_author_meta( 'description' ) && is_multi_author() ) :
+				?>
 				<div class="author-info">
 					<div class="author-avatar">
 						<?php
@@ -77,10 +80,10 @@
 						<p><?php the_author_meta( 'description' ); ?></p>
 						<div class="author-link">
 							<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
-								<?php
-								/* translators: %s: Author display name. */
-								printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() );
-								?>
+							<?php
+							/* translators: %s: Author display name. */
+							printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() );
+							?>
 							</a>
 						</div><!-- .author-link	-->
 					</div><!-- .author-description -->
diff --git a/functions.php b/functions.php
index 04da105b0..86c5f1130 100644
--- a/functions.php
+++ b/functions.php
@@ -120,7 +120,7 @@ function twentytwelve_setup() {
 
 	// This theme uses a custom image size for featured images, displayed on "standard" posts.
 	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 624, 9999 ); // Unlimited height, soft crop
+	set_post_thumbnail_size( 624, 9999 ); // Unlimited height, soft crop.
 
 	// Indicate widget sidebars can use selective refresh in the Customizer.
 	add_theme_support( 'customize-selective-refresh-widgets' );
@@ -482,7 +482,7 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 			</article><!-- #comment-## -->
 				<?php
 				break;
-		endswitch; // end comment_type check
+		endswitch; // End comment_type check.
 	}
 endif;
 
@@ -706,7 +706,7 @@ if ( ! function_exists( 'wp_body_open' ) ) :
 	/**
 	 * Fire the wp_body_open action.
 	 *
-	 * Added for backwards compatibility to support pre 5.2.0 WordPress versions.
+	 * Added for backward compatibility to support pre-5.2.0 WordPress versions.
 	 *
 	 * @since Twenty Twelve 3.0
 	 */
diff --git a/image.php b/image.php
index 1c7aff0b7..dd15d651a 100644
--- a/image.php
+++ b/image.php
@@ -73,38 +73,38 @@ get_header(); ?>
 				if ( $attachment->ID == $post->ID ) {
 					break;
 				}
-endforeach;
+			endforeach;
 
-			// If there is more than 1 attachment in a gallery
+			// If there is more than 1 attachment in a gallery...
 			if ( count( $attachments ) > 1 ) :
 				$k++;
 				if ( isset( $attachments[ $k ] ) ) :
-					// get the URL of the next image attachment
+					// ...get the URL of the next image attachment.
 					$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
 				else :
-					// or get the URL of the first image attachment
+					// ...or get the URL of the first image attachment.
 					$next_attachment_url = get_attachment_link( $attachments[0]->ID );
 				endif;
-else :
-	// or, if there's only 1 image, get the URL of the image
-	$next_attachment_url = wp_get_attachment_url();
-endif;
-?>
+			else :
+				// Or, if there's only 1 image, get the URL of the image.
+				$next_attachment_url = wp_get_attachment_url();
+			endif;
+			?>
 								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
-													<?php
-													/**
-													 * Filter the image attachment size to use.
-													 *
-													 * @since Twenty Twelve 1.0
-													 *
-													 * @param array $size {
-													 *     @type int The attachment height in pixels.
-													 *     @type int The attachment width in pixels.
-													 * }
-													 */
-													$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
-													echo wp_get_attachment_image( $post->ID, $attachment_size );
-													?>
+									<?php
+									/**
+									 * Filter the image attachment size to use.
+									 *
+									 * @since Twenty Twelve 1.0
+									 *
+									 * @param array $size {
+									 *     @type int The attachment height in pixels.
+									 *     @type int The attachment width in pixels.
+									 * }
+									 */
+									$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
+									echo wp_get_attachment_image( $post->ID, $attachment_size );
+									?>
 								</a>
 
 								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
@@ -134,7 +134,7 @@ endif;
 
 				<?php comments_template(); ?>
 
-			<?php endwhile; // end of the loop. ?>
+			<?php endwhile; // End of the loop. ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/inc/custom-header.php b/inc/custom-header.php
index 636309b7c..c985246f8 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -70,7 +70,7 @@ add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_cu
 function twentytwelve_header_style() {
 	$text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail
+	// If no custom options for text are set, let's bail.
 	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
 		return;
 	}
diff --git a/index.php b/index.php
index c8bdc64a5..98649a841 100644
--- a/index.php
+++ b/index.php
@@ -20,8 +20,8 @@ get_header(); ?>
 		<div id="content" role="main">
 		<?php if ( have_posts() ) : ?>
 
-			<?php /* Start the Loop */ ?>
 			<?php
+			// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
 				?>
@@ -63,11 +63,11 @@ get_header(); ?>
 					<p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p>
 					<?php get_search_form(); ?>
 				</div><!-- .entry-content -->
-			<?php endif; // end current_user_can() check ?>
+			<?php endif; // End current_user_can() check. ?>
 
 			</article><!-- #post-0 -->
 
-		<?php endif; // end have_posts() check ?>
+		<?php endif; // End have_posts() check. ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/js/theme-customizer.js b/js/theme-customizer.js
index 8bf094be5..c388997da 100644
--- a/js/theme-customizer.js
+++ b/js/theme-customizer.js
@@ -18,7 +18,7 @@
 		} );
 	} );
 
-	// Header text color
+	// Header text color.
 	wp.customize( 'header_textcolor', function( value ) {
 		value.bind( function( to ) {
 			if ( 'blank' === to ) {
diff --git a/page-templates/front-page.php b/page-templates/front-page.php
index 72efd0102..28ce766b9 100644
--- a/page-templates/front-page.php
+++ b/page-templates/front-page.php
@@ -29,7 +29,7 @@ get_header(); ?>
 
 				<?php get_template_part( 'content', 'page' ); ?>
 
-			<?php endwhile; // end of the loop. ?>
+			<?php endwhile; // End of the loop. ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/page-templates/full-width.php b/page-templates/full-width.php
index 13a1b39be..370e76eaf 100644
--- a/page-templates/full-width.php
+++ b/page-templates/full-width.php
@@ -25,7 +25,7 @@ get_header(); ?>
 				?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
-			<?php endwhile; // end of the loop. ?>
+			<?php endwhile; // End of the loop. ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/page.php b/page.php
index cf75606bd..7107a61ce 100644
--- a/page.php
+++ b/page.php
@@ -23,7 +23,7 @@ get_header(); ?>
 				?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
-			<?php endwhile; // end of the loop. ?>
+			<?php endwhile; // End of the loop. ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/search.php b/search.php
index 51c84522a..99acfe403 100644
--- a/search.php
+++ b/search.php
@@ -25,8 +25,8 @@ get_header(); ?>
 
 			<?php twentytwelve_content_nav( 'nav-above' ); ?>
 
-			<?php /* Start the Loop */ ?>
 			<?php
+			// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
 				?>
diff --git a/single.php b/single.php
index 10165cec3..4cc6a43a4 100644
--- a/single.php
+++ b/single.php
@@ -27,7 +27,7 @@ get_header(); ?>
 
 				<?php comments_template( '', true ); ?>
 
-			<?php endwhile; // end of the loop. ?>
+			<?php endwhile; // End of the loop. ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/tag.php b/tag.php
index 6d42da5bc..041427729 100644
--- a/tag.php
+++ b/tag.php
@@ -25,19 +25,19 @@ get_header(); ?>
 				?>
 				</h1>
 
-			<?php if ( tag_description() ) : // Show an optional tag description ?>
+			<?php if ( tag_description() ) : // Show an optional tag description. ?>
 				<div class="archive-meta"><?php echo tag_description(); ?></div>
 			<?php endif; ?>
 			</header><!-- .archive-header -->
 
 			<?php
-			/* Start the Loop */
+			// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
 
 				/*
-				 * Include the post format-specific template for the content. If you want to
-				 * this in a child theme then include a file called content-___.php
+				 * Include the post format-specific template for the content. If you want
+				 * to use this in a child theme then include a file called content-___.php
 				 * (where ___ is the post format) and that will be used instead.
 				 */
 				get_template_part( 'content', get_post_format() );

From 020461625b1a0651d1435d0cfc20f0d57d805271 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 6 Feb 2020 06:33:11 +0000
Subject: [PATCH 47/62] Code Modernization: Replace `dirname( __FILE__ )` calls
 with `__DIR__` magic constant.

This avoids the performance overhead of the function call every time `dirname( __FILE__ )` was used instead of `__DIR__`.

This commit also includes:

* Removing unnecessary parentheses from `include`/`require` statements. These are language constructs, not function calls.
* Replacing `include` statements for several files with `require_once`, for consistency:
 * `wp-admin/admin-header.php`
 * `wp-admin/admin-footer.php`
 * `wp-includes/version.php`

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.
Built from https://develop.svn.wordpress.org/trunk@47198


git-svn-id: http://core.svn.wordpress.org/trunk@46998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index 86c5f1130..ebb1e709d 100644
--- a/functions.php
+++ b/functions.php
@@ -130,7 +130,7 @@ add_action( 'after_setup_theme', 'twentytwelve_setup' );
 /**
  * Add support for a custom header image.
  */
-require( get_template_directory() . '/inc/custom-header.php' );
+require get_template_directory() . '/inc/custom-header.php';
 
 /**
  * Return the Google font stylesheet URL if available.

From 64e99f5caf615947f4420cc6ef1e3142284e9044 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 9 Feb 2020 16:55:09 +0000
Subject: [PATCH 48/62] Coding Standards: Use Yoda conditions where
 appropriate.

See #49222.
Built from https://develop.svn.wordpress.org/trunk@47219


git-svn-id: http://core.svn.wordpress.org/trunk@47019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 inc/custom-header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/custom-header.php b/inc/custom-header.php
index c985246f8..693883ca7 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -71,7 +71,7 @@ function twentytwelve_header_style() {
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
+	if ( get_theme_support( 'custom-header', 'default-text-color' ) == $text_color ) {
 		return;
 	}
 

From 37268c3376dc505e0977b192f6dd5505ce573133 Mon Sep 17 00:00:00 2001
From: ianbelanger <ianbelanger@git.wordpress.org>
Date: Mon, 2 Mar 2020 16:55:08 +0000
Subject: [PATCH 49/62] Bundled Themes: Update calendar widget styles for 5.4
 markup.

Fixes the alignment of month links in the calendar widget with the changes in version 5.4 for all Bundled Themes, except Twenty Thirteen, which was already fixed in #49546.

Props sabernhardt.
Fixes #49549.
Built from https://develop.svn.wordpress.org/trunk@47405


git-svn-id: http://core.svn.wordpress.org/trunk@47192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 rtl.css   | 1 +
 style.css | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/rtl.css b/rtl.css
index e43fca3ba..b3d6b0141 100644
--- a/rtl.css
+++ b/rtl.css
@@ -173,6 +173,7 @@ label ~ span.required {
 #wp-calendar caption {
 	text-align: right;
 }
+.wp-calendar-nav-next,
 #wp-calendar #next {
 	padding-left: 24px;
 	padding-left: 1.714285714rem;
diff --git a/style.css b/style.css
index f79b30937..74c711d60 100644
--- a/style.css
+++ b/style.css
@@ -1433,6 +1433,7 @@ a.comment-edit-link:hover {
 	margin-left: 12px;
 	margin-left: 0.857142857rem;
 }
+.wp-calendar-nav,
 #wp-calendar {
 	margin: 0;
 	width: 100%;
@@ -1446,6 +1447,13 @@ a.comment-edit-link:hover {
 #wp-calendar caption {
 	text-align: left;
 }
+.wp-calendar-nav {
+	display: table;
+}
+.wp-calendar-nav span {
+	display: table-cell;
+}
+.wp-calendar-nav-next,
 #wp-calendar #next {
 	padding-right: 24px;
 	padding-right: 1.714285714rem;

From 97e6d6c6ba0bf7b82f9bfe08307ecf40cc98037e Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 31 Mar 2020 19:11:07 +0000
Subject: [PATCH 50/62] Bundled Themes: Bump version numbers and update
 changelogs in default themes for WordPress 5.4.

Props ianbelanger, desrosj, SergeyBiryukov.
Fixes #49743.
Built from https://develop.svn.wordpress.org/trunk@47539


git-svn-id: http://core.svn.wordpress.org/trunk@47314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 7 ++++++-
 style.css  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index b15147793..4f210a617 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 === Twenty Twelve ===
 Contributors: wordpressdotorg
 Tested up to: 5.0
-Stable tag: 3.0
+Stable tag: 3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -42,6 +42,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 3.1 =
+* Released: March 31, 2020
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.1
+
 = 3.0 =
 * Released: May 7, 2019
 
diff --git a/style.css b/style.css
index 74c711d60..98abf2bf2 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 3.0
+Version: 3.1
 Requires at least: 3.5
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later

From d35e48b7475a320e3d11fa85bbad0ef5a9fa044c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 5 Apr 2020 03:02:11 +0000
Subject: [PATCH 51/62] Coding Standards: Use strict type check for
 `in_array()` and `array_search()` where strings are involved.

This reduces the number of `WordPress.PHP.StrictInArray.MissingTrueStrict` issues from 486 to 50.

Includes minor code layout fixes for better readability.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@47550


git-svn-id: http://core.svn.wordpress.org/trunk@47325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index ebb1e709d..366514bd7 100644
--- a/functions.php
+++ b/functions.php
@@ -578,7 +578,7 @@ function twentytwelve_body_class( $classes ) {
 	if ( empty( $background_image ) ) {
 		if ( empty( $background_color ) ) {
 			$classes[] = 'custom-background-empty';
-		} elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
+		} elseif ( in_array( $background_color, array( 'fff', 'ffffff' ), true ) ) {
 			$classes[] = 'custom-background-white';
 		}
 	}

From 3083369e6c241155450178ba05c4047529330aa0 Mon Sep 17 00:00:00 2001
From: ianbelanger <ianbelanger@git.wordpress.org>
Date: Fri, 15 May 2020 16:31:11 +0000
Subject: [PATCH 52/62] Bundled Themes: Twenty Eleven & Twenty Twelve dropdown
 category widget exceeds parent div when strings are long enough.

Fixes the width of the category dropdown by limiting the width of `select` items in widgets using `max-width: 100%`.

Props gma992, karmatosed.
Fixes #37926.
Built from https://develop.svn.wordpress.org/trunk@47801


git-svn-id: http://core.svn.wordpress.org/trunk@47577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 style.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/style.css b/style.css
index 98abf2bf2..918167af3 100644
--- a/style.css
+++ b/style.css
@@ -1417,6 +1417,9 @@ a.comment-edit-link:hover {
 /* =Widgets
 -------------------------------------------------------------- */
 
+.widget select {
+	max-width: 100%;
+ }
 .widget-area .widget ul ul {
 	margin-left: 12px;
 	margin-left: 0.857142857rem;

From 37db988ca7ab64c1eda19f7d8325eb4d15ae1114 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 16 May 2020 18:42:12 +0000
Subject: [PATCH 53/62] Coding Standards: Use strict comparison where static
 strings are involved.

This reduces the number of `WordPress.PHP.StrictComparisons.LooseComparison` issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@47808


git-svn-id: http://core.svn.wordpress.org/trunk@47584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php          | 6 +++---
 js/theme-customizer.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/functions.php b/functions.php
index 366514bd7..9a333b47e 100644
--- a/functions.php
+++ b/functions.php
@@ -158,11 +158,11 @@ function twentytwelve_get_font_url() {
 		 */
 		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
 
-		if ( 'cyrillic' == $subset ) {
+		if ( 'cyrillic' === $subset ) {
 			$subsets .= ',cyrillic,cyrillic-ext';
-		} elseif ( 'greek' == $subset ) {
+		} elseif ( 'greek' === $subset ) {
 			$subsets .= ',greek,greek-ext';
-		} elseif ( 'vietnamese' == $subset ) {
+		} elseif ( 'vietnamese' === $subset ) {
 			$subsets .= ',vietnamese';
 		}
 
diff --git a/js/theme-customizer.js b/js/theme-customizer.js
index c388997da..46195fbce 100644
--- a/js/theme-customizer.js
+++ b/js/theme-customizer.js
@@ -41,9 +41,9 @@
 		value.bind( function( to ) {
 			var body = $( 'body' );
 
-			if ( ( '#ffffff' == to || '#fff' == to ) && 'none' == body.css( 'background-image' ) )
+			if ( ( '#ffffff' === to || '#fff' === to ) && 'none' === body.css( 'background-image' ) )
 				body.addClass( 'custom-background-white' );
-			else if ( '' == to && 'none' == body.css( 'background-image' ) )
+			else if ( '' === to && 'none' === body.css( 'background-image' ) )
 				body.addClass( 'custom-background-empty' );
 			else
 				body.removeClass( 'custom-background-empty custom-background-white' );

From fd37adae94eb23765152e477b0ab474d03d8bac0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 2 Jun 2020 17:05:13 +0000
Subject: [PATCH 54/62] Bundled Themes: Consistently check for `WP_Error`
 before outputting `get_the_tag_list()`.

Some themes already had these checks in place as a result of [41756], but not others.

Props sixhours, davidakennedy, SergeyBiryukov.
Fixes #39860.
Built from https://develop.svn.wordpress.org/trunk@47886


git-svn-id: http://core.svn.wordpress.org/trunk@47660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/functions.php b/functions.php
index 9a333b47e..9c14de24e 100644
--- a/functions.php
+++ b/functions.php
@@ -501,7 +501,7 @@ if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 		$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
 
 		/* translators: Used between list items, there is a space after the comma. */
-		$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+		$tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
 
 		$date = sprintf(
 			'<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
@@ -519,7 +519,7 @@ if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 			get_the_author()
 		);
 
-		if ( $tag_list ) {
+		if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 			/* translators: 1: Category name, 2: Tag name, 3: Date, 4: Author display name. */
 			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
 		} elseif ( $categories_list ) {
@@ -533,7 +533,7 @@ if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 		printf(
 			$utility_text,
 			$categories_list,
-			$tag_list,
+			$tags_list,
 			$date,
 			$author
 		);

From b2ed7c2ceefb00c5cbde1ab67b0888afc1600947 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 16 Jun 2020 21:07:14 +0000
Subject: [PATCH 55/62] Docs: Consistently include an empty line between
 `@since` tag and `@see`, `@link`, or `@global`, per the documentation
 standards.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@48067


git-svn-id: http://core.svn.wordpress.org/trunk@47834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/functions.php b/functions.php
index 9c14de24e..21b1967c7 100644
--- a/functions.php
+++ b/functions.php
@@ -651,6 +651,7 @@ add_action( 'customize_register', 'twentytwelve_customize_register' );
  * Render the site title for the selective refresh partial.
  *
  * @since Twenty Twelve 2.0
+ *
  * @see twentytwelve_customize_register()
  *
  * @return void
@@ -663,6 +664,7 @@ function twentytwelve_customize_partial_blogname() {
  * Render the site tagline for the selective refresh partial.
  *
  * @since Twenty Twelve 2.0
+ *
  * @see twentytwelve_customize_register()
  *
  * @return void

From 47587a3698da88655739bd682579686735da19bb Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Wed, 1 Jul 2020 22:06:05 +0000
Subject: [PATCH 56/62] Bundled Themes: Update latest version for `Tested up
 to:` in readme.txt file.

Fixes #50503.
Props mukesh27, hareesh-pillai.


Built from https://develop.svn.wordpress.org/trunk@48271


git-svn-id: http://core.svn.wordpress.org/trunk@48040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 4f210a617..96e51fd66 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 === Twenty Twelve ===
 Contributors: wordpressdotorg
-Tested up to: 5.0
+Tested up to: 5.5
 Stable tag: 3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

From c4a35082b0f00d8acfaa32484f57ac0bfa57867a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 3 Jul 2020 23:42:01 +0000
Subject: [PATCH 57/62] Bundled Themes: Use HTTPS for XHTML Friends Network
 URL.

Props raajtram, jrf, passoniate, bookdude13, sabernhardt, audrasjb.
See #48002.
Built from https://develop.svn.wordpress.org/trunk@48290


git-svn-id: http://core.svn.wordpress.org/trunk@48059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/header.php b/header.php
index 2888cd8ee..8f15a7617 100644
--- a/header.php
+++ b/header.php
@@ -22,7 +22,7 @@
 <meta charset="<?php bloginfo( 'charset' ); ?>" />
 <meta name="viewport" content="width=device-width" />
 <title><?php wp_title( '|', true, 'right' ); ?></title>
-<link rel="profile" href="http://gmpg.org/xfn/11" />
+<link rel="profile" href="https://gmpg.org/xfn/11" />
 <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <?php // Loads HTML5 JavaScript file to add support for HTML5 elements in older IE versions. ?>
 <!--[if lt IE 9]>

From 0b483f758043da64b62830312e593a3ffcc3d021 Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Mon, 13 Jul 2020 17:08:03 +0000
Subject: [PATCH 58/62] Bundled Themes: Add custom color pallettes for block
 editor.

Gutenberg 7.9 added support for themes to bundle their own custom styles in to the editor. These changes have been added to 2010 - 2016.

See #50120.

Props kjellr, sabernhardt, ianbelanger.


Built from https://develop.svn.wordpress.org/trunk@48459


git-svn-id: http://core.svn.wordpress.org/trunk@48228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 css/editor-blocks.css | 55 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/css/editor-blocks.css b/css/editor-blocks.css
index 8c3d66cdb..d9efec32d 100644
--- a/css/editor-blocks.css
+++ b/css/editor-blocks.css
@@ -12,6 +12,7 @@ Description: Used to style blocks in the editor.
 4.0 Blocks - Formatting
 5.0 Blocks - Layout Elements
 6.0 Blocks - Widgets
+7.0 Blocks - Colors
 --------------------------------------------------------------*/
 
 /*--------------------------------------------------------------
@@ -455,3 +456,57 @@ p.has-drop-cap:not(:focus)::first-letter {
 	padding-left: 0;
 	padding-right: 0;
 }
+
+/*--------------------------------------------------------------
+7.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+:root .editor-styles-wrapper .has-blue-color,
+:root .editor-styles-wrapper .has-blue-color:visited {
+	color: #21759b;
+}
+
+:root .editor-styles-wrapper .has-blue-background-color,
+:root .editor-styles-wrapper .has-blue-background-color:visited {
+	background-color: #21759b;
+}
+
+:root .editor-styles-wrapper .has-dark-gray-color,
+:root .editor-styles-wrapper .has-dark-gray-color:visited {
+	color: #373737;
+}
+
+:root .editor-styles-wrapper .has-dark-gray-background-color,
+:root .editor-styles-wrapper .has-dark-gray-background-color:visited {
+	background-color: #373737;
+}
+
+:root .editor-styles-wrapper .has-medium-gray-color,
+:root .editor-styles-wrapper .has-medium-gray-color:visited {
+	color: #9f9f9f;
+}
+
+:root .editor-styles-wrapper .has-medium-gray-background-color,
+:root .editor-styles-wrapper .has-medium-gray-background-color:visited {
+	background-color: #9f9f9f;
+}
+
+:root .editor-styles-wrapper .has-light-gray-color,
+:root .editor-styles-wrapper .has-light-gray-color:visited {
+	color: #e6e6e6;
+}
+
+:root .editor-styles-wrapper .has-light-gray-background-color,
+:root .editor-styles-wrapper .has-light-gray-background-color:visited {
+	background-color: #e6e6e6;
+}
+
+:root .editor-styles-wrapper .has-white-color,
+:root .editor-styles-wrapper .has-white-color:visited {
+	color: #fff;
+}
+
+:root .editor-styles-wrapper .has-white-background-color,
+:root .editor-styles-wrapper .has-white-background-color:visited {
+	background-color: #fff;
+}

From 3ce948f0bd3f0a6a2a96140c6ada7f5211710ce4 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 10 Aug 2020 15:32:05 +0000
Subject: [PATCH 59/62] Bundled Themes: Bump theme versions ahead of WordPress
 5.5.

The following theme versions will be released in coordination with WordPress 5.5:
- Twenty Ten: 3.1
- Twenty Eleven: 3.5
- Twenty Twelve: 3.2
- Twenty Thirteen: 3.1
- Twenty Fourteen: 2.9
- Twenty Fifteen: 2.7
- Twenty Sixteen: 2.2
- Twenty Seventeen: 2.4
- Twenty Nineteen: 1.7
- Twenty Twenty: 1.5

Props whyisjake, desrosj.
Fixes #50769.
Built from https://develop.svn.wordpress.org/trunk@48775


git-svn-id: http://core.svn.wordpress.org/trunk@48537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 7 ++++++-
 style.css  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 96e51fd66..fc9856eba 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 === Twenty Twelve ===
 Contributors: wordpressdotorg
 Tested up to: 5.5
-Stable tag: 3.1
+Stable tag: 3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -42,6 +42,11 @@ Source: https://github.com/aFarkas/html5shiv
 
 == Changelog ==
 
+= 3.2 =
+* Released: August 11, 2020
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.2
+
 = 3.1 =
 * Released: March 31, 2020
 
diff --git a/style.css b/style.css
index 918167af3..48bd1e635 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 3.1
+Version: 3.2
 Requires at least: 3.5
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later

From 726f0b81b15212991838f5523644a6aa670b3237 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 11 Aug 2020 00:34:08 +0000
Subject: [PATCH 60/62] Docs: Consistently use third-person singular verbs for
 various filter descriptions, per the documentation standards.

See #50768.
Built from https://develop.svn.wordpress.org/trunk@48782


git-svn-id: http://core.svn.wordpress.org/trunk@48544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 author.php         | 2 +-
 content-status.php | 2 +-
 image.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/author.php b/author.php
index 120ee066e..8b3b22e26 100644
--- a/author.php
+++ b/author.php
@@ -57,7 +57,7 @@ get_header(); ?>
 				<div class="author-avatar">
 					<?php
 					/**
-					 * Filter the author bio avatar size.
+					 * Filters the author bio avatar size.
 					 *
 					 * @since Twenty Twelve 1.0
 					 *
diff --git a/content-status.php b/content-status.php
index 1518a2874..8e6294420 100644
--- a/content-status.php
+++ b/content-status.php
@@ -19,7 +19,7 @@ $post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attrib
 			</header>
 			<?php
 			/**
-			 * Filter the status avatar size.
+			 * Filters the status avatar size.
 			 *
 			 * @since Twenty Twelve 1.0
 			 *
diff --git a/image.php b/image.php
index dd15d651a..99586c3e5 100644
--- a/image.php
+++ b/image.php
@@ -93,7 +93,7 @@ get_header(); ?>
 								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
 									<?php
 									/**
-									 * Filter the image attachment size to use.
+									 * Filters the image attachment size to use.
 									 *
 									 * @since Twenty Twelve 1.0
 									 *

From c18dab2e96ae4fa27cd1411d473b941693a96a45 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 19 Aug 2020 02:28:13 +0000
Subject: [PATCH 61/62] Bundled Themes: Correct punctuation in "Your comment is
 awaiting moderation" string.

Props llizard, mayankmajeji.
Fixes #49867.
Built from https://develop.svn.wordpress.org/trunk@48825


git-svn-id: http://core.svn.wordpress.org/trunk@48587 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index 21b1967c7..5df652952 100644
--- a/functions.php
+++ b/functions.php
@@ -451,7 +451,7 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 				if ( $commenter['comment_author_email'] ) {
 					$moderation_note = __( 'Your comment is awaiting moderation.', 'twentytwelve' );
 				} else {
-					$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.', 'twentytwelve' );
+					$moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.', 'twentytwelve' );
 				}
 				?>
 

From da4f5234edaaf8effbfb491e52f992ac427985b8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 27 Oct 2020 02:18:05 +0000
Subject: [PATCH 62/62] Bundled Themes: Update latest version for `Tested up
 to:` in `readme.txt` files.

Props mukesh27.
Fixes #51501.
Built from https://develop.svn.wordpress.org/trunk@49322


git-svn-id: http://core.svn.wordpress.org/trunk@49083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index fc9856eba..39fa6d285 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 === Twenty Twelve ===
 Contributors: wordpressdotorg
-Tested up to: 5.5
+Tested up to: 5.6
 Stable tag: 3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html