Twenty Eleven: Post Format headings and CSS cleanup; See #17198 props matveb

git-svn-id: https://develop.svn.wordpress.org/trunk@17788 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ian Stewart 2011-05-02 21:11:32 +00:00
parent 9af6ba3236
commit 0d5c2bd393
7 changed files with 190 additions and 33 deletions

View File

@ -12,7 +12,10 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1> <hgroup>
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format">Aside</h2>
</hgroup>
<?php if ( 'post' == $post->post_type ) : ?> <?php if ( 'post' == $post->post_type ) : ?>
<?php endif; ?> <?php endif; ?>

View File

@ -12,7 +12,10 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1> <hgroup>
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format">Gallery</h2>
</hgroup>
<div class="entry-meta"> <div class="entry-meta">
<?php <?php

View File

@ -12,7 +12,10 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1> <hgroup>
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format">Image</h2>
</hgroup>
<?php if ( comments_open() ) : ?> <?php if ( comments_open() ) : ?>
<div class="comments-link"> <div class="comments-link">

View File

@ -12,7 +12,10 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1> <hgroup>
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format">Link</h2>
</hgroup>
<?php if ( 'post' == $post->post_type ) : ?> <?php if ( 'post' == $post->post_type ) : ?>
<?php endif; ?> <?php endif; ?>

View File

