Changeset 29951

Timestamp:

10/17/2014 09:35:01 PM (10 years ago)

Author:

iandstewart

Message:

Twenty Fifteen: Swap order of description and caption so the caption is underneath an image on image attachment pages.

Props iamtakashi, fixes #30020.

Location:

trunk/src/wp-content/themes/twentyfifteen

Files:

• image.php (modified) (1 diff)
• style.css (modified) (7 diffs)

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

@@ -27 +27 @@
 
                     <div class="entry-content">
-                        <?php
-                            /**
-                             * Filter the default Twenty Fifteen image attachment size.
-                             *
-                             * @since Twenty Fifteen 1.0
-                             *
-                             * @param string $image_size Image size. Default 'large'.
-                             */
-                            $image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
-                            echo wp_get_attachment_image( get_the_ID(), $image_size );
+                        <div class="entry-attachment">
+                            <?php
+                                /**
+                                 * Filter the default Twenty Fifteen image attachment size.
+                                 *
+                                 * @since Twenty Fifteen 1.0
+                                 *
+                                 * @param string $image_size Image size. Default 'large'.
+                                 */
+                                $image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
+                                echo wp_get_attachment_image( get_the_ID(), $image_size );
+                            ?>
 
-                            the_content();
-                        ?>
-
-                        <?php if ( has_excerpt() ) : ?>
-                            <div class="entry-caption">
-                                <?php the_excerpt(); ?>
-                            </div><!-- .entry-caption -->
-                        <?php endif; ?>
+                            <?php if ( has_excerpt() ) : ?>
+                                <div class="entry-caption">
+                                    <?php the_excerpt(); ?>
+                                </div><!-- .entry-caption -->
+                            <?php endif; ?>
+                        </div><!-- .entry-attachment -->
 
                         <?php
+                            the_content();
                             wp_link_pages( array(
                                 'before'      => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',

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

@@ -2000 +2000 @@
 }
 
-.type-attachment .entry-header {
-    clear: right;
+.entry-attachment {
+    margin-bottom: 1.6em;
 }
 
@@ -2023 +2023 @@
     hyphens: auto;
     line-height: 1.5;
+    padding-top: 0.5em;
     word-wrap: break-word;
 }
@@ -3162 +3163 @@
     }
 
+    .entry-attachment {
+        margin-bottom: 1.6471em;
+    }
+
     .format-aside .entry-title,
     .format-image .entry-title,
@@ -3694 +3699 @@
     }
 
+    .entry-attachment {
+        margin-bottom: 1.6842em
+    }
+
     .format-aside .entry-title,
     .format-image .entry-title,
@@ -4349 +4358 @@
     }
 
+    .entry-attachment {
+        margin-bottom: 1.6em;
+    }
+
     .format-aside .entry-title,
     .format-image .entry-title,
@@ -4867 +4880 @@
     }
 
+    .entry-attachment {
+        margin-bottom: 1.6471em;
+    }
+
     .format-aside .entry-title,
     .format-image .entry-title,
@@ -5379 +5396 @@
     .page-links {
         margin-bottom: 1.5789em;
+    }
+
+    .entry-attachment {
+        margin-bottom: 1.6842em;
     }