Changeset 24071

Timestamp:

04/23/2013 04:57:32 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: avoid orphans in Aside date post meta. Props obenland, fixes #24166.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• content-aside.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• rtl.css (modified) (1 diff)
• style.css (modified) (2 diffs)

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

@@ -15 +15 @@
     </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; ?>
+            <?php if ( get_the_author_meta( 'description' ) && is_multi_author() ) : ?>
+                <?php get_template_part( 'author-bio' ); ?>
+            <?php endif; ?>
+
+        <?php else : ?>
+            <?php twentythirteen_entry_date(); ?>
+            <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
+        <?php endif; // is_single() ?>
     </footer><!-- .entry-meta -->
-
-    <?php else : ?>
-        <?php edit_post_link( __( 'Edit', 'twentythirteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer><!-- .entry-meta -->' ); ?>
-    <?php endif; // is_single() ?>
 </article><!-- #post -->

trunk/wp-content/themes/twentythirteen/functions.php

@@ -376 +376 @@
         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();
 
@@ -530 +530 @@
 
 /**
- * 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.
  *

trunk/wp-content/themes/twentythirteen/rtl.css

@@ -324 +324 @@
  */
 
-.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;

trunk/wp-content/themes/twentythirteen/style.css

@@ -1438 +1438 @@
 }
 
-.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;
 }
@@ -1469 +1455 @@
     content: "\2014";
     margin-right: 5px;
-}
-
-.blog .format-aside .entry-content p:last-child {
-    margin-bottom: 0;
 }