Ticket #24166: 24166.diff

wp-content/themes/twentythirteen/content-aside.php

@@ -14 +14 @@
                 <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
         </div><!-- .entry-content -->
 
-        <?php if ( is_single() ) : ?>
+
         <footer class="entry-meta">
-                <?php twentythirteen_entry_meta(); ?>
-                <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+                <?php if ( is_single() ) : ?>
+                        <?php twentythirteen_entry_meta(); ?>
+                        <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
 
-                <?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
-                        <?php get_template_part( 'author-bio' ); ?>
-                <?php endif; ?>
-        </footer><!-- .entry-meta -->
+                        <?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
+                                <?php get_template_part( 'author-bio' ); ?>
+                        <?php endif; ?>
 
-        <?php else : ?>
-                <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer><!-- .entry-meta -->' ); ?>
-        <?php endif; // is_single() ?>
+                <?php else : ?>
+                        <?php twentythirteen_entry_date(); ?>
+                        <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+                <?php endif; // is_single() ?>
+        </footer><!-- .entry-meta -->
 </article><!-- #post -->

wp-content/themes/twentythirteen/rtl.css

@@ -323 +323 @@
  * ----------------------------------------------------------------------------
  */
 
-.format-aside .entry-content .date {
-        margin-left: auto;
-        margin-right: 20px;
-}
-
-.format-aside .entry-content .date a:before {
-        content: normal;
-}
-
-.format-aside .entry-content .date a:after {
-        content: "\f303";
-}
-
 .format-aside cite:before {
         content: normal;
         margin-right: auto;

wp-content/themes/twentythirteen/style.css

@@ -1437 +1437 @@
         box-shadow: inset 0 2px 2px rgba(173, 165, 105, 0.2);
 }
 
-.format-aside .entry-content .date {
-        color: #ca3c08;
-        font-size: 14px;
-        margin-left: 20px;
-}
-
-.format-aside .entry-content .date a:hover {
-        color: #ea9629;
-}
-
-.format-aside .entry-content .date a:before {
-        content: "\f303";
-}
-
-.format-aside footer.entry-meta {
+.format-aside .entry-meta {
         margin-top: 0;
 }
 
@@ -1470 +1456 @@
         margin-right: 5px;
 }
 
-.blog .format-aside .entry-content p:last-child {
-        margin-bottom: 0;
-}
-
 /* Audio */
 .format-audio {
         background-color: #db572f;

wp-content/themes/twentythirteen/functions.php

@@ -375 +375 @@
         if ( is_sticky() && is_home() && ! is_paged() )
                 echo '<span class="featured-post">' . __( 'Sticky', 'twentythirteen' ) . '</span>';
 
-        if ( ! has_post_format( 'aside' ) && ! has_post_format( 'link' ) && 'post' == get_post_type() )
+        if ( ! has_post_format( 'link' ) && 'post' == get_post_type() )
                 twentythirteen_entry_date();
 
         // Translators: used between list items, there is a space after the comma.
@@ -529 +529 @@
 add_action( 'shortcode_atts_video', 'twentythirteen_video_width' );
 
 /**
- * Adds entry date to aside posts after the content.
- *
- *
- * @since Twenty Thirteen 1.0
- *
- * @param string $content Post content.
- * @return string Post content.
- */
-function twentythirteen_aside_date( $content ) {
-        if ( ! is_feed() && has_post_format( 'aside' ) ) {
-                $content .= twentythirteen_entry_date( false );
-        }
-        return $content;
-}
-add_filter( 'the_content', 'twentythirteen_aside_date', 8 ); // After embeds, before everything else.
-
-/**
  * Switches default core markup for search form to output valid HTML5.
  *
  * @param string $format Expected markup format, default is `xhtml`