Changeset 30072

Timestamp:

10/28/2014 09:02:02 PM (10 years ago)

Author:

iandstewart

Message:

Twenty Fifteen: Use a heading heirarchy to provide a better navigation experience when using screenreading software.

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

Location:

trunk/src/wp-content/themes/twentyfifteen

Files:

• author-bio.php (modified) (1 diff)
• content-link.php (modified) (1 diff)
• content-search.php (modified) (1 diff)
• content.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• header.php (modified) (1 diff)
• inc/template-tags.php (modified) (3 diffs)
• index.php (modified) (1 diff)
• style.css (modified) (1 diff)

trunk/src/wp-content/themes/twentyfifteen/author-bio.php

@@ -25 +25 @@
     </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' ); ?>

trunk/src/wp-content/themes/twentyfifteen/content-link.php

@@ -15 +15 @@
 
     <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 -->

trunk/src/wp-content/themes/twentyfifteen/content-search.php

@@ -15 +15 @@
 
     <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 -->
 

trunk/src/wp-content/themes/twentyfifteen/content.php

@@ -19 +19 @@
                 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;
         ?>

trunk/src/wp-content/themes/twentyfifteen/functions.php

@@ -120 +120 @@
         '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>',
     ) );
 }

trunk/src/wp-content/themes/twentyfifteen/header.php

@@ -30 +30 @@
         <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 -->

trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php

@@ -35 +35 @@
     ?>
     <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; ?>
@@ -72 +72 @@
     ?>
     <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
@@ -99 +99 @@
     ?>
     <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

trunk/src/wp-content/themes/twentyfifteen/index.php

@@ -22 +22 @@
 
         <?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(); ?>

trunk/src/wp-content/themes/twentyfifteen/style.css

@@ -1285 +1285 @@
     font-size: 22px;
     font-size: 2.2rem;
+    font-weight: 700;
     line-height: 1.3636;
+    margin-bottom: 0;
 }