Permalink
Browse files

twentyeleven code tidy up. Props dd32, lancewillett. fixes #17748

git-svn-id: http://svn.automattic.com/wordpress/trunk@18385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent bd2e887 commit fdc7409251f7fc8cc4a0f304344c57886737bec6 ryan committed Jun 30, 2011
@@ -322,7 +322,7 @@ section.feature-image.large img {
/* Featured Slider */
.featured-posts {
- border-color: #222;
+ border-color: #222;
}
.featured-posts section.featured-post {
background: #000;
@@ -594,7 +594,7 @@ li.bypostauthor a.comment-reply-link:active {
/* Comments */
.commentlist > li.comment {
}
-
+
/* Post author highlighting */
.commentlist > li.bypostauthor {
color: #333;
@@ -16,6 +16,8 @@
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-content -->
+ <footer class="entry-meta">
+ <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+ </footer><!-- .entry-meta -->
</article><!-- #post-<?php the_ID(); ?> -->
@@ -26,17 +26,22 @@
<footer class="entry-meta">
<?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
/* translators: used between list items, there is a space after the comma */
$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
if ( '' != $tag_list ) {
$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
- } else {
+ } elseif ( '' != $categories_list ) {
$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+ } else {
+ $utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
}
+
printf(
$utility_text,
- /* translators: used between list items, there is a space after the comma */
- get_the_category_list( __( ', ', 'twentyeleven' ) ),
+ $categories_list,
$tag_list,
esc_url( get_permalink() ),
the_title_attribute( 'echo=0' ),
@@ -4,10 +4,10 @@ Theme Name: Twenty Eleven
/*
Used to style the TinyMCE editor.
*/
-html .mceContentBody{
- direction:rtl;
- unicode-bidi:embed;
- float:right;
+html .mceContentBody {
+ direction: rtl;
+ unicode-bidi: embed;
+ float: right;
max-width: 584px;
}
* {
@@ -500,7 +500,7 @@ function twentyeleven_comment( $comment, $args, $depth ) {
case 'trackback' :
?>
<li class="post pingback">
- <p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyeleven' ), ' ' ); ?></p>
+ <p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
<?php
break;
default :
@@ -528,7 +528,7 @@ function twentyeleven_comment( $comment, $args, $depth ) {
);
?>
- <?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
+ <?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .comment-author .vcard -->
<?php if ( $comment->comment_approved == '0' ) : ?>
@@ -165,7 +165,7 @@ function twentyeleven_get_default_theme_options() {
'theme_layout' => 'content-sidebar',
);
- if ( is_rtl() )
+ if ( is_rtl() )
$default_theme_options['theme_layout'] = 'sidebar-content';
return apply_filters( 'twentyeleven_default_theme_options', $default_theme_options );
@@ -85,7 +85,7 @@ ul, ol {
margin: 0 2.5em 1.625em 0;
}
.ltr ul, ol {
- margin: 0 0 1.625em 2.5em;
+ margin: 0 0 1.625em 2.5em;
}
blockquote {
font-family: Arial, sans-serif;
Oops, something went wrong.

0 comments on commit fdc7409

Please sign in to comment.