@ -0,0 +1,64 @@
<?php
/**
* The default template for displaying content
*
* @package WordPress
* @subpackage Twenty Eleven
* @since Twenty Eleven 1.0
*/
?>
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header">
<hgroup>
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format">Quote</h2>
</hgroup>
<?php if ( 'post' == $post->post_type ) : ?>
<div class="entry-meta">
<?php
printf( __( '<span class="sep">Posted on </span><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s" pubdate>%3$s</time></a> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyeleven' ),
get_permalink(),
get_the_date( 'c' ),
get_the_date(),
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyeleven' ), get_the_author() ),
get_the_author()
);
?>
</div><!-- .entry-meta -->
<?php endif; ?>
<?php if ( comments_open() ) : ?>
<div class="comments-link">
<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</div>
<?php endif; ?>
</header><!-- .entry-header -->
<?php if ( is_search() ) : // Only display Excerpts for Search ?>
<div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
</div><!-- .entry-summary -->
<?php else : ?>
<div class="entry-content">
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( '<span>Pages:</span>', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php endif; ?>
<footer class="entry-meta">
<?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
<span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyeleven' ); ?></span><?php the_category( ', ' ); ?></span>
<?php the_tags( '<span class="sep"> | </span><span class="tag-links">' . __( 'Tagged ', 'twentyeleven' ) . '</span>', ', ', '' ); ?>
<?php endif; ?>
<?php if ( comments_open() ) : ?>
<span class="sep"> | </span>
<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
<?php endif; ?>
<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- #entry-meta -->
</article><!-- #post-<?php the_ID(); ?> -->

View File

@ -0,0 +1,59 @@
<?php
/**
* The template for displaying posts in the Status Post Format on index and archive pages
*
* Learn more: http://codex.wordpress.org/Post_Formats
*
* @package WordPress
* @subpackage Twenty Eleven
*/
?>
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header">
<hgroup>
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format">Status</h2>
</hgroup>
<?php if ( 'post' == $post->post_type ) : ?>
<?php endif; ?>
<?php if ( comments_open() ) : ?>
<div class="comments-link">
<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</div>
<?php endif; ?>
</header><!-- .entry-header -->
<?php if ( is_search() ) : // Only display Excerpts for Search ?>
<div class="entry-summary">
<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
</div><!-- .entry-summary -->
<?php else : ?>
<div class="entry-content">
<div class="avatar"><?php echo get_avatar( $post->post_author, apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?></div>
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php endif; ?>
<footer class="entry-meta">
<?php
printf( __( '<span class="sep">Posted on </span><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s" pubdate>%3$s</time></a> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyeleven' ),
get_permalink(),
get_the_date( 'c' ),
get_the_date(),
get_author_posts_url( get_the_author_meta( 'ID' ) ),
sprintf( esc_attr__( 'View all posts by %s', 'twentyeleven' ), get_the_author() ),
get_the_author()
);
?>
<?php if ( comments_open() ) : ?>
<span class="sep"> | </span>
<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
<?php endif; ?>
<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- #entry-meta -->
</article><!-- #post-<?php the_ID(); ?> -->

View File

@ -42,8 +42,8 @@ ol, ul {
list-style: none; list-style: none;
} }
table {/* tables still need 'cellspacing="0"' in the markup */ table {/* tables still need 'cellspacing="0"' in the markup */
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
} }
caption, th, td { caption, th, td {
font-weight: normal; font-weight: normal;
@ -59,7 +59,8 @@ blockquote, q {
a img { a img {
border: 0; border: 0;
} }
header, hgroup, footer, section, article, nav, aside { article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block; display: block;
} }
@ -219,8 +220,8 @@ body {
.one-column section.featured-post .attachment-small-feature { .one-column section.featured-post .attachment-small-feature {
border: none; border: none;
display: block; display: block;
max-width: 60%;
height: auto; height: auto;
max-width: 60%;
position: static; position: static;
} }
.one-column article.feature-image.small { .one-column article.feature-image.small {
@ -234,8 +235,8 @@ body {
.one-column article.feature-image.small .entry-summary { .one-column article.feature-image.small .entry-summary {
height: 150px; height: 150px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;
padding: 0; padding: 0;
text-overflow: ellipsis;
} }
.one-column article.feature-image.small .entry-summary a { .one-column article.feature-image.small .entry-summary a {
left: -9%; left: -9%;
@ -293,9 +294,9 @@ body {
right: 1.625em; right: 1.625em;
} }
.one-column .commentlist .children .avatar { .one-column .commentlist .children .avatar {
position: absolute;
background: none; background: none;
padding: 0; padding: 0;
position: absolute;
top: 2.2em; top: 2.2em;
left: 2.2em; left: 2.2em;
} }
@ -445,8 +446,6 @@ a {
color: #1b8be0; color: #1b8be0;
text-decoration: none; text-decoration: none;
} }
a:visited {
}
a:focus, a:focus,
a:active, a:active,
a:hover { a:hover {
@ -576,9 +575,9 @@ a:hover {
/* Search Form */ /* Search Form */
#branding #searchform { #branding #searchform {
position: absolute; position: absolute;
text-align: right;
top: 4.3em; top: 4.3em;
right: 7.6%; right: 7.6%;
text-align: right;
} }
#branding #searchform div { #branding #searchform div {
margin: 0; margin: 0;
@ -591,13 +590,13 @@ a:hover {
font-size: 14px; font-size: 14px;
height: 22px; height: 22px;
padding: 4px 10px 4px 28px; padding: 4px 10px 4px 28px;
width: 26%;
-webkit-transition-duration: 400ms; -webkit-transition-duration: 400ms;
-webkit-transition-property: width, background; -webkit-transition-property: width, background;
-webkit-transition-timing-function: ease; -webkit-transition-timing-function: ease;
-moz-transition-duration: 400ms; -moz-transition-duration: 400ms;
-moz-transition-property: width, background; -moz-transition-property: width, background;
-moz-transition-timing-function: ease; -moz-transition-timing-function: ease;
width: 26%;
} }
#branding #s:focus { #branding #s:focus {
background-color: #f9f9f9; background-color: #f9f9f9;
@ -619,8 +618,8 @@ a:hover {
background-color: #bbb; background-color: #bbb;
} }
#branding .with-image #searchform { #branding .with-image #searchform {
bottom: -27px;
top: auto; top: auto;
bottom: -27px;
} }
@ -653,9 +652,9 @@ a:hover {
position: relative; position: relative;
} }
.blog .sticky .entry-header .entry-meta { .blog .sticky .entry-header .entry-meta {
position: absolute !important;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px); clip: rect(1px, 1px, 1px, 1px);
position: absolute !important;
} }
.entry-title, .entry-title,
.entry-header .entry-meta { .entry-header .entry-meta {
@ -668,6 +667,7 @@ a:hover {
font-weight: bold; font-weight: bold;
line-height: 1.5em; line-height: 1.5em;
padding-bottom: .3em; padding-bottom: .3em;
padding-top: 15px;
} }
.entry-title, .entry-title,
.entry-title a { .entry-title a {
@ -833,7 +833,6 @@ dl.gallery-item {
color: #777; color: #777;
font-size: 18px; font-size: 18px;
font-weight: 300; font-weight: 300;
height: 48px;
line-height: 46px; line-height: 46px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
@ -842,6 +841,7 @@ dl.gallery-item {
top: 0; top: 0;
right: 0; right: 0;
width: 48px; width: 48px;
height: 48px;
} }
.entry-header .comments-link a:hover { .entry-header .comments-link a:hover {
background: #777; background: #777;
@ -853,7 +853,31 @@ dl.gallery-item {
font-weight: bold; font-weight: bold;
text-transform: lowercase; text-transform: lowercase;
} }
/* Post Formats */
.entry-header .entry-format {
color: #666;
font-size: 10px;
font-weight: 500;
letter-spacing: 0.1em;
line-height: 2.6em;
position: absolute;
text-transform: uppercase;
top: -5px;
}
.entry-header hgroup .entry-title {
padding-top: 15px;
}
article.format-aside .entry-content,
article.format-link .entry-content,
article.format-status .entry-content {
padding: 20px 0 0;
}
.recent-posts .entry-header .entry-format {
display: none;
}
.recent-posts .entry-header hgroup .entry-title {
padding-top: 0;
}
/* Singular content styles for Posts and Pages */ /* Singular content styles for Posts and Pages */
.singular .hentry { .singular .hentry {
@ -974,7 +998,7 @@ dl.gallery-item {
-moz-box-shadow: 0 1px 2px #ccc; -moz-box-shadow: 0 1px 2px #ccc;
box-shadow: 0 1px 2px #ccc; box-shadow: 0 1px 2px #ccc;
float: left; float: left;
margin: 4px 10px 1.625em 0; margin: 4px 10px 2px 0;
padding: 0; padding: 0;
} }
@ -1007,11 +1031,11 @@ dl.gallery-item {
.format-image div.entry-meta { .format-image div.entry-meta {
display: inline-block; display: inline-block;
float: left; float: left;
width: 40%; width: 35%;
} }
.format-image div.entry-meta + div.entry-meta { .format-image div.entry-meta + div.entry-meta {
float: none; float: none;
width: 60%; width: 65%;
} }
.format-image .wp-caption { .format-image .wp-caption {
background: #111; background: #111;
@ -1033,6 +1057,7 @@ dl.gallery-item {
/* =error404 /* =error404
----------------------------------------------- */ ----------------------------------------------- */
.error404 #main #searchform { .error404 #main #searchform {
background: #f9f9f9; background: #f9f9f9;
border: 1px solid #ddd; border: 1px solid #ddd;
@ -1093,16 +1118,16 @@ article.intro .entry-content {
padding: 1.625em 0px 0.625em; padding: 1.625em 0px 0.625em;
} }
article.intro .edit-link a { article.intro .edit-link a {
position: absolute;
background: #aaa; background: #aaa;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
padding: 0px 8px;
font-size: 12px; font-size: 12px;
padding: 0px 8px;
position: absolute;
top: 30px;
right: 20px; right: 20px;
text-decoration: none; text-decoration: none;
top: 30px;
} }
article.intro .edit-link a:hover { article.intro .edit-link a:hover {
background: #777; background: #777;
@ -1122,9 +1147,9 @@ section.featured-post .hentry {
margin: 0; margin: 0;
} }
section.featured-post .entry-meta { section.featured-post .entry-meta {
position: absolute !important;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px); clip: rect(1px, 1px, 1px, 1px);
position: absolute !important;
} }
/* Small featured post */ /* Small featured post */
@ -1156,8 +1181,8 @@ article.feature-image.small .entry-summary p a {
left: -23.8%; left: -23.8%;
padding: 4px 26px 4px 85px; padding: 4px 26px 4px 85px;
position: relative; position: relative;
text-decoration: none;
top: 20px; top: 20px;
text-decoration: none;
width: 180px; width: 180px;
} }
article.feature-image.small .entry-summary p a:hover { article.feature-image.small .entry-summary p a:hover {
@ -1271,8 +1296,8 @@ section.feature-image.large img {
-moz-box-shadow: inset 1px 1px 5px rgba(0,0,0,0.5), inset 0 0 2px rgba(255,255,255,0.5); -moz-box-shadow: inset 1px 1px 5px rgba(0,0,0,0.5), inset 0 0 2px rgba(255,255,255,0.5);
box-shadow: inset 1px 1px 5px rgba(0,0,0,0.5), inset 0 0 2px rgba(255,255,255,0.5); box-shadow: inset 1px 1px 5px rgba(0,0,0,0.5), inset 0 0 2px rgba(255,255,255,0.5);
display: block; display: block;
height: 14px;
width: 14px; width: 14px;
height: 14px;
} }
.feature-slider a.active { .feature-slider a.active {
background: #fff; background: #fff;
@ -1362,7 +1387,9 @@ section.recent-posts .other-recent-posts li:after {
} }
.image-attachment div.attachment img { .image-attachment div.attachment img {
display: block; display: block;
height: auto;
margin: 0 auto 1.625em; margin: 0 auto 1.625em;
width: 100%;
} }
.image-attachment .entry-caption p { .image-attachment .entry-caption p {
font-size: 10px; font-size: 10px;
@ -1545,10 +1572,6 @@ section.ephemera ol,
font-weight: bold; font-weight: bold;
padding: 0; padding: 0;
} }
.widget_twentyeleven_ephemera .entry-title a {
}
.widget_twentyeleven_ephemera .entry-title a:hover {
}
.widget_twentyeleven_ephemera .comments-link a { .widget_twentyeleven_ephemera .comments-link a {
color: #666; color: #666;
display: block; display: block;
@ -2238,6 +2261,7 @@ p.comment-form-comment {
} }
} }
/* =IE7 /* =IE7
----------------------------------------------- */ ----------------------------------------------- */
@ -2255,6 +2279,4 @@ p.comment-form-comment {
} }
#ie7 section.recent-posts { #ie7 section.recent-posts {
margin-right: 7.6%; margin-right: 7.6%;
}
#ie7 .page-template-showcase-php {
} }