Ticket #25045: 25045.diff

wp-content/themes/twentyfourteen/functions.php

@@ -43 +43 @@
          */
         add_theme_support( 'automatic-feed-links' );
 
+        add_theme_support( 'html5' );
+
         /**
          * Enable support for Post Thumbnails
          */

wp-content/themes/twentyfourteen/comments.php

@@ -40 +40 @@
                         wp_list_comments( array(
                                 'style'      => 'ol',
                                 'short_ping' => true,
-
-                                // TODO: Remove callback and update styles.
-                                'callback'=>'twentyfourteen_comment',
                         ) );
                 ?>
         </ol><!-- .comment-list -->

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

@@ -73 +73 @@
 }
 endif; // twentyfourteen_content_nav
 
-if ( ! function_exists( 'twentyfourteen_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- */
-function twentyfourteen_comment( $comment, $args, $depth ) {
-        $GLOBALS['comment'] = $comment;
-        switch ( $comment->comment_type ) :
-                case 'pingback' :
-                case 'trackback' :
-        ?>
-        <li class="post pingback">
-                <p><?php _e( 'Pingback:', 'twentyfourteen' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyfourteen' ), ' ' ); ?></p>
-        <?php
-                        break;
-                default :
-        ?>
-        <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
-                <article id="comment-<?php comment_ID(); ?>" class="comment">
-                        <footer>
-                                <div class="comment-author vcard">
-                                        <span class="comment-author-avatar"><?php echo get_avatar( $comment, 32 ); ?></span>
-                                        <?php printf( __( '%s', 'twentyfourteen' ), sprintf( '<cite class="fn">%s</cite> says:', get_comment_author_link() ) ); ?>
-                                </div><!-- .comment-author .vcard -->
-                        </footer>
-
-                        <div class="comment-content">
-                                <?php comment_text(); ?>
-                                <?php if ( $comment->comment_approved == '0' ) : ?>
-                                        <p><em><?php _e( 'Your comment is awaiting moderation.', 'twentyfourteen' ); ?></em></p>
-                                <?php endif; ?>
-                        </div>
-
-                        <div class="comment-meta commentmetadata">
-                                <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><time pubdate datetime="<?php comment_time( 'c' ); ?>">
-                                <?php
-                                        /* translators: 1: date, 2: time */
-                                        printf( __( '%1$s at %2$s', 'twentyfourteen' ), get_comment_date(), get_comment_time() ); ?>
-                                </time></a>
-                                <?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-                                <?php edit_comment_link( __( 'Edit', 'twentyfourteen' ), ' ' );
-                                ?>
-                        </div><!-- .comment-meta .commentmetadata -->
-                </article><!-- #comment-## -->
-
-        <?php
-                        break;
-        endswitch;
-}
-endif; // ends check for twentyfourteen_comment()
-
 if ( ! function_exists( 'twentyfourteen_posted_on' ) ) :
 /**
  * Prints HTML with meta information for the current post-date/time and author.

wp-content/themes/twentyfourteen/style.css

@@ -1873 +1873 @@
         margin: 0 0 48px 0;
         margin: 0 0 4.8rem 0;
 }
-.comment-meta,
+.comment-metadata,
 .comment-author {
         font-size: 14px;
         font-size: 1.4rem;
         line-height: 1.7142857142;
 }
-.comment-author cite {
+.comment-author .fn {
         font-weight: 900;
         text-transform: uppercase;
 }
 .comment-author a {
         color: #2b2b2b;
 }
-.comment-meta a,
+.comment-metadata a,
 .comment-list li.trackback a,
 .comment-list li.pingback a {
         color: #8c8c8c;
 }
 .comment-author a:hover,
-.comment-meta a:hover,
+.comment-metadata a:hover,
 .comment-list li.trackback a:hover,
 .comment-list li.pingback a:hover {
         color: #41a62a;
         text-decoration: none;
 }
-.comment-edit-link:before,
-.comment-reply-link:before {
+.comment-edit-link:before {
         color: rgba(0, 0, 0, 0.2);
         content: '\007c\0020';
 }
@@ -1919 +1918 @@
         background: none;
         min-height: 48px;
         min-height: 4.8rem;
-        position: relative;
 }
 .comment-author {
         padding-left: 36px;
         padding-left: 3.6rem;
         position: relative;
 }
-.comment-author .comment-author-avatar {
+.comment-author .avatar {
         border: 1px solid rgba(0, 0, 0, 0.1);
         padding: 2px;
         padding: 0.2rem;
@@ -1939 +1937 @@
         height: 22px;
         height: 2.2rem;
 }
-.bypostauthor > article .comment-author .comment-author-avatar {
+.bypostauthor .avatar {
         background-color: #41a62a;
 }
-.comment-author cite {
+.comment-author .fn {
         font-style: normal;
 }
 .comment-author .avatar {
@@ -1956 +1954 @@
         height: 22px;
         height: 2.2rem;
 }
-.comment-meta,
+.comment-metadata,
 .comment-content {
         padding-left: 36px;
         padding-left: 3.6rem;
@@ -2706 +2704 @@
         #primary span.entry-date a:before,
         #primary .byline a:before,
         #primary .comments-link a:before,
-        #primary .edit-link a:before,
+        .entry-content .edit-link a:before,
         .attachment span.entry-date:before,
         #primary .full-size-link a:before,
         #primary .parent-post-link a:before {
@@ -2769 +2767 @@
                 margin: -1px 2px 0 0;
                 margin: -0.1rem 0.2rem 0 0;
         }
-        #primary .edit-link a:before {
+        .entry-content .edit-link a:before {
                 content: '\F411';
                 margin: -1px 2px 0 0;
                 margin: -0.1rem 0.2rem 0 0;
@@ -2780 +2778 @@
         #primary .parent-post-link a:before {
                 content: '\F301';
         }
-        .page #primary .edit-link a:before {
+        .page .entry-content .edit-link a:before {
                 margin: 5px 2px 0 0;
                 margin: 0.5rem 0.2rem 0 0;
         }
@@ -2910 +2908 @@
                 padding-top: 36px;
                 padding-top: 3.6rem;
         }
-        .comment-author {
-                padding-left: 60px;
-                padding-left: 6.0rem;
-        }
-        .comment-author .comment-author-avatar,
         .comment-author .avatar {
                 width: 32px;
                 width: 3.2rem;
                 height: 32px;
                 height: 3.2rem;
         }
-        .comment-meta,
+        .comment-author,
+        .comment-metadata,
         .comment-content {
                 padding-left: 60px;
                 padding-left: 6.0rem;