<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16628] branches/3.0/wp-content/themes/twentyten: Merge Twenty Ten 1.
1 to the 3.0 branch.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16628">16628</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-30 20:29:25 +0000 (Tue, 30 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge Twenty Ten 1.1 to the 3.0 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenattachmentphp">branches/3.0/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentyteneditorstylecss">branches/3.0/wp-content/themes/twentyten/editor-style.css</a></li>
<li><a href="#branches30wpcontentthemestwentytenheaderphp">branches/3.0/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenonecolumnpagephp">branches/3.0/wp-content/themes/twentyten/onecolumn-page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenpagephp">branches/3.0/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenrtlcss">branches/3.0/wp-content/themes/twentyten/rtl.css</a></li>
<li><a href="#branches30wpcontentthemestwentytensinglephp">branches/3.0/wp-content/themes/twentyten/single.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenstylecss">branches/3.0/wp-content/themes/twentyten/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/attachment.php (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/attachment.php 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/attachment.php 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -12,14 +12,106 @@
</span><span class="cx"> <div id="container" class="single-attachment">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php
- /* Run the loop to output the attachment.
- * If you want to overload this in a child theme then include a file
- * called loop-attachment.php and that will be used instead.
- */
- get_template_part( 'loop', 'attachment' );
- ?>
</del><ins>+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><ins>+ <?php if ( ! empty( $post->post_parent ) ) : ?>
+ <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
+ /* translators: %s - title of parent post */
+ printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
+ ?></a></p>
+ <?php endif; ?>
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h2 class="entry-title"><?php the_title(); ?></h2>
+
+ <div class="entry-meta">
+ <?php
+ printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
+ 'meta-prep meta-prep-author',
+ sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ )
+ );
+ ?>
+ <span class="meta-sep">|</span>
+ <?php
+ printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
+ 'meta-prep meta-prep-entry-date',
+ sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
+ esc_attr( get_the_time() ),
+ get_the_date()
+ )
+ );
+ if ( wp_attachment_is_image() ) {
+ echo ' <span class="meta-sep">|</span> ';
+ $metadata = wp_get_attachment_metadata();
+ printf( __( 'Full size is %s pixels', 'twentyten'),
+ sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+ wp_get_attachment_url(),
+ esc_attr( __('Link to full-size image', 'twentyten') ),
+ $metadata['width'],
+ $metadata['height']
+ )
+ );
+ }
+ ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-meta -->
+
+ <div class="entry-content">
+ <div class="entry-attachment">
+<?php if ( wp_attachment_is_image() ) :
+ $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID )
+ break;
+ }
+ $k++;
+ // If there is more than 1 image attachment in a gallery
+ if ( count( $attachments ) > 1 ) {
+ if ( isset( $attachments[ $k ] ) )
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ else
+ // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+ } else {
+ // or, if there's only 1 image attachment, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
+ }
+?>
+ <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+ $attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
+ echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
+ ?></a></p>
+
+ <div id="nav-below" class="navigation">
+ <div class="nav-previous"><?php previous_image_link( false ); ?></div>
+ <div class="nav-next"><?php next_image_link( false ); ?></div>
+ </div><!-- #nav-below -->
+<?php else : ?>
+ <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
+<?php endif; ?>
+ </div><!-- .entry-attachment -->
+ <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+
+ </div><!-- .entry-content -->
+
+ <div class="entry-utility">
+ <?php twentyten_posted_in(); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
+
+<?php comments_template(); ?>
+
+<?php endwhile; ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpcontentthemestwentyteneditorstylecss"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/editor-style.css (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/editor-style.css 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/editor-style.css 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -1,13 +1,15 @@
</span><span class="cx"> /*
</span><span class="cx"> Theme Name: Twenty Ten
</span><del>-Description: Used to style the TinyMCE editor.
</del><span class="cx"> */
</span><ins>+/*
+Used to style the TinyMCE editor.
+*/
</ins><span class="cx"> html .mceContentBody {
</span><del>- max-width: 640px;
</del><ins>+ max-width:640px;
</ins><span class="cx"> }
</span><span class="cx"> * {
</span><del>- color: #444;
</del><span class="cx"> font-family: Georgia, "Bitstream Charter", serif;
</span><ins>+ color: #444;
</ins><span class="cx"> line-height: 1.5;
</span><span class="cx"> }
</span><span class="cx"> p,
</span><span class="lines">@@ -38,10 +40,10 @@
</span><span class="cx"> }
</span><span class="cx"> hr {
</span><span class="cx"> background-color: #e7e7e7;
</span><del>- border: 0;
- clear: both;
</del><ins>+ border:0;
</ins><span class="cx"> height: 1px;
</span><span class="cx"> margin-bottom: 18px;
</span><ins>+ clear:both;
</ins><span class="cx"> }
</span><span class="cx"> /* Text elements */
</span><span class="cx"> p {
</span><span class="lines">@@ -56,22 +58,22 @@
</span><span class="cx"> margin: 0 0 18px 1.5em;
</span><span class="cx"> }
</span><span class="cx"> ol ol {
</span><del>- list-style: upper-alpha;
</del><ins>+ list-style:upper-alpha;
</ins><span class="cx"> }
</span><span class="cx"> ol ol ol {
</span><del>- list-style: lower-roman;
</del><ins>+ list-style:lower-roman;
</ins><span class="cx"> }
</span><span class="cx"> ol ol ol ol {
</span><del>- list-style: lower-alpha;
</del><ins>+ list-style:lower-alpha;
</ins><span class="cx"> }
</span><span class="cx"> ul ul,
</span><span class="cx"> ol ol,
</span><span class="cx"> ul ol,
</span><span class="cx"> ol ul {
</span><del>- margin-bottom: 0;
</del><ins>+ margin-bottom:0;
</ins><span class="cx"> }
</span><span class="cx"> dl {
</span><del>- margin: 0 0 24px 0;
</del><ins>+ margin:0 0 24px 0;
</ins><span class="cx"> }
</span><span class="cx"> dt {
</span><span class="cx"> font-weight: bold;
</span><span class="lines">@@ -80,20 +82,20 @@
</span><span class="cx"> margin-bottom: 18px;
</span><span class="cx"> }
</span><span class="cx"> strong {
</span><del>- color: #000;
</del><span class="cx"> font-weight: bold;
</span><ins>+ color: #000;
</ins><span class="cx"> }
</span><span class="cx"> cite,
</span><span class="cx"> em,
</span><span class="cx"> i {
</span><del>- border: none;
</del><span class="cx"> font-style: italic;
</span><ins>+ border: none;
</ins><span class="cx"> }
</span><span class="cx"> big {
</span><span class="cx"> font-size: 131.25%;
</span><span class="cx"> }
</span><span class="cx"> ins {
</span><del>- background: #ffc;
</del><ins>+ background: #ffffcc;
</ins><span class="cx"> border: none;
</span><span class="cx"> color: #333;
</span><span class="cx"> }
</span><span class="lines">@@ -127,11 +129,11 @@
</span><span class="cx"> }
</span><span class="cx"> sup,
</span><span class="cx"> sub {
</span><del>- font-size: 10px;
</del><span class="cx"> height: 0;
</span><span class="cx"> line-height: 1;
</span><del>- position: relative;
</del><span class="cx"> vertical-align: baseline;
</span><ins>+ position: relative;
+ font-size: 10px;
</ins><span class="cx"> }
</span><span class="cx"> sup {
</span><span class="cx"> bottom: 1ex;
</span><span class="lines">@@ -140,10 +142,10 @@
</span><span class="cx"> top: .5ex;
</span><span class="cx"> }
</span><span class="cx"> a:link {
</span><del>- color: #06c;
</del><ins>+ color:#0066cc;
</ins><span class="cx"> }
</span><span class="cx"> a:visited {
</span><del>- color: #743399;
</del><ins>+ color:#743399;
</ins><span class="cx"> }
</span><span class="cx"> a:active,
</span><span class="cx"> a:hover {
</span><span class="lines">@@ -155,13 +157,13 @@
</span><span class="cx"> dd,
</span><span class="cx"> pre,
</span><span class="cx"> hr {
</span><del>- margin-bottom: 24px;
</del><ins>+ margin-bottom:24px;
</ins><span class="cx"> }
</span><span class="cx"> ul ul,
</span><span class="cx"> ol ol,
</span><span class="cx"> ul ol,
</span><span class="cx"> ol ul {
</span><del>- margin-bottom: 0;
</del><ins>+ margin-bottom:0;
</ins><span class="cx"> }
</span><span class="cx"> pre,
</span><span class="cx"> kbd,
</span><span class="lines">@@ -186,9 +188,9 @@
</span><span class="cx"> h5,
</span><span class="cx"> h6 {
</span><span class="cx"> color: #000;
</span><del>- font-weight: normal;
- line-height: 1.5em;
</del><span class="cx"> margin: 0 0 20px 0;
</span><ins>+ line-height: 1.5em;
+ font-weight: normal;
</ins><span class="cx"> }
</span><span class="cx"> h1 {
</span><span class="cx"> font-size: 2.4em;
</span><span class="lines">@@ -210,11 +212,11 @@
</span><span class="cx"> }
</span><span class="cx"> table {
</span><span class="cx"> border: 1px solid #e7e7e7 !important;
</span><del>- border-collapse: collapse;
- border-spacing: 0;
- margin: 0 -1px 24px 0;
</del><span class="cx"> text-align: left;
</span><ins>+ margin: 0 -1px 24px 0;
</ins><span class="cx"> width: 100%;
</span><ins>+ border-collapse: collapse;
+ border-spacing: 0;
</ins><span class="cx"> }
</span><span class="cx"> tr th,
</span><span class="cx"> thead th {
</span><span class="lines">@@ -230,16 +232,12 @@
</span><span class="cx"> border-top: 1px solid #e7e7e7 !important;
</span><span class="cx"> padding: 6px 24px;
</span><span class="cx"> }
</span><ins>+
+
</ins><span class="cx"> img {
</span><span class="cx"> margin: 0;
</span><ins>+ max-width: 640px;
</ins><span class="cx"> }
</span><del>-img.size-auto,
-img.size-large,
-img.size-full,
-img.size-medium {
- max-width: 100%;
- height: auto;
-}
</del><span class="cx"> .alignleft,
</span><span class="cx"> img.alignleft {
</span><span class="cx"> display: inline;
</span><span class="lines">@@ -267,19 +265,18 @@
</span><span class="cx"> margin-bottom: 12px;
</span><span class="cx"> }
</span><span class="cx"> .wp-caption {
</span><del>- background: #f1f1f1;
</del><span class="cx"> border: none;
</span><del>- -khtml-border-radius: 0;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-radius: 0;
</del><ins>+ background: #f1f1f1;
</ins><span class="cx"> color: #888;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> line-height: 18px;
</span><ins>+ text-align: center;
</ins><span class="cx"> margin-bottom: 20px;
</span><del>- max-width: 632px !important; /* prevent too-wide images from breaking layout */
</del><span class="cx"> padding: 4px;
</span><del>- text-align: center;
</del><ins>+ -moz-border-radius: 0;
+ -khtml-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
</ins><span class="cx"> }
</span><span class="cx"> .wp-caption img {
</span><span class="cx"> margin: 5px;
</span><span class="lines">@@ -288,5 +285,5 @@
</span><span class="cx"> margin: 0 0 4px;
</span><span class="cx"> }
</span><span class="cx"> .wp-smiley {
</span><del>- margin: 0;
</del><ins>+ margin:0;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/header.php (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/header.php 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/header.php 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> $image[1] >= HEADER_IMAGE_WIDTH ) :
</span><span class="cx"> // Houston, we have a new header image!
</span><span class="cx"> echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
</span><del>- elseif ( get_header_image() ) : ?>
</del><ins>+ else : ?>
</ins><span class="cx"> <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- #branding -->
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenonecolumnpagephp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/onecolumn-page.php (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/onecolumn-page.php 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/onecolumn-page.php 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -17,14 +17,21 @@
</span><span class="cx"> <div id="container" class="one-column">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php
- /* Run the loop to output the page.
- * If you want to overload this in a child theme then include a file
- * called loop-page.php and that will be used instead.
- */
- get_template_part( 'loop', 'page' );
- ?>
</del><ins>+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><ins>+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-content -->
+ </div><!-- #post-## -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenpagephp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/page.php (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/page.php 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/page.php 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -17,14 +17,26 @@
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php
- /* Run the loop to output the page.
- * If you want to overload this in a child theme then include a file
- * called loop-page.php and that will be used instead.
- */
- get_template_part( 'loop', 'page' );
- ?>
</del><ins>+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><ins>+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <?php if ( is_front_page() ) { ?>
+ <h2 class="entry-title"><?php the_title(); ?></h2>
+ <?php } else { ?>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+ <?php } ?>
+
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-content -->
+ </div><!-- #post-## -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenrtlcss"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/rtl.css (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/rtl.css 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/rtl.css 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -120,9 +120,6 @@
</span><span class="cx"> float: left;
</span><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><del>-#branding img {
- float: right;
-}
</del><span class="cx">
</span><span class="cx"> /* =Menu
</span><span class="cx"> -------------------------------------------------------------- */
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/single.php (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/single.php 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/single.php 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -12,14 +12,57 @@
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <?php
- /* Run the loop to output the post.
- * If you want to overload this in a child theme then include a file
- * called loop-single.php and that will be used instead.
- */
- get_template_part( 'loop', 'single' );
- ?>
</del><ins>+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><ins>+ <div id="nav-above" class="navigation">
+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
+ </div><!-- #nav-above -->
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+
+ <div class="entry-meta">
+ <?php twentyten_posted_on(); ?>
+ </div><!-- .entry-meta -->
+
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
+
+<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
+ <div id="entry-author-info">
+ <div id="author-avatar">
+ <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
+ </div><!-- #author-avatar -->
+ <div id="author-description">
+ <h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
+ <?php the_author_meta( 'description' ); ?>
+ <div id="author-link">
+ <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
+ <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyten' ), get_the_author() ); ?>
+ </a>
+ </div><!-- #author-link -->
+ </div><!-- #author-description -->
+ </div><!-- #entry-author-info -->
+<?php endif; ?>
+
+ <div class="entry-utility">
+ <?php twentyten_posted_in(); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
+
+ <div id="nav-below" class="navigation">
+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
+ </div><!-- #nav-below -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; // end of the loop. ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/style.css (16627 => 16628)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/style.css 2010-11-30 20:29:02 UTC (rev 16627)
+++ branches/3.0/wp-content/themes/twentyten/style.css 2010-11-30 20:29:25 UTC (rev 16628)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> Theme URI: http://wordpress.org/
</span><span class="cx"> Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.
</span><span class="cx"> Author: the WordPress team
</span><del>-Version: 1.2-RC1
-Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu
</del><ins>+Version: 1.1
+Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -139,9 +139,7 @@
</span><span class="cx"> .pingback p,
</span><span class="cx"> .reply,
</span><span class="cx"> .widget-title,
</span><del>-.wp-caption-text {
- font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
-}
</del><ins>+.wp-caption-text,
</ins><span class="cx"> input[type=submit] {
</span><span class="cx"> font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
</span><span class="cx"> }
</span><span class="lines">@@ -352,7 +350,7 @@
</span><span class="cx"> clear: right;
</span><span class="cx"> float: right;
</span><span class="cx"> font-style: italic;
</span><del>- margin: 15px 0 18px 0;
</del><ins>+ margin: 14px 0 18px 0;
</ins><span class="cx"> width: 220px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -360,8 +358,8 @@
</span><span class="cx"> #branding img {
</span><span class="cx"> border-top: 4px solid #000;
</span><span class="cx"> border-bottom: 1px solid #000;
</span><ins>+ clear: both;
</ins><span class="cx"> display: block;
</span><del>- float: left;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -761,91 +759,86 @@
</span><span class="cx"> /* =Images
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-/*
-Resize images to fit the main content area.
-- Applies only to images uploaded via WordPress by targeting size-* classes.
-- Other images will be left alone. Use "size-auto" class to apply to other images.
-*/
-img.size-auto,
-img.size-full,
-img.size-large,
-img.size-medium,
-.attachment img {
- max-width: 100%; /* When images are too wide for containing element, force them to fit. */
- height: auto; /* Override height to match resized width for correct aspect ratio. */
</del><ins>+#content img {
+ margin: 0;
+ height: auto;
+ max-width: 640px;
+ width: auto;
</ins><span class="cx"> }
</span><del>-.alignleft,
-img.alignleft {
</del><ins>+#content .attachment img {
+ max-width: 900px;
+}
+#content .alignleft,
+#content img.alignleft {
</ins><span class="cx"> display: inline;
</span><span class="cx"> float: left;
</span><span class="cx"> margin-right: 24px;
</span><span class="cx"> margin-top: 4px;
</span><span class="cx"> }
</span><del>-.alignright,
-img.alignright {
</del><ins>+#content .alignright,
+#content img.alignright {
</ins><span class="cx"> display: inline;
</span><span class="cx"> float: right;
</span><span class="cx"> margin-left: 24px;
</span><span class="cx"> margin-top: 4px;
</span><span class="cx"> }
</span><del>-.aligncenter,
-img.aligncenter {
</del><ins>+#content .aligncenter,
+#content img.aligncenter {
</ins><span class="cx"> clear: both;
</span><span class="cx"> display: block;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: auto;
</span><span class="cx"> }
</span><del>-img.alignleft,
-img.alignright,
-img.aligncenter {
</del><ins>+#content img.alignleft,
+#content img.alignright,
+#content img.aligncenter {
</ins><span class="cx"> margin-bottom: 12px;
</span><span class="cx"> }
</span><del>-.wp-caption {
</del><ins>+#content .wp-caption {
</ins><span class="cx"> background: #f1f1f1;
</span><span class="cx"> line-height: 18px;
</span><span class="cx"> margin-bottom: 20px;
</span><del>- max-width: 632px !important; /* prevent too-wide images from breaking layout */
</del><span class="cx"> padding: 4px;
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><del>-.wp-caption img {
</del><ins>+#content .wp-caption img {
</ins><span class="cx"> margin: 5px 5px 0;
</span><span class="cx"> }
</span><del>-.wp-caption p.wp-caption-text {
</del><ins>+#content .wp-caption p.wp-caption-text {
</ins><span class="cx"> color: #888;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> margin: 5px;
</span><span class="cx"> }
</span><del>-.wp-smiley {
</del><ins>+#content .wp-smiley {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><del>-.gallery {
</del><ins>+#content .gallery {
</ins><span class="cx"> margin: 0 auto 18px;
</span><span class="cx"> }
</span><del>-.gallery .gallery-item {
</del><ins>+#content .gallery .gallery-item {
</ins><span class="cx"> float: left;
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> text-align: center;
</span><span class="cx"> width: 33%;
</span><span class="cx"> }
</span><del>-.gallery img {
</del><ins>+#content .gallery img {
</ins><span class="cx"> border: 2px solid #cfcfcf;
</span><span class="cx"> }
</span><del>-.gallery .gallery-caption {
</del><ins>+#content .gallery .gallery-caption {
</ins><span class="cx"> color: #888;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> margin: 0 0 12px;
</span><span class="cx"> }
</span><del>-.gallery dl {
</del><ins>+#content .gallery dl {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><del>-.gallery img {
</del><ins>+#content .gallery img {
</ins><span class="cx"> border: 10px solid #f1f1f1;
</span><span class="cx"> }
</span><del>-.gallery br+br {
</del><ins>+#content .gallery br+br {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-#content .attachment img {/* single attachment images should be centered */
</del><ins>+#content .attachment img { /* single attachment images should be centered */
</ins><span class="cx"> display: block;
</span><span class="cx"> margin: 0 auto;
</span><span class="cx"> }
</span><span class="lines">@@ -1094,9 +1087,6 @@
</span><span class="cx"> list-style: square;
</span><span class="cx"> margin-left: 1.3em;
</span><span class="cx"> }
</span><del>-.widget-area select {
- max-width: 100%;
-}
</del><span class="cx"> .widget_search #s {/* This keeps the search inputs in line */
</span><span class="cx"> width: 60%;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>