<!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" />
<title>[17776] trunk/wp-content/themes/twentyeleven: Twenty Eleven: introduce image post format and miscellaneous style fixes, props matveb and iandstewart - see #17198</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17776">17776</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2011-04-29 22:33:04 +0000 (Fri, 29 Apr 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Eleven: introduce image post format and miscellaneous style fixes, props matveb and iandstewart - see <a href="http://trac.wordpress.org/ticket/17198">#17198</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenstylecss">trunk/wp-content/themes/twentyeleven/style.css</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevencontentimagephp">trunk/wp-content/themes/twentyeleven/content-image.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevencontentimagephp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentyeleven/content-image.php (0 => 17776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-image.php                                (rev 0)
+++ trunk/wp-content/themes/twentyeleven/content-image.php        2011-04-29 22:33:04 UTC (rev 17776)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+&lt;?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+?&gt;
+
+        &lt;article id=&quot;post-&lt;?php the_ID(); ?&gt;&quot; &lt;?php post_class(); ?&gt;&gt;
+                &lt;header class=&quot;entry-header&quot;&gt;
+                        &lt;h1 class=&quot;entry-title&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h1&gt;
+
+                        &lt;?php if ( comments_open() ) : ?&gt;
+                        &lt;div class=&quot;comments-link&quot;&gt;
+                                &lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Reply&lt;/span&gt;', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?&gt;
+                        &lt;/div&gt;
+                        &lt;?php endif; ?&gt;
+                &lt;/header&gt;&lt;!-- .entry-header --&gt;
+
+                &lt;?php if ( is_search() ) : // Only display Excerpts for Search ?&gt;
+                &lt;div class=&quot;entry-summary&quot;&gt;
+                        &lt;?php the_excerpt( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyeleven' ) ); ?&gt;
+                &lt;/div&gt;&lt;!-- .entry-summary --&gt;
+                &lt;?php else : ?&gt;
+                &lt;div class=&quot;entry-content&quot;&gt;
+                        &lt;?php the_content( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyeleven' ) ); ?&gt;
+                        &lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-link&quot;&gt;' . __( '&lt;span&gt;Pages:&lt;/span&gt;', 'twentyeleven' ), 'after' =&gt; '&lt;/div&gt;' ) ); ?&gt;
+                &lt;/div&gt;&lt;!-- .entry-content --&gt;
+                &lt;?php endif; ?&gt;
+
+                &lt;footer class=&quot;entry-meta&quot;&gt;
+                        &lt;?php if ( 'post' == $post-&gt;post_type ) : // Hide category and tag text for pages on Search ?&gt;
+                        &lt;div class=&quot;entry-meta&quot;&gt;
+                                &lt;?php
+                                        printf( __( '&lt;a href=&quot;%1$s&quot; rel=&quot;bookmark&quot;&gt;&lt;time class=&quot;entry-date&quot; datetime=&quot;%2$s&quot; pubdate&gt;%3$s&lt;/time&gt;&lt;/a&gt; &lt;span class=&quot;sep&quot;&gt; by &lt;/span&gt; &lt;span class=&quot;author vcard&quot;&gt;&lt;a class=&quot;url fn n&quot; href=&quot;%4$s&quot; title=&quot;%5$s&quot;&gt;%6$s&lt;/a&gt;&lt;/span&gt;', '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()
+                                        );
+                                ?&gt;
+                        &lt;/div&gt;&lt;!-- .entry-meta --&gt;
+                        &lt;div class=&quot;entry-meta&quot;&gt;
+                                &lt;span class=&quot;cat-links&quot;&gt;&lt;span class=&quot;entry-utility-prep entry-utility-prep-cat-links&quot;&gt;&lt;?php _e( 'Posted in ', 'twentyeleven' ); ?&gt;&lt;/span&gt;&lt;?php the_category( ', ' ); ?&gt;&lt;/span&gt;&lt;br /&gt;
+                                &lt;?php the_tags( '&lt;span class=&quot;tag-links&quot;&gt;' . __( 'Tagged ', 'twentyeleven' ) . '&lt;/span&gt;', ', ', '' ); ?&gt;&lt;br /&gt;
+                                &lt;?php endif; ?&gt;
+
+                        &lt;/div&gt;&lt;!-- .entry-meta --&gt;
+
+                        &lt;?php edit_post_link( __( 'Edit', 'twentyeleven' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
+                &lt;/footer&gt;&lt;!-- #entry-meta --&gt;
+        &lt;/article&gt;&lt;!-- #post-&lt;?php the_ID(); ?&gt; --&gt;
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (17775 => 17776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php        2011-04-29 22:22:19 UTC (rev 17775)
+++ trunk/wp-content/themes/twentyeleven/functions.php        2011-04-29 22:33:04 UTC (rev 17776)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">         /**
</span><span class="cx">          * Add support for an Aside Post Format
</span><span class="cx">          */
</span><del>-        add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote' ) );
</del><ins>+        add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
</ins><span class="cx"> 
</span><span class="cx">         /**
</span><span class="cx">          * Add support for custom backgrounds
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/style.css (17775 => 17776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/style.css        2011-04-29 22:22:19 UTC (rev 17775)
+++ trunk/wp-content/themes/twentyeleven/style.css        2011-04-29 22:33:04 UTC (rev 17776)
</span><span class="lines">@@ -219,17 +219,24 @@
</span><span class="cx"> .one-column section.featured-post .attachment-small-feature {
</span><span class="cx">         border: none;
</span><span class="cx">         display: block;
</span><del>-        float: none;
-        margin: 0.625em auto 1.025em;
-        max-width: 100%;
</del><ins>+        max-width: 60%;
</ins><span class="cx">         height: auto;
</span><span class="cx">         position: static;
</span><span class="cx"> }
</span><span class="cx"> .one-column article.feature-image.small {
</span><del>-        float: none;
</del><span class="cx">         margin: 0 0 1.625em;
</span><del>-        width: auto;
</del><ins>+        padding: 0;
</ins><span class="cx"> }
</span><ins>+.one-column article.feature-image.small .entry-title {
+        font-size: 20px;
+        line-height: 1.3em;
+}
+.one-column article.feature-image.small .entry-summary {
+        height: 150px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        padding: 0;
+}
</ins><span class="cx"> .one-column article.feature-image.small .entry-summary a {
</span><span class="cx">         left: -9%;
</span><span class="cx"> }
</span><span class="lines">@@ -267,7 +274,7 @@
</span><span class="cx"> /* Make sure the logo and search form don't collide */
</span><span class="cx"> .one-column #branding #searchform {
</span><span class="cx">         right: 40px;
</span><del>-        top: 1.625em;
</del><ins>+        top: 4em;
</ins><span class="cx"> }
</span><span class="cx"> /* Talking avatars take up too much room at this size */
</span><span class="cx"> .one-column .commentlist &gt; li.comment {
</span><span class="lines">@@ -625,7 +632,7 @@
</span><span class="cx">         padding: 1.625em 0 0;
</span><span class="cx"> }
</span><span class="cx"> .page-title {
</span><del>-        color: #333;
</del><ins>+        color: #666;
</ins><span class="cx">         font-size: 10px;
</span><span class="cx">         font-weight: 500;
</span><span class="cx">         letter-spacing: 0.1em;
</span><span class="lines">@@ -982,6 +989,48 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+/* =Image
+----------------------------------------------- */
+
+.format-image .entry-content {
+        padding-top: 0.5em;
+}
+.format-image p {
+        margin: 0;
+}
+.format-image footer.entry-meta {
+        background: #e0e6e8;
+        margin-right: 2px;
+        margin-top: -6px;
+        padding: 20px 30px;
+}
+.format-image div.entry-meta {
+        display: inline-block;
+        float: left;
+        width: 40%;
+}
+.format-image div.entry-meta + div.entry-meta {
+        float: none;
+        width: 60%;
+}
+.format-image .wp-caption {
+        background: #111;
+        margin-bottom: 0;
+        max-width: 96%;
+        padding: 11px;
+}
+.format-image .wp-caption .wp-caption-text {
+        color: #ddd;
+}
+.format-image .wp-caption .wp-caption-text:before {
+        color: #444;
+}
+.single .format-image footer.entry-meta {
+        background: transparent;
+        padding: 30px 0;
+}
+
+
</ins><span class="cx"> /* =error404
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> .error404 #main #searchform {
</span><span class="lines">@@ -1020,7 +1069,7 @@
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="cx"> h1.showcase-heading {
</span><del>-        color: #333;
</del><ins>+        color: #666;
</ins><span class="cx">         font-size: 10px;
</span><span class="cx">         font-weight: 500;
</span><span class="cx">         letter-spacing: 0.1em;
</span><span class="lines">@@ -1153,7 +1202,6 @@
</span><span class="cx">         display: none;
</span><span class="cx"> }
</span><span class="cx"> section.feature-image.large img {
</span><del>-        border-bottom: 1px solid #ddd;
</del><span class="cx">         display: block;
</span><span class="cx">         height: auto;
</span><span class="cx">         max-width: 117.9%;
</span><span class="lines">@@ -1175,7 +1223,6 @@
</span><span class="cx"> }
</span><span class="cx"> .featured-posts section.featured-post {
</span><span class="cx">         background: #fff;
</span><del>-        height: 300px;
</del><span class="cx">         left: 0;
</span><span class="cx">         margin: 0;
</span><span class="cx">         position: absolute;
</span><span class="lines">@@ -1433,7 +1480,7 @@
</span><span class="cx">         margin: 0 0 2.2em;
</span><span class="cx"> }
</span><span class="cx"> .widget-title {
</span><del>-        color: #333;
</del><ins>+        color: #666;
</ins><span class="cx">         font-size: 10px;
</span><span class="cx">         font-weight: 500;
</span><span class="cx">         letter-spacing: 0.1em;
</span><span class="lines">@@ -1570,7 +1617,7 @@
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="cx"> #comments-title {
</span><del>-        color: #444;
</del><ins>+        color: #666;
</ins><span class="cx">         font-size: 10px;
</span><span class="cx">         font-weight: 500;
</span><span class="cx">         line-height: 2.6em;
</span><span class="lines">@@ -1908,6 +1955,9 @@
</span><span class="cx">                 width: auto;
</span><span class="cx">         }
</span><span class="cx">         /* Simplify the showcase template */
</span><ins>+        .page-template-showcase-php .featured-posts {
+                height: 280px;
+        }
</ins><span class="cx">         .page-template-showcase-php section.recent-posts {
</span><span class="cx">                 float: none;
</span><span class="cx">                 margin: 0;
</span><span class="lines">@@ -1922,20 +1972,24 @@
</span><span class="cx">                 border-bottom: 1px solid #ddd;
</span><span class="cx">         }
</span><span class="cx">         /* Simplify the showcase template when small feature */
</span><del>-        section.featured-post .attachment-small-feature {
</del><ins>+        section.featured-post .attachment-small-feature,
+        .one-column section.featured-post .attachment-small-feature {
</ins><span class="cx">                 border: none;
</span><span class="cx">                 display: block;
</span><del>-                float: none;
</del><ins>+                float: left;
</ins><span class="cx">                 height: auto;
</span><span class="cx">                 margin: 0.625em auto 1.025em;
</span><del>-                max-width: 100%;
</del><ins>+                max-width: 30%;
</ins><span class="cx">                 position: static;
</span><span class="cx">         }
</span><span class="cx">         article.feature-image.small {
</span><del>-                float: none;
</del><ins>+                float: right;
</ins><span class="cx">                 margin: 0 0 1.625em;
</span><del>-                width: auto;
</del><ins>+                width: 64%;
</ins><span class="cx">         }
</span><ins>+        .one-column article.feature-image.small .entry-summary {
+                height: auto;
+        }
</ins><span class="cx">         article.feature-image.small .entry-summary a {
</span><span class="cx">                 left: -9%;
</span><span class="cx">         }
</span><span class="lines">@@ -2050,7 +2104,7 @@
</span><span class="cx">                 position: relative !important;
</span><span class="cx">         }
</span><span class="cx">         #branding {
</span><del>-                border-top: none;
</del><ins>+                border-top: none !important;
</ins><span class="cx">                 padding: 0;
</span><span class="cx">         }
</span><span class="cx">         #branding hgroup {
</span></span></pre>
</div>
</div>

</body>
</html>