Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 13:24:57 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Props iamtakashi, fixes #30020.


Built from https://develop.svn.wordpress.org/trunk@29951


git-svn-id: http://core.svn.wordpress.org/trunk@29700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ian Stewart 2014-10-17 21:36:18 +00:00
parent 67c8d7f847
commit 1804918131
2 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
wp-content/themes/twentyfifteen/image.php
View File

@ -26,27 +26,28 @@ get_header(); ?>
</header><!-- .entry-header -->
<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 );
?>
<?php if ( has_excerpt() ) : ?>
<div class="entry-caption">
<?php the_excerpt(); ?>
</div><!-- .entry-caption -->
<?php endif; ?>
</div><!-- .entry-attachment -->
<?php
the_content();
?>
<?php if ( has_excerpt() ) : ?>
<div class="entry-caption">
<?php the_excerpt(); ?>
</div><!-- .entry-caption -->
<?php endif; ?>
<?php
wp_link_pages( array(
'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
'after' => '</div>',

25
wp-content/themes/twentyfifteen/style.css
View File

@ -1999,8 +1999,8 @@ a.post-thumbnail:focus {
width: auto;
}
.type-attachment .entry-header {
clear: right;
.entry-attachment {
margin-bottom: 1.6em;
}
.type-attachment .entry-title {
@ -2022,6 +2022,7 @@ a.post-thumbnail:focus {
-ms-hyphens: auto;
hyphens: auto;
line-height: 1.5;
padding-top: 0.5em;
word-wrap: break-word;
}
@ -3161,6 +3162,10 @@ span > video {
margin-bottom: 1.5294em;
}
.entry-attachment {
margin-bottom: 1.6471em;
}
.format-aside .entry-title,
.format-image .entry-title,
.format-video .entry-title,
@ -3693,6 +3698,10 @@ span > video {
margin-bottom: 1.5789em;
}
.entry-attachment {
margin-bottom: 1.6842em
}
.format-aside .entry-title,
.format-image .entry-title,
.format-video .entry-title,
@ -4348,6 +4357,10 @@ span > video {
margin-bottom: 1.4667em;
}
.entry-attachment {
margin-bottom: 1.6em;
}
.format-aside .entry-title,
.format-image .entry-title,
.format-video .entry-title,
@ -4866,6 +4879,10 @@ span > video {
margin-bottom: 1.5294em;
}
.entry-attachment {
margin-bottom: 1.6471em;
}
.format-aside .entry-title,
.format-image .entry-title,
.format-video .entry-title,
@ -5380,6 +5397,10 @@ span > video {
margin-bottom: 1.5789em;
}
.entry-attachment {
margin-bottom: 1.6842em;
}
.format-aside .entry-title,
.format-image .entry-title,
.format-video .entry-title,