Changeset 25023

Timestamp:

08/15/2013 12:24:27 AM (11 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: second pass at matching code standards achieved with Twenty Thirteen development. See #24858, props obenland.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• archive.php (modified) (1 diff)
• comments.php (modified) (1 diff)
• content-post-format.php (modified) (2 diffs)
• content-single.php (modified) (2 diffs)
• featured-content.php (modified) (1 diff)
• front-page.php (modified) (1 diff)
• functions.php (modified) (19 diffs)
• image.php (modified) (1 diff)
• inc/template-tags.php (modified) (4 diffs)
• index.php (modified) (1 diff)
• page.php (modified) (1 diff)
• rtl.css (modified) (18 diffs)
• search.php (modified) (1 diff)
• sidebar-content.php (modified) (1 diff)
• sidebar.php (modified) (3 diffs)
• single.php (modified) (1 diff)
• style.css (modified) (16 diffs)

trunk/src/wp-content/themes/twentyfourteen/archive.php

@@ -50 +50 @@
                     twentyfourteen_get_template_part();
                 endwhile;
-                twentyfourteen_content_nav( 'nav-below' );
+                twentyfourteen_paging_nav();
 
             else :

trunk/src/wp-content/themes/twentyfourteen/comments.php

@@ -57 +57 @@
 
     <?php if ( ! comments_open() ) : ?>
-    <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
+    <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
     <?php endif; ?>
 

trunk/src/wp-content/themes/twentyfourteen/content-post-format.php

@@ -4 +4 @@
  * @subpackage Twenty_Fourteen
  */
-$format = get_post_format();
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     <?php
-        if ( 'gallery' == $format ) :
-            $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC' ) );
+        if ( has_post_format( 'gallery' ) ) :
+            $images = get_children( array( 'post_parent' => get_the_ID(), 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC' ) );
             if ( $images ) :
-                $image = array_shift( $images ); ?>
+                $image = array_shift( $images );
+                ?>
                 <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-thumbnail">
                 <?php echo wp_get_attachment_image( $image->ID, 'featured-thumbnail-large' ); ?>
-                </a><?php
+                </a>
+                <?php
             endif;
         endif;
@@ -21 +22 @@
 
     <header class="entry-header">
-        <?php
-            /* translators: used between list items, there is a space after the comma */
-            $categories_list = get_the_category_list( __( ', ', 'twentyfourteen' ) );
-            if ( $categories_list && twentyfourteen_categorized_blog() && 'post' == get_post_type() ) :
-        ?>
+        <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
         <div class="entry-meta">
-            <span class="cat-links"><?php echo $categories_list; ?></span>
-        </div>
+            <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
+        </div><!-- .entry-meta -->
         <?php endif; ?>
 
-        <?php
-            /* Show title only if it exists */
-            the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' );
-        ?>
+        <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
 
         <div class="entry-meta">

trunk/src/wp-content/themes/twentyfourteen/content-single.php

@@ -4 +4 @@
  * @subpackage Twenty_Fourteen
  */
-has_post_format()
 ?>
 
@@ -28 +27 @@
 
         <div class="entry-meta">
-            <?php if ( has_post_format() ) : ?>
+            <?php if ( has_post_format( array( 'status', 'chat', 'aside', 'link', 'quote', 'audio' ) ) ) : ?>
             <span class="post-format">
                 <a class="entry-format" href="<?php echo esc_url( get_post_format_link( get_post_format() ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( get_post_format() ) ) ); ?>"><?php echo get_post_format_string( get_post_format() ); ?></a>

trunk/src/wp-content/themes/twentyfourteen/featured-content.php

@@ +1 @@
+<?php
+/**
+ * The template for displaying featured content.
+ *
+ * @todo: Add support for featured content.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
 <div class="featured-content-wrapper">
     <div id="featured-content" class="featured-content">

trunk/src/wp-content/themes/twentyfourteen/front-page.php

@@ -29 +29 @@
                                 comments_template();
                             endwhile;
-
-                            twentyfourteen_content_nav( 'nav-below' );
+                            twentyfourteen_paging_nav();
 
                         else :

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

@@ -1 +1 @@
 <?php
 /**
- * Twenty Fourteen functions and definitions
+ * Twenty Fourteen functions and definitions.
+ *
+ * Sets up the theme and provides some helper functions, which are used 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 http://codex.wordpress.org/Theme_Development
+ * and http://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.
+ *
+ * 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,
+ * see http://codex.wordpress.org/Plugin_API
  *
  * @package WordPress
@@ -8 +25 @@
 
 /**
- * Set the content width based on the theme's design and stylesheet.
- *
+ * Sets up the content width value based on the theme's design.
+ * @see twentyfourteen_content_width() for template-specific adjustments.
  */
 if ( ! isset( $content_width ) )
-    $content_width = 474; /* pixels */
-
-function twentyfourteen_set_content_width() {
-    global $content_width;
-    if ( is_page_template( 'full-width-page.php' ) || is_attachment() )
-        $content_width = 895;
-}
-add_action( 'template_redirect', 'twentyfourteen_set_content_width' );
+    $content_width = 474;
 
 if ( ! function_exists( 'twentyfourteen_setup' ) ) :
@@ -25 +35 @@
  * Sets up theme defaults and registers support for various WordPress features.
  *
- * Note that this function is hooked into the after_setup_theme hook, which runs
- * before the init hook. The init hook is too late for some features, such as indicating
- * support post thumbnails.
+ * Note that this function is hooked into the after_setup_theme hook, which
+ * runs before the init hook. The init hook is too late for some features, such
+ * as indicating support post thumbnails.
  */
 function twentyfourteen_setup() {
 
-    /**
-     * Make theme available for translation
-     * Translations can be filed in the /languages/ directory
-     * If you're building a theme based on Twenty Fourteen, use a find and replace
-     * to change 'twentyfourteen' to the name of your theme in all the template files
+    /*
+     * Makes Twenty Fourteen available for translation.
+     *
+     * Translations can be added to the /languages/ directory.
+     * If you're building a theme based on Twenty Fourteen, use a find and
+     * replace to change 'twentyfourteen' to the name of your theme in all
+     * template files.
      */
     load_theme_textdomain( 'twentyfourteen', get_template_directory() . '/languages' );
 
-    /**
-     * Add default posts and comments RSS feed links to head
-     */
+    // Adds RSS feed links to <head> for posts and comments.
     add_theme_support( 'automatic-feed-links' );
 
-    /**
-     * Enable support for Post Thumbnails
-     */
+    // Enable support for Post Thumbnails.
     add_theme_support( 'post-thumbnails', array( 'post' ) );
 
-    /**
-     * Adding several sizes for Post Thumbnails
-     */
+    // Adding several sizes for Post Thumbnails.
     add_image_size( 'featured-thumbnail-large', 672, 0 );
     add_image_size( 'featured-thumbnail-featured', 672, 336, true );
     add_image_size( 'featured-thumbnail-formatted', 306, 0 );
 
-    /**
-     * This theme uses wp_nav_menu() in one location.
+    // This theme uses wp_nav_menu() in two locations.
+    register_nav_menus( array(
+        'primary'   => __( 'Top primary menu', 'twentyfourteen' ),
+        'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' ),
+    ) );
+
+    /*
+     * Enable support for Post Formats.
+     * See http://codex.wordpress.org/Post_Formats
      */
-    register_nav_menus( array(
-        'primary' => __( 'Top primary menu', 'twentyfourteen' ),
-        'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' )
-    ) );
-
-    /**
-     * Enable support for Post Formats
-     */
-    add_theme_support( 'post-formats', array( 'aside', 'image', 'video', 'quote', 'link', 'gallery' ) );
-
-    /**
+    add_theme_support( 'post-formats', array(
+        'aside', 'image', 'video', 'quote', 'link', 'gallery'
+    ) );
+
+    /*
      * This theme allows users to set a custom background.
      */
@@ -80 +87 @@
 
 /**
+ * Adjusts content_width value for full width and attachment templates.
+ *
+ * @return void
+ */
+function twentyfourteen_content_width() {
+    if ( is_page_template( 'full-width-page.php' ) || is_attachment() )
+        $GLOBALS['content_width'] = 895;
+}
+add_action( 'template_redirect', 'twentyfourteen_content_width' );
+
+/**
  * Getter function for Featured Content Plugin.
- *
  */
 function twentyfourteen_get_featured_posts() {
@@ -91 +108 @@
  * So that we can use a condition like
  * if ( twentyfourteen_has_featured_posts( 1 ) )
- *
  */
 function twentyfourteen_has_featured_posts( $minimum = 1 ) {
@@ -97 +113 @@
         return false;
 
-    $featured_posts = apply_filters( 'twentyfourteen_get_featured_posts', array() );
+        $featured_posts = apply_filters( 'twentyfourteen_get_featured_posts', array() );
 
     return is_array( $featured_posts ) && count( $featured_posts ) > absint( $minimum );
@@ -103 +119 @@
 
 /**
- * Register widgetized area and update sidebar with default widgets
- *
+ * Registers two widget areas.
+ *
+ * @return void
  */
 function twentyfourteen_widgets_init() {
@@ -171 +188 @@
  * Register Google fonts for Twenty Fourteen.
  *
+ * @return void
  */
 function twentyfourteen_fonts() {
@@ -181 +199 @@
 
 /**
- * Enqueue scripts and styles
- *
+ * Enqueues scripts and styles for front end.
+ *
+ * @return void
  */
 function twentyfourteen_scripts() {
@@ -202 +221 @@
  * Enqueue Google fonts style to admin screen for custom header display.
  *
+ * @return void
  */
 function twentyfourteen_admin_fonts() {
@@ -209 +229 @@
 
 /**
- * Implement the Custom Header feature
- *
- */
-require( get_template_directory() . '/inc/custom-header.php' );
-
-/**
  * Sets the post excerpt length to 40 words.
  *
+ * @param int $length
+ * @return int
  */
 function twentyfourteen_excerpt_length( $length ) {
@@ -226 +242 @@
  * Returns a "Continue Reading" link for excerpts
  *
+ * @return string
  */
 function twentyfourteen_continue_reading_link() {
@@ -232 +249 @@
 
 /**
- * Replaces "[...]" (appended to automatically generated excerpts) with an ellipsis and twentyeleven_continue_reading_link().
+ * Replaces "[...]" (appended to automatically generated excerpts) with an
+ * ellipsis and twentyeleven_continue_reading_link().
+ *
+ * @param string $more
+ * @return string
  */
 function twentyfourteen_auto_excerpt_more( $more ) {
@@ -245 +266 @@
  * function tied to the get_the_excerpt filter hook.
  *
+ * @param string $output
+ * @return string
  */
 function twentyfourteen_custom_excerpt_more( $output ) {
@@ -257 +280 @@
 /**
  * Prints the attached image with a link to the next attached image.
- *
- * @since Twenty Thirteen 1.0
  *
  * @return void
@@ -281 +302 @@
         'post_mime_type' => 'image',
         'order'          => 'ASC',
-        'orderby'        => 'menu_order ID'
+        'orderby'        => 'menu_order ID',
     ) );
 
@@ -428 +449 @@
 
 /**
- * Adds custom classes to the array of body classes.
- *
+ *  Extends the default WordPress body classes.
+ *
+ * Adds body classes to denote:
+ * 1. Single or multiple authors.
+ * 2. Index views.
+ *
+ * @param array $classes A list of existing body class values.
+ * @return array The filtered body class list.
  */
 function twentyfourteen_body_classes( $classes ) {
@@ -445 +472 @@
 
 /**
- * Filters wp_title to print a neat <title> tag based on what is being viewed.
- *
+ * Creates a nicely formatted and more specific title element text for output
+ * in head of document, based on current view.
+ *
+ * @param string $title Default title text for current view.
+ * @param string $sep Optional separator.
+ * @return string The filtered title.
  */
 function twentyfourteen_wp_title( $title, $sep ) {
-    global $page, $paged;
+    global $paged, $page;
 
     if ( is_feed() )
         return $title;
 
-    // Add the blog name
+    // Add the site name.
     $title .= get_bloginfo( 'name' );
 
-    // Add the blog description for the home/front page.
+    // Add the site description for the home/front page.
     $site_description = get_bloginfo( 'description', 'display' );
     if ( $site_description && ( is_home() || is_front_page() ) )
-        $title .= " $sep $site_description";
-
-    // Add a page number if necessary:
+        $title = "$title $sep $site_description";
+
+    // Add a page number if necessary.
     if ( $paged >= 2 || $page >= 2 )
-        $title .= " $sep " . sprintf( __( 'Page %s', 'twentyfourteen' ), max( $paged, $page ) );
+        $title = "$title $sep " . sprintf( __( 'Page %s', 'twentyfourteen' ), max( $paged, $page ) );
 
     return $title;
@@ -471 +502 @@
 
 /**
+ * Implement the Custom Header feature
+ *
+ */
+require get_template_directory() . '/inc/custom-header.php';
+
+/**
  * Custom template tags for this theme.
  */

trunk/src/wp-content/themes/twentyfourteen/image.php

@@ -70 +70 @@
         </article><!-- #post-## -->
 
-        <nav id="image-navigation" class="site-navigation">
+        <nav id="image-navigation" class="navigation image-navigation">
             <?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?>
             <?php next_image_link( false, __( '<div class="next-image">Next Image</div>', 'twentyfourteen' ) ); ?>

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

@@ -2 +2 @@
 /**
  * Custom template tags for this theme.
- *
- * Eventually, some of the functionality here could be replaced by core features
  *
  * @package WordPress
@@ -9 +7 @@
  */
 
-if ( ! function_exists( 'twentyfourteen_content_nav' ) ) :
-/**
- * Display navigation to next/previous pages when applicable
- *
- */
-function twentyfourteen_content_nav( $nav_id ) {
-    global $wp_query, $post;
-
-    // Don't print empty markup on single pages if there's nowhere to navigate.
-    if ( is_single() ) {
-        $previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
-        $next = get_adjacent_post( false, '', false );
-
-        if ( ! $next && ! $previous )
-            return;
-    }
-
-    // Don't print empty markup in archives if there's only one page.
-    if ( $wp_query->max_num_pages < 2 && ( is_home() || is_archive() || is_search() ) )
+if ( ! function_exists( 'twentyfourteen_paging_nav' ) ) :
+/**
+ * Displays navigation to next/previous set of posts when applicable.
+ *
+ * @return void
+ */
+function twentyfourteen_paging_nav() {
+    // Don't print empty markup if there's only one page.
+    if ( $GLOBALS['wp_query']->max_num_pages < 2 )
         return;
 
-    $nav_class = 'site-navigation paging-navigation';
-    if ( is_single() )
-        $nav_class = 'site-navigation post-navigation';
-
-    ?>
-    <nav role="navigation" id="<?php echo $nav_id; ?>" class="<?php echo $nav_class; ?>">
+    $paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+    $pagenum_link = html_entity_decode( get_pagenum_link() );
+    $query_args   = array();
+    $url_parts    = explode( '?', $pagenum_link );
+
+    if ( isset( $url_parts[1] ) )
+        wp_parse_str( $url_parts[1], $query_args );
+
+    $pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
+    $pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
+
+    $format  = $GLOBALS['wp_rewrite']->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
+    $format .= $GLOBALS['wp_rewrite']->using_permalinks() ? user_trailingslashit( 'page/%#%', 'paged' ) : '?paged=%#%';
+
+    $links   = paginate_links( array(
+        'base'     => $pagenum_link,
+        'format'   => $format,
+        'total'    => $GLOBALS['wp_query']->max_num_pages,
+        'current'  => $paged,
+        'mid_size' => 1,
+        'add_args' => array_map( 'urlencode', $query_args ),
+        'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
+        'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
+    ) );
+
+    if ( $links ) :
+
+    ?>
+    <nav class="navigation paging-navigation" role="navigation">
+        <h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
+        <div class="pagination loop-pagination">
+            <?php echo $links; ?>
+        </div><!-- .pagination -->
+    </nav><!-- .navigation -->
+    <?php
+    endif;
+}
+endif;
+
+if ( ! function_exists( 'twentyfourteen_post_nav' ) ) :
+/**
+ * Displays navigation to next/previous post when applicable.
+*
+* @return void
+*/
+function twentyfourteen_post_nav() {
+    // Don't print empty markup if there's nowhere to navigate.
+    $previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
+    $next     = get_adjacent_post( false, '', false );
+
+    if ( ! $next && ! $previous )
+        return;
+
+    ?>
+    <nav class="navigation post-navigation" role="navigation">
         <h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
-
-    <?php if ( is_single() ) : // navigation links for single posts ?>
-
-        <?php previous_post_link( '%link', __( '<div class="nav-previous"><span class="meta-nav">Previous Post</span>%title</div>', 'twentyfourteen' ) ); ?>
-        <?php next_post_link( '%link', __( '<div class="nav-next"><span class="meta-nav">Next Post</span>%title</div>', 'twentyfourteen' ) ); ?>
-
-    <?php elseif ( $wp_query->max_num_pages > 1 && ( is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?>
-
-        <div class="pagination loop-pagination">
-        <?php
-            /* Get the current page. */
-            $current = ( get_query_var( 'paged' ) ? absint( get_query_var( 'paged' ) ) : 1 );
-
-            /* Get the max number of pages. */
-            $max_num_pages = intval( $wp_query->max_num_pages );
-
-            /* Set up arguments for the paginate_links() function. */
-            $args = array(
-                'base' => add_query_arg( 'paged', '%#%' ),
-                'format' => '',
-                'total' => $max_num_pages,
-                'current' => $current,
-                'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
-                'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
-                'mid_size' => 1
-            );
-
-            echo paginate_links( $args )
-        ?>
-        </div>
-    <?php endif; ?>
-
-    </nav><!-- #<?php echo $nav_id; ?> -->
-    <?php
-}
-endif; // twentyfourteen_content_nav
+        <div class="nav-links">
+            <?php
+                previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
+                next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
+            ?>
+        </div><!-- .nav-links -->
+    </nav><!-- .navigation -->
+    <?php
+}
+endif;
 
 if ( ! function_exists( 'twentyfourteen_comment' ) ) :
@@ -131 +142 @@
  * Prints HTML with meta information for the current post-date/time and author.
  *
+ * @return void
  */
 function twentyfourteen_posted_on() {
@@ -151 +163 @@
  * Returns true if a blog has more than 1 category
  *
+ * @return boolean
  */
 function twentyfourteen_categorized_blog() {

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

@@ -25 +25 @@
                     twentyfourteen_get_template_part();
                 endwhile;
-                twentyfourteen_content_nav( 'nav-below' );
+                twentyfourteen_paging_nav();
 
             else :

trunk/src/wp-content/themes/twentyfourteen/page.php

@@ -29 +29 @@
             ?>
 
-        </div><!-- #content .site-content -->
-    </div><!-- #primary .content-area -->
+        </div><!-- #content -->
+    </div><!-- #primary -->
 
 <?php

trunk/src/wp-content/themes/twentyfourteen/rtl.css

@@ -26 +26 @@
 }
 
-ul ul, ol ol, ul ol, ol ul {
+li > ul,
+li > ol {
     margin-right: 20px;
     margin-right: 2.0rem;
@@ -296 +297 @@
 }
 
-.comment-meta,
+.comment-metadata,
 .comment-content {
     padding-right: 36px;
@@ -309 +310 @@
 }
 
-.commentlist .children {
+.comment-list .children {
     margin-right: 20px;
     margin-right: 2.0rem;
@@ -325 +326 @@
 ----------------------------------------------- */
 
-.widget ul ul,
-.widget ol ol,
-.widget ul ol,
-.widget ol ul {
+.widget li > ul,
+.widget li > ol {
     margin: 0 10px 0 0;
     margin: 0 1.0rem 0 0;
@@ -338 +337 @@
     margin-right: 0.1rem;
     margin-left: auto;
-}
-
-/* Authors Widget */
-.widget_authors img {
-    margin: 0 0 9px 5px;
-    margin: 0 0 0.9rem 0.5rem;
 }
 
@@ -401 +394 @@
     #primary .byline a:before,
     #primary .comments-link a:before,
-    #primary .edit-link a:before,
+    .entry-comment .edit-link a:before,
     .attachment span.entry-date:before,
     #primary .full-size-link a:before,
@@ -447 +440 @@
     }
 
-    #primary .edit-link a:before {
+    .entry-comment .edit-link a:before {
         margin: -1px 0 0 2px;
         margin: -0.1rem 0 0 0.2rem;
     }
 
-    .page #primary .edit-link a:before {
+    .page .entry-comment .edit-link a:before {
         margin: 5px 0 0 2px;
         margin: 0.5rem 0 0 0.2rem;
@@ -504 +497 @@
     #comments #respond,
     .comments-area article,
-    .commentlist li.trackback,
-    .commentlist li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .comment-list li.trackback,
+    .comment-list li.pingback,
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-left: 9.12778904%;
         padding-right: 9.12778904%;
@@ -523 +516 @@
     .full-width #comments #respond,
     .full-width .comments-area article,
-    .full-width .commentlist li.trackback,
-    .full-width .commentlist li.pingback {
+    .full-width .comment-list li.trackback,
+    .full-width .comment-list li.pingback {
         padding-left: 6.04307432%;
         padding-right: 6.04307432%;
@@ -568 +561 @@
     #comments #respond,
     .comments-area article,
-    .commentlist li.trackback,
-    .commentlist li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .comment-list li.trackback,
+    .comment-list li.pingback,
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-left: 12.39493534%;
         padding-right: 17.06896551%;
@@ -580 +573 @@
     }
 
-    .commentlist,
-    .full-width .commentlist {
+    .comment-list,
+    .full-width .comment-list {
         margin-right: -70px;
         margin-right: -7.0rem;
@@ -603 +596 @@
     .full-width #comments #respond,
     .full-width .comments-area article,
-    .full-width .commentlist li.trackback,
-    .full-width .commentlist li.pingback {
+    .full-width .comment-list li.trackback,
+    .full-width .comment-list li.pingback {
         padding-left: 11.30926724%;
         padding-right: 11.30926724%;
@@ -701 +694 @@
     #comments #respond,
     .comments-area article,
-    .commentlist li.trackback,
-    .commentlist li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .comment-list li.trackback,
+    .comment-list li.pingback,
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-left: 9.87001616%;
         padding-right: 9.19765166%;
     }
 
-    .commentlist,
-    .full-width .commentlist {
+    .comment-list,
+    .full-width .comment-list {
         margin-right: 0;
         margin-left: auto;
@@ -726 +719 @@
     .full-width #comments #respond,
     .full-width .comments-area article,
-    .full-width .commentlist li.trackback,
-    .full-width .commentlist li.pingback {
+    .full-width .comment-list li.trackback,
+    .full-width .comment-list li.pingback {
         padding-left: 5.882236%;
         padding-right: 5.882236%;
@@ -772 +765 @@
     #comments #respond,
     .comments-area article,
-    .commentlist li.trackback,
-    .commentlist li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .comment-list li.trackback,
+    .comment-list li.pingback,
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-left: 12.44146986%;
         padding-right: 16.77524429%;
@@ -784 +777 @@
     }
 
-    .commentlist,
-    .full-width .commentlist {
+    .comment-list,
+    .full-width .comment-list {
         margin-right: -70px;
         margin-right: -7.0rem;
@@ -812 +805 @@
     .full-width #comments #respond,
     .full-width .comments-area article,
-    .full-width .commentlist li.trackback,
-    .full-width .commentlist li.pingback {
+    .full-width .comment-list li.trackback,
+    .full-width .comment-list li.pingback {
         padding-left: 11.21868265%;
         padding-right: 11.21868265%;
@@ -853 +846 @@
     .full-width #comments #respond,
     .full-width .comments-area article,
-    .full-width .commentlist li.trackback,
-    .full-width .commentlist li.pingback {
-        padding-left: 0;
-    }
-}
+    .full-width .comment-list li.trackback,
+    .full-width .comment-list li.pingback {
+        padding-left: 0;
+    }
+}

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

@@ -24 +24 @@
                     twentyfourteen_get_template_part();
                 endwhile;
-
-                twentyfourteen_content_nav( 'nav-below' );
+                twentyfourteen_paging_nav();
 
             else :

trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php

@@ -31 +31 @@
         </aside>
     <?php endif; // end sidebar widget area ?>
-</div><!-- #content-sidebar .widget-area -->
+</div><!-- #content-sidebar -->

trunk/src/wp-content/themes/twentyfourteen/sidebar.php

@@ -1 +1 @@
 <?php
 /**
- * The Sidebar containing the main widget areas.
+ * The Sidebar containing the main widget area.
  *
  * @package WordPress
@@ -21 +21 @@
         </nav>
         <?php endif; ?>
-    </div>
+    </div><!-- #secondary-top -->
 
     <div id="secondary-bottom" class="widget-area" role="complementary">
@@ -28 +28 @@
             dynamic_sidebar( 'sidebar-1' );
         ?>
-    </div><!-- .widget-area -->
+    </div><!-- #secondary-bottom -->
 </div><!-- #secondary -->

trunk/src/wp-content/themes/twentyfourteen/single.php

@@ -17 +17 @@
                 get_template_part( 'content', 'single' );
 
-                twentyfourteen_content_nav( 'nav-below' );
+                twentyfourteen_post_nav();
 
                 // If comments are open or we have at least one comment, load up the comment template.

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

@@ -1781 +1781 @@
     margin: 2.4rem 0 0;
 }
-.post-navigation .nav-previous,
-.post-navigation .nav-next,
+.post-navigation [rel="prev"],
+.post-navigation [rel="next"],
 #image-navigation .previous-image,
 #image-navigation .next-image  {
@@ -1794 +1794 @@
     width: 100%;
 }
-.post-navigation .nav-next {
+.post-navigation [rel="next"] {
     margin: 0;
 }
@@ -1864 +1864 @@
     text-transform: uppercase;
 }
-#respond #commentform {
+#commentform {
     background: #fff;
     padding: 0 10px;
@@ -1966 +1966 @@
 }
 .comment-content ul,
-.comment-content ol  {
+.comment-content ol {
     margin: 0 0 24px 22px;
     margin: 0 0 2.4rem 2.2rem;
 }
-.comment-content ul ul,
-.comment-content ol ol,
-.comment-content ul ol,
-.comment-content ol ul {
+.comment-content li > ul,
+.comment-content li > ol {
     margin-bottom: 0;
 }
@@ -1998 +1996 @@
     margin-bottom: 2.4rem;
 }
-.nocomments {
+.no-comments {
     color: #8c8c8c;
     font-size: 16px;
@@ -2077 +2075 @@
     margin: 0;
 }
-.widget ul ul,
-.widget ol ol,
-.widget ul ol,
-.widget ol ul {
+.widget li > ul,
+.widget li > ol {
     margin: 0 0 0 10px;
     margin: 0 0 0 1.0rem;
@@ -2090 +2086 @@
     font-weight: 900;
     line-height: 1.7142857142;
+    margin: 0 0 24px 0;
     margin: 0 0 2.4rem 0;
-    margin: 0 0 24px 0;
     text-transform: uppercase;
 }
@@ -2146 +2142 @@
 }
 
-/* Authors Widget */
-.widget_authors > ul > li {
-    list-style: none;
-    margin-bottom: 18px;
-    margin-bottom: 1.8rem;
-}
-.widget_authors > ul > li:last-child {
-    margin-bottom: 0;
-}
-.widget_authors img {
-    border-radius: 2;
-    margin: 0 5px 9px 0;
-    margin: 0 0.5rem 0.9rem 0;
-    vertical-align: middle;
-}
-.widget_authors ul ul {
-    margin: 0;
-}
-
-/* Author Grid Widget */
-.widget_author_grid .avatar {
-    max-width: none;
-}
-
-/* Blog Subscription */
-.widget_blog_subscription input[type="text"] {
-    padding: 4px !important;
-    padding: 0.4rem !important;
-}
-
 /* Caledar widget*/
 .widget_calendar #wp-calendar a {
@@ -2226 +2192 @@
 }
 
-/* Contact Info Widget */
-.widget_contact_info #contact-map {
-    margin-bottom: 18px;
-    margin-bottom: 1.8rem;
-}
-.widget_contact_info #contact-info-map-canvas {
-    height: 168px;
-    height: 16.8rem;
-}
-
-/* Flickr Widget (WP.com) */
-.widget_flickr #flickr_badge_uber_wrapper {
-    margin-top: 4px;
-    margin-top: 0.4rem;
-}
-.widget_flickr #flickr_badge_uber_wrapper a:link,
-.widget_flickr #flickr_badge_uber_wrapper a:active,
-.widget_flickr #flickr_badge_uber_wrapper a:visited {
-    color: #fff;
-}
-.widget_flickr #flickr_badge_uber_wrapper a:hover {
-    color: #5FF23D;
-}
-.widget_flickr #flickr_badge_wrapper {
-    background-color: transparent;
-    border: none;
-}
-
-/* Gravatar Profile widget */
-.widget-area .widget-grofile h4 {
-    color: rgba(255, 255, 255, 0.75);
-    font-size: 11px;
-    font-size: 1.1rem;
-    line-height: 1.6363636363;
-    margin: 18px 0 0;
-    margin: 1.8rem 0 0;
-    text-transform: uppercase;
-}
-.widget-grofile .grofile-accounts {
-    margin-top: 4px;
-    margin-top: 0.4rem;
-}
-
-/* Milestone Widget */
-.widget-area .milestone-widget .milestone-content {
-    max-width: 100%;
-}
-.widget-area .milestone-countdown,
-.widget-area .milestone-message {
-    border-color: rgba(255, 255, 255, 0.1);
-    border-top: 0;
-}
-.widget-area .milestone-header,
-.widget-area .milestone-countdown,
-.widget-area .milestone-message {
-    background-color: rgba(255, 255, 255, 0.1);
-    border: 1px solid rgba(255, 255, 255, 0.15);
-    color: rgba(255, 255, 255, 0.75);
-}
-.widget-area .milestone-countdown {
-    background-color: rgba(255, 255, 255, 0.1);
-}
-.widget-area .milestone-widget {
-    margin-bottom: 48px;
-    margin-bottom: 4.8rem;
-}
-.widget-area .milestone-content {
-    margin-top: 0;
-}
-
 /* RSS Widget */
 .widget_rss li {
@@ -2335 +2231 @@
 .search-submit {
     display: none;
-}
-
-/* Twitter Widget */
-.widget_twitter li {
-    margin-bottom: 18px;
-    margin-bottom: 1.8rem;
-}
-.widget_twitter li:last-child {
-    margin-bottom: 0;
-}
-.widget_twitter li a {
-    word-wrap: break-word;
-}
-.widget_twitter iframe {
-    margin: 18px 0 0;
-    margin: 1.8rem 0 0;
 }
 
@@ -2453 +2333 @@
     background-color: rgba(0, 0, 0, 0.02);
 }
-#content-sidebar .widget_flickr #flickr_badge_uber_wrapper a:link,
-#content-sidebar .widget_flickr #flickr_badge_uber_wrapper a:active,
-#content-sidebar .widget_flickr #flickr_badge_uber_wrapper a:visited {
-    color: #2b2b2b;
-}
-#content-sidebar .widget_flickr #flickr_badge_uber_wrapper a:hover {
-    color: #41a62a;
-}
-#content-sidebar .widget-grofile h4 {
-    color: #2b2b2b;
-    font-size: 14px;
-    font-size: 1.4rem;
-    font-weight: 900;
-    line-height: 1.2857142857;
-}
-#content-sidebar .milestone-countdown,
-#content-sidebar .milestone-message {
-    border-color: rgba(255, 255, 255, 0.1);
-    border-top: 0;
-}
-#content-sidebar .milestone-header,
-#content-sidebar .milestone-countdown,
-#content-sidebar .milestone-message {
-    background-color: #000;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    color: #fff;
-}
-#content-sidebar .milestone-countdown {
-    background-color: #fff;
-    color: #2b2b2b;
-}
-#content-sidebar .widget_rss li,
-#content-sidebar .widget_twitter li {
+#content-sidebar .widget_rss li {
     margin-bottom: 0;
-}
-#content-sidebar .widget .widgets-multi-column-grid li {
-    border-top: none;
-    padding: 0 8px 6px 0;
-    padding: 0 0.8rem 0.6rem 0;
 }
 
@@ -2502 +2345 @@
     box-sizing: border-box;
 }
-
-
-/* =Jetpack
------------------------------------------------ */
-
-/* Infinite Scroll */
-
-/* Hide elements when IS is in use  */
-.infinite-scroll #nav-below,
-.infinite-scroll.neverending #colophon {
-    display: none;
-}
-.infinite-scroll #content {
-    margin-bottom: 48px;
-    margin-bottom: 4.8rem;
-}
-#infinite-handle {
-    margin-top: 48px;
-    margin-top: 4.8rem;
-    text-align: center;
-}
-#infinite-handle span {
-    background-color: #000;
-    border: 0;
-    border-radius: 2px;
-    color: #fff;
-    font-weight: 700;
-    font-size: 12px;
-    font-size: 1.2rem;
-    line-height: 1;
-    padding: 11px 35px 10px;
-    padding: 1.1rem 3.5rem 1.0rem;
-    text-transform: uppercase;
-}
-#infinite-handle span:before {
-    color: #fff;
-}
-#infinite-handle span:hover {
-    background-color: #41a62a;
-}
-.infinite-loader {
-    margin: 48px auto;
-    margin: 4.8rem auto;
-    width: 25px;
-    width: 2.5rem;
-    height: 24px;
-    height: 2.4rem;
-}
-#infinite-footer {
-    z-index: 10;
-}
-#infinite-footer .container {
-    border-width: 1px 1px 0 0;
-    margin: 0;
-}
-/* Reset when IS is finished  */
-.infinite-scroll.infinity-end #content {
-    margin-bottom: 0;
-}
-.infinite-end.neverending #colophon {
-    display: block;
-}
-
-
-/* Sharing */
-#main div.sharedaddy div.sd-block {
-    border-top: 1px dotted rgba(0, 0, 0, 0.1);
-}
-#main div.sharedaddy h3.sd-title {
-    font-size: 11px;
-    font-size: 1.1rem;
-    font-family: lato, sans-serif;
-    text-transform: uppercase;
-}
-#main div.sharedaddy .sd-like h3.sd-title {
-    width: 17.875%;
-}
-.entry-content > .pd-rating .rating-msg {
-    font-size: 12px;
-    font-size: 1.2rem;
-}
-
-/* Stats image */
-img#wpstats {
-    margin-top: -5px;
-    margin-top: -0.5rem;
-    position: absolute;
-}
-
-/* Subscription */
-.jetpack_subscription_widget input[type="text"] {
-    padding: 4px !important;
-    width: 100% !important;
-}
-.comment-subscription-form {
-    margin-bottom: 0;
-}
-
-
-/* =WP.com
------------------------------------------------ */
-
-/* Prevent stats images to break the layout */
-img[src^="http://botd"] {
-    position: absolute;
-}
-
-/* Corrects line number misalignemnt in GitHub Gist embeds */
-.gist .gist-file .gist-data .line-numbers span {
-    line-height: 1.7142857142;
-}
-.entry-content .gist table {
-    margin-bottom: 0;
-}
-
 
 /* =Media Queries
@@ -2928 +2656 @@
     }
     .comments-title,
-    .nocomments,
+    .no-comments,
     #comments #respond,
     .comments-area article,
     .comment-list li.trackback,
     .comment-list li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-right: 9.12778904%;
         padding-left: 9.12778904%;
@@ -3031 +2759 @@
     }
     .comments-title,
-    .nocomments,
+    .no-comments,
     #comments #respond,
     .comments-area article,
     .comment-list li.trackback,
     .comment-list li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-right: 12.39493534%;
         padding-left: 17.06896551%;
@@ -3226 +2954 @@
     }
     .comments-title,
-    .nocomments,
+    .no-comments,
     #comments #respond,
     .comments-area article,
     .comment-list li.trackback,
     .comment-list li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-right: 9.87001616%;
         padding-left: 9.19765166%;
@@ -3319 +3047 @@
     }
     .comments-title,
-    .nocomments,
+    .no-comments,
     #comments #respond,
     .comments-area article,
     .comment-list li.trackback,
     .comment-list li.pingback,
-    .post-navigation .nav-previous,
-    .post-navigation .nav-next {
+    .post-navigation [rel="prev"],
+    .post-navigation [rel="next"] {
         padding-right: 12.44146986%;
         padding-left: 16.77524429%;