From e5275dcedbda545d5802b1daa0e2c4bfc3bd65f2 Mon Sep 17 00:00:00 2001
From: iandstewart <iandstewart@602fd350-edb4-49c9-b593-d223f7449a82>
Date: Tue, 28 Oct 2014 21:02:02 +0000
Subject: [PATCH] Twenty Fifteen: Use a heading heirarchy to provide a better
 navigation experience when using screenreading software.

Props davidakennedy, rianrietveld, iamtakashi, afercia, davidakennedy, fixes #30065.


git-svn-id: https://develop.svn.wordpress.org/trunk@30072 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentyfifteen/author-bio.php |  2 +-
 .../themes/twentyfifteen/content-link.php          |  8 +++++++-
 .../themes/twentyfifteen/content-search.php        |  2 +-
 src/wp-content/themes/twentyfifteen/content.php    |  2 +-
 src/wp-content/themes/twentyfifteen/functions.php  |  4 ++--
 src/wp-content/themes/twentyfifteen/header.php     | 14 ++++++++++++--
 .../themes/twentyfifteen/inc/template-tags.php     |  6 +++---
 src/wp-content/themes/twentyfifteen/index.php      |  6 ++++++
 src/wp-content/themes/twentyfifteen/style.css      |  2 ++
 9 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/wp-content/themes/twentyfifteen/author-bio.php b/src/wp-content/themes/twentyfifteen/author-bio.php
index a3c2a9cf86..e7d839c118 100644
--- a/src/wp-content/themes/twentyfifteen/author-bio.php
+++ b/src/wp-content/themes/twentyfifteen/author-bio.php
@@ -24,7 +24,7 @@
 		?>
 	</div><!-- .author-avatar -->
 	<div class="author-description">
-		<h2 class="author-title"><?php echo get_the_author(); ?></h2>
+		<h3 class="author-title"><?php echo get_the_author(); ?></h3>
 		<p class="author-bio">
 			<?php the_author_meta( 'description' ); ?>
 			<a class="author-link" href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
diff --git a/src/wp-content/themes/twentyfifteen/content-link.php b/src/wp-content/themes/twentyfifteen/content-link.php
index 04193aa79d..881e07eb03 100644
--- a/src/wp-content/themes/twentyfifteen/content-link.php
+++ b/src/wp-content/themes/twentyfifteen/content-link.php
@@ -14,7 +14,13 @@
 	<?php twentyfifteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
-		<?php the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h1>' ); ?>
+		<?php
+			if ( is_single() ) :
+				the_title( sprintf( '<h1 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h1>' );
+			else :
+				the_title( sprintf( '<h2 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h2>' );
+			endif;
+		?>
 	</header>
 	<!-- .entry-header -->
 
diff --git a/src/wp-content/themes/twentyfifteen/content-search.php b/src/wp-content/themes/twentyfifteen/content-search.php
index 1d625f9672..05fa74d8c8 100644
--- a/src/wp-content/themes/twentyfifteen/content-search.php
+++ b/src/wp-content/themes/twentyfifteen/content-search.php
@@ -14,7 +14,7 @@
 	<?php twentyfifteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
-		<?php the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' ); ?>
+		<?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
 	</header><!-- .entry-header -->
 
 	<div class="entry-summary">
diff --git a/src/wp-content/themes/twentyfifteen/content.php b/src/wp-content/themes/twentyfifteen/content.php
index 82a3aa3cbb..5cc937aa90 100644
--- a/src/wp-content/themes/twentyfifteen/content.php
+++ b/src/wp-content/themes/twentyfifteen/content.php
@@ -18,7 +18,7 @@
 			if ( is_single() ) :
 				the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
-				the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' );
+				the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
 			endif;
 		?>
 	</header><!-- .entry-header -->
diff --git a/src/wp-content/themes/twentyfifteen/functions.php b/src/wp-content/themes/twentyfifteen/functions.php
index c1c5281743..dccfc451e2 100644
--- a/src/wp-content/themes/twentyfifteen/functions.php
+++ b/src/wp-content/themes/twentyfifteen/functions.php
@@ -119,8 +119,8 @@ function twentyfifteen_widgets_init() {
 		'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentyfifteen' ),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
-		'before_title'  => '<h1 class="widget-title">',
-		'after_title'   => '</h1>',
+		'before_title'  => '<h2 class="widget-title">',
+		'after_title'   => '</h2>',
 	) );
 }
 add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
diff --git a/src/wp-content/themes/twentyfifteen/header.php b/src/wp-content/themes/twentyfifteen/header.php
index a58512e6f2..8fbfa465da 100644
--- a/src/wp-content/themes/twentyfifteen/header.php
+++ b/src/wp-content/themes/twentyfifteen/header.php
@@ -29,8 +29,18 @@
 	<div id="sidebar" class="sidebar">
 		<header id="masthead" class="site-header" role="banner">
 			<div class="site-branding">
-				<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
-				<p class="site-description"><?php bloginfo( 'description' ); ?></p>
+				<?php
+					if ( is_front_page() && is_home() ) : ?>
+						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+					<?php else : ?>
+						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
+					<?php endif;
+
+					$description = get_bloginfo( 'description', 'display' );
+					if ( ! empty( $description ) ) : ?>
+						<p class="site-description"><?php echo esc_html( $description ); ?></p>
+					<?php endif;
+				?>
 				<button class="secondary-toggle"><?php esc_html_e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
 			</div><!-- .site-branding -->
 		</header><!-- .site-header -->
diff --git a/src/wp-content/themes/twentyfifteen/inc/template-tags.php b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
index 56b89c9323..6a78488c6a 100644
--- a/src/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -34,7 +34,7 @@ function twentyfifteen_paging_nav() {
 	if ( $links ) :
 	?>
 	<nav class="navigation pagination" role="navigation">
-		<h1 class="screen-reader-text"><?php esc_html_e( 'Posts navigation', 'twentyfifteen' ); ?></h1>
+		<h2 class="screen-reader-text"><?php esc_html_e( 'Posts navigation', 'twentyfifteen' ); ?></h2>
 		<div class="nav-links">
 			<?php echo $links; ?>
 		</div><!-- .nav-links -->
@@ -71,7 +71,7 @@ function twentyfifteen_post_nav() {
 
 	?>
 	<nav class="navigation post-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php esc_html_e( 'Post navigation', 'twentyfifteen' ); ?></h1>
+		<h2 class="screen-reader-text"><?php esc_html_e( 'Post navigation', 'twentyfifteen' ); ?></h2>
 		<div class="nav-links">
 			<?php
 			if ( is_attachment() ) :
@@ -98,7 +98,7 @@ function twentyfifteen_comment_nav() {
 	if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
 	?>
 	<nav class="navigation comment-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'twentyfifteen' ); ?></h1>
+		<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
 		<div class="nav-links">
 			<?php
 				if ( $prev_link = get_previous_comments_link( esc_html__( 'Older Comments', 'twentyfifteen' ) ) ) :
diff --git a/src/wp-content/themes/twentyfifteen/index.php b/src/wp-content/themes/twentyfifteen/index.php
index 981957cea3..9187c09788 100644
--- a/src/wp-content/themes/twentyfifteen/index.php
+++ b/src/wp-content/themes/twentyfifteen/index.php
@@ -22,6 +22,12 @@ get_header(); ?>
 
 		<?php if ( have_posts() ) : ?>
 
+			<?php if ( is_home() && ! is_front_page() ) : ?>
+				<header>
+					<h1 class="page-title screen-reader-text"><?php echo esc_html( get_the_title( get_option( 'page_for_posts' ) ) ); ?></h1>
+				</header>
+			<?php endif; ?>
+
 			<?php while ( have_posts() ) : the_post(); ?>
 
 				<?php
diff --git a/src/wp-content/themes/twentyfifteen/style.css b/src/wp-content/themes/twentyfifteen/style.css
index c81c6e8bc6..fc7765c705 100644
--- a/src/wp-content/themes/twentyfifteen/style.css
+++ b/src/wp-content/themes/twentyfifteen/style.css
@@ -1284,7 +1284,9 @@ img.aligncenter {
 	font-family: "Noto Sans", sans-serif;
 	font-size: 22px;
 	font-size: 2.2rem;
+	font-weight: 700;
 	line-height: 1.3636;
+	margin-bottom: 0;
 }
 
 .site-description {