<!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>[18072] trunk/wp-content/themes/twentyeleven: Twenty Eleven: bug fixes and enhancements ...</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/18072">18072</a></dd>
<dt>Author</dt> <dd>iandstewart</dd>
<dt>Date</dt> <dd>2011-05-30 01:29:55 +0000 (Mon, 30 May 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Eleven: bug fixes and enhancements ...
* Improvements to the dark color scheme; Props matveb
* Remove link colors from the dark color scheme and let the default link color cascade
* Check for multiple authors before showing author information on single posts
* Remove the span before the edit link on the image template
* Add a comment icon; Props hugobaeta
* Replace the default reply text with an icon to prevent i18n issues with the design; Props matveb
* Don't output sidebar on the no sidebar layout
* Use the search form styling from the header for all search forms
* Style fixes for no search results page
* Fixes for fancy blockquote styles
* Style fixes for the showcase slider
* Margin for galleries
* Only showing the top post navigation on paged results
* Remove floats from images for the smallest screen sizes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevencolorsdarkcss">trunk/wp-content/themes/twentyeleven/colors/dark.css</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentsinglephp">trunk/wp-content/themes/twentyeleven/content-single.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenimagephp">trunk/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsphp">trunk/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevensidebarphp">trunk/wp-content/themes/twentyeleven/sidebar.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="#trunkwpcontentthemestwentyelevenimagesiconcommentpng">trunk/wp-content/themes/twentyeleven/images/icon-comment.png</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevencolorsdarkcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/colors/dark.css (18071 => 18072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/colors/dark.css        2011-05-29 21:18:58 UTC (rev 18071)
+++ trunk/wp-content/themes/twentyeleven/colors/dark.css        2011-05-30 01:29:55 UTC (rev 18072)
</span><span class="lines">@@ -41,10 +41,12 @@
</span><span class="cx"> input[type=text]:focus,
</span><span class="cx"> textarea:focus {
</span><span class="cx"> }
</span><ins>+input#s {
+        background-color: #ddd;
+}
</ins><span class="cx"> 
</span><span class="cx"> /* Links */
</span><span class="cx"> a {
</span><del>-        color: #e4741f;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -52,7 +54,7 @@
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="cx"> #branding {
</span><del>-        border-top: 2px solid #444;
</del><ins>+        border-top: 2px solid #0a0a0a;
</ins><span class="cx"> }
</span><span class="cx"> #site-title a {
</span><span class="cx">         color: #eee;
</span><span class="lines">@@ -60,7 +62,6 @@
</span><span class="cx"> #site-title a:hover,
</span><span class="cx"> #site-title a:focus,
</span><span class="cx"> #site-title a:active {
</span><del>-        color: #e4741f;
</del><span class="cx"> }
</span><span class="cx"> #site-description {
</span><span class="cx">         color: #858585;
</span><span class="lines">@@ -100,7 +101,6 @@
</span><span class="cx"> .entry-title a:hover,
</span><span class="cx"> .entry-title a:focus,
</span><span class="cx"> .entry-title a:active {
</span><del>-        color: #e4741f;
</del><span class="cx"> }
</span><span class="cx"> .entry-meta {
</span><span class="cx">         color: #999;
</span><span class="lines">@@ -166,16 +166,12 @@
</span><span class="cx"> 
</span><span class="cx"> /* Comments link */
</span><span class="cx"> .entry-header .comments-link a {
</span><del>-        background: #111;
</del><ins>+        background: #1a1a1a;
</ins><span class="cx">         border-color: #222;
</span><span class="cx">         color: #888;
</span><span class="cx"> }
</span><del>-.entry-header .comments-link a:hover,
-.entry-header .comments-link a:focus,
-.entry-header .comments-link a:active {
-        background: #888;
-        border-color: #aaa;
-        color: #000;
</del><ins>+.entry-header .comments-link a .leave-reply {
+        background-position-y: -24px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* Singular content styles for Posts and Pages */
</span><span class="lines">@@ -205,6 +201,17 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+/* =Image
+----------------------------------------------- */
+
+.format-image .entry-meta .edit-link a {
+        color: #ddd;
+}
+.format-image .entry-meta .edit-link a:hover {
+        color: #fff;
+}
+
+
</ins><span class="cx"> /* =error404
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> .error404 #main #searchform {
</span><span class="lines">@@ -255,7 +262,6 @@
</span><span class="cx">         color: #111;
</span><span class="cx"> }
</span><span class="cx"> article.feature-image.small .entry-summary p a:hover {
</span><del>-        background: #e4741f;
</del><span class="cx">         color: #40220c;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -308,7 +314,6 @@
</span><span class="cx">         color: #ccc;
</span><span class="cx"> }
</span><span class="cx"> section.recent-posts .other-recent-posts a[rel=&quot;bookmark&quot;]:hover {
</span><del>-        color: #e4741f;
</del><span class="cx"> }
</span><span class="cx"> section.recent-posts .other-recent-posts .comments-link a,
</span><span class="cx"> section.recent-posts .other-recent-posts .comments-link &gt; span {
</span><span class="lines">@@ -320,8 +325,6 @@
</span><span class="cx">         color: #777;
</span><span class="cx"> }
</span><span class="cx"> section.recent-posts .other-recent-posts .comments-link a:hover {
</span><del>-        color: #e4741f;
-        border-color: #e4741f;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -368,8 +371,6 @@
</span><span class="cx">         color: #777;
</span><span class="cx"> }
</span><span class="cx"> .widget_search #searchsubmit:active {
</span><del>-        background: #e4741f;
-        border-color: #f79e5a;
</del><span class="cx">         -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
</span><span class="cx">         -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
</span><span class="cx">         box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
</span><span class="lines">@@ -484,7 +485,6 @@
</span><span class="cx">         text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
</span><span class="cx"> }
</span><span class="cx"> #respond input#submit:active {
</span><del>-        background: #e4741f;
</del><span class="cx">         color: #40220c;
</span><span class="cx"> }
</span><span class="cx"> #respond #cancel-comment-reply-link {
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> /* Site Generator Line */
</span><span class="cx"> #site-generator {
</span><span class="cx">         background: #060606;
</span><del>-        border-color: #222;
</del><ins>+        border-color: #000;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-single.php (18071 => 18072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-single.php        2011-05-29 21:18:58 UTC (rev 18071)
+++ trunk/wp-content/themes/twentyeleven/content-single.php        2011-05-30 01:29:55 UTC (rev 18072)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;?php edit_post_link( __( 'Edit', 'twentyeleven' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
</span><span class="cx"> 
</span><del>-                &lt;?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?&gt;
</del><ins>+                &lt;?php if ( get_the_author_meta( 'description' ) &amp;&amp; is_multi_author() ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?&gt;
</ins><span class="cx">                 &lt;div id=&quot;author-info&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;author-avatar&quot;&gt;
</span><span class="cx">                                 &lt;?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 68 ) ); ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/image.php (18071 => 18072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/image.php        2011-05-29 21:18:58 UTC (rev 18071)
+++ trunk/wp-content/themes/twentyeleven/image.php        2011-05-30 01:29:55 UTC (rev 18072)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">                                                                         get_the_title( $post-&gt;post_parent )
</span><span class="cx">                                                                 );
</span><span class="cx">                                                         ?&gt;
</span><del>-                                                        &lt;?php edit_post_link( __( 'Edit', 'twentyeleven' ), '&lt;span class=&quot;sep&quot;&gt;|&lt;/span&gt; &lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
</del><ins>+                                                        &lt;?php edit_post_link( __( 'Edit', 'twentyeleven' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
</ins><span class="cx">                                                 &lt;/div&gt;&lt;!-- .entry-meta --&gt;
</span><span class="cx"> 
</span><span class="cx">                                         &lt;/header&gt;&lt;!-- .entry-header --&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenimagesiconcommentpng"></a>
<div class="binary"><h4>Added: trunk/wp-content/themes/twentyeleven/images/icon-comment.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/wp-content/themes/twentyeleven/images/icon-comment.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (18071 => 18072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php        2011-05-29 21:18:58 UTC (rev 18071)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php        2011-05-30 01:29:55 UTC (rev 18072)
</span><span class="lines">@@ -327,9 +327,12 @@
</span><span class="cx">                 section.recent-posts .other-recent-posts .comments-link a:hover {
</span><span class="cx">                         border-color: &lt;?php echo $link_color; ?&gt;;
</span><span class="cx">                 }        
</span><del>-                article.feature-image.small .entry-summary p a:hover {
</del><ins>+                article.feature-image.small .entry-summary p a:hover,
+                .entry-header .comments-link a:hover,
+                .entry-header .comments-link a:focus,
+                .entry-header .comments-link a:active {
</ins><span class="cx">                         background: &lt;?php echo $link_color; ?&gt;;
</span><del>-                }        
</del><ins>+                }
</ins><span class="cx">         &lt;/style&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/sidebar.php (18071 => 18072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/sidebar.php        2011-05-29 21:18:58 UTC (rev 18071)
+++ trunk/wp-content/themes/twentyeleven/sidebar.php        2011-05-30 01:29:55 UTC (rev 18072)
</span><span class="lines">@@ -6,6 +6,11 @@
</span><span class="cx">  * @subpackage Twenty_Eleven
</span><span class="cx">  * @since Twenty Eleven 1.0
</span><span class="cx">  */
</span><ins>+
+$options = twentyeleven_get_theme_options();
+$current_layout = $options['theme_layout'];
+
+if ( 'content' != $current_layout ) :
</ins><span class="cx"> ?&gt;
</span><span class="cx">                 &lt;div id=&quot;secondary&quot; class=&quot;widget-area&quot; role=&quot;complementary&quot;&gt;
</span><span class="cx">                         &lt;?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?&gt;
</span><span class="lines">@@ -28,3 +33,4 @@
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php endif; // end sidebar widget area ?&gt;
</span><span class="cx">                 &lt;/div&gt;&lt;!-- #secondary .widget-area --&gt;
</span><ins>+&lt;?php endif; ?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/style.css (18071 => 18072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/style.css        2011-05-29 21:18:58 UTC (rev 18071)
+++ trunk/wp-content/themes/twentyeleven/style.css        2011-05-30 01:29:55 UTC (rev 18072)
</span><span class="lines">@@ -424,6 +424,8 @@
</span><span class="cx"> sub {
</span><span class="cx">         top: .5ex;
</span><span class="cx"> }
</span><ins>+
+/* Forms */
</ins><span class="cx"> input[type=text],
</span><span class="cx"> textarea {
</span><span class="cx">         background: #fafafa;
</span><span class="lines">@@ -444,6 +446,18 @@
</span><span class="cx"> input[type=text] {
</span><span class="cx">         padding: 3px;
</span><span class="cx"> }
</span><ins>+input#s {
+        background: url(images/search.png) no-repeat 5px 6px;
+        -moz-border-radius: 2px;
+        border-radius: 2px;
+        font-size: 14px;
+        height: 22px;
+        line-height: 1.2em;
+        padding: 4px 10px 4px 28px;
+}
+input#searchsubmit {
+        display: none;
+}
</ins><span class="cx"> 
</span><span class="cx"> /* Links */
</span><span class="cx"> a {
</span><span class="lines">@@ -595,14 +609,7 @@
</span><span class="cx">         margin: 0;
</span><span class="cx"> }
</span><span class="cx"> #branding #s {
</span><del>-        background: url(images/search.png) no-repeat 5px 6px;
-        -moz-border-radius: 2px;
-        border-radius: 2px;
</del><span class="cx">         float: right;
</span><del>-        font-size: 14px;
-        height: 22px;
-        line-height: 1.2em;
-        padding: 4px 10px 4px 28px;
</del><span class="cx">         -webkit-transition-duration: 400ms;
</span><span class="cx">         -webkit-transition-property: width, background;
</span><span class="cx">         -webkit-transition-timing-function: ease;
</span><span class="lines">@@ -665,13 +672,15 @@
</span><span class="cx">         letter-spacing: 0;
</span><span class="cx">         text-transform: none;
</span><span class="cx"> }
</span><del>-.hentry {
</del><ins>+.hentry,
+.no-results {
</ins><span class="cx">         border-bottom: 1px solid #ddd;
</span><span class="cx">         margin: 0 0 1.625em;
</span><span class="cx">         padding: 0 0 1.625em;
</span><span class="cx">         position: relative;
</span><span class="cx"> }
</span><del>-.hentry:last-child {
</del><ins>+.hentry:last-child,
+.no-results {
</ins><span class="cx">         border-bottom: none;
</span><span class="cx"> }
</span><span class="cx"> .blog .sticky .entry-header .entry-meta {
</span><span class="lines">@@ -750,6 +759,9 @@
</span><span class="cx">         border-top: 1px solid #ddd;
</span><span class="cx">         padding: 6px 10px 6px 0;
</span><span class="cx"> }
</span><ins>+.entry-content #s {
+        width: 75%;
+}
</ins><span class="cx"> .comment-content ul,
</span><span class="cx"> .comment-content ol {
</span><span class="cx">         margin-bottom: 1.625em;
</span><span class="lines">@@ -863,7 +875,7 @@
</span><span class="cx">         position: absolute;
</span><span class="cx">         text-align: center;
</span><span class="cx">         text-decoration: none;
</span><del>-        top: 0;
</del><ins>+        top: .5em;
</ins><span class="cx">         right: 0;
</span><span class="cx">         width: 48px;
</span><span class="cx">         height: 48px;
</span><span class="lines">@@ -871,17 +883,28 @@
</span><span class="cx"> .entry-header .comments-link a:hover,
</span><span class="cx"> .entry-header .comments-link a:focus,
</span><span class="cx"> .entry-header .comments-link a:active {
</span><del>-        background: #777;
-        border-color: #555;
</del><ins>+        background: #1b8be0;
+        border-color: #1573bb;
+        border-color: rgba(0,0,0,0.2);
</ins><span class="cx">         color: #fff;
</span><ins>+        color: rgba(255,255,255,0.8);
</ins><span class="cx"> }
</span><span class="cx"> .entry-header .comments-link .leave-reply {
</span><del>-        font-size: 14px;
-        font-weight: bold;
</del><ins>+        background: url(images/icon-comment.png) no-repeat;
+        color: transparent;
+        display: inline-block;
+        font-family: &quot;Arial Unicode MS&quot;, &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif;
+        font-size: 26px;
+        height: 24px;
+        line-height: 12px;
+        opacity: 0.25;
</ins><span class="cx">         position: relative;
</span><del>-        text-transform: lowercase;
-        top: -1px;
</del><ins>+        width: 24px;
</ins><span class="cx"> }
</span><ins>+.entry-header .comments-link a:hover .leave-reply {
+        background-position-y: -24px;
+        opacity: 0.5;
+}
</ins><span class="cx"> /*
</span><span class="cx">         Post Formats Headings
</span><span class="cx">         To hide the headings, display: none the &quot;.entry-header .entry-format&quot; selector,
</span><span class="lines">@@ -936,15 +959,29 @@
</span><span class="cx">         top: 0;
</span><span class="cx">         left: 0;
</span><span class="cx"> }
</span><del>-.singular blockquote.pull {
</del><ins>+blockquote.pull {
</ins><span class="cx">         font-size: 21px;
</span><span class="cx">         font-weight: bold;
</span><span class="cx">         line-height: 1.6125em;
</span><ins>+        margin: 0 0 1.625em;
+        text-align: center;
+}
+.singular blockquote.pull {
</ins><span class="cx">         margin: 0 -22.25% 1.625em;
</span><span class="cx"> }
</span><ins>+.pull.alignleft {
+        margin: 0 1.625em 0 0;
+        text-align: right;
+        width: 33%;
+}
</ins><span class="cx"> .singular .pull.alignleft {
</span><span class="cx">         margin: 0 1.625em 0 -22.25%;
</span><span class="cx"> }
</span><ins>+.pull.alignright {
+        margin: 0 0 0 1.625em;
+        text-align: left;
+        width: 33%;
+}
</ins><span class="cx"> .singular .pull.alignright {
</span><span class="cx">         margin: 0 -22.25% 0 1.625em;
</span><span class="cx"> }
</span><span class="lines">@@ -1246,7 +1283,7 @@
</span><span class="cx"> /* Large featured post */
</span><span class="cx"> section.feature-image.large {
</span><span class="cx">         border: none;
</span><del>-        max-height: 300px;
</del><ins>+        max-height: 288px;
</ins><span class="cx">         padding: 0;
</span><span class="cx">         width: 100%;
</span><span class="cx"> }
</span><span class="lines">@@ -1290,7 +1327,7 @@
</span><span class="cx"> .featured-posts {
</span><span class="cx">         border-bottom: 1px solid #e8e8e8;
</span><span class="cx">         display: block;
</span><del>-        height: 340px;
</del><ins>+        height: 328px;
</ins><span class="cx">         margin: 1.625em -8.9% 20px;
</span><span class="cx">         max-width: 1000px;
</span><span class="cx">         padding: 0;
</span><span class="lines">@@ -1301,7 +1338,7 @@
</span><span class="cx"> }
</span><span class="cx"> .featured-posts section.featured-post {
</span><span class="cx">         background: #fff;
</span><del>-        height: 300px;
</del><ins>+        height: 288px;
</ins><span class="cx">         left: 0;
</span><span class="cx">         margin: 0;
</span><span class="cx">         position: absolute;
</span><span class="lines">@@ -1309,6 +1346,7 @@
</span><span class="cx">         width: auto;
</span><span class="cx"> }
</span><span class="cx"> .featured-posts section.featured-post.large {
</span><ins>+        max-width: 100%;
</ins><span class="cx">         overflow: hidden;
</span><span class="cx"> }
</span><span class="cx"> .featured-posts section.featured-post {
</span><span class="lines">@@ -1503,6 +1541,9 @@
</span><span class="cx">         left: 10px;
</span><span class="cx">         top: 7px;
</span><span class="cx"> }
</span><ins>+.gallery {
+        margin: 0 auto 1.625em !important;
+}
</ins><span class="cx"> .gallery-caption {
</span><span class="cx"> }
</span><span class="cx"> img#wpstats {
</span><span class="lines">@@ -1527,6 +1568,12 @@
</span><span class="cx"> #nav-above {
</span><span class="cx">         padding: 0 0 1.625em;
</span><span class="cx"> }
</span><ins>+#nav-above {
+        display: none;
+}
+.paged #nav-above {
+        display: block;
+}
</ins><span class="cx"> .nav-previous {
</span><span class="cx">         float: left;
</span><span class="cx">         width: 50%;
</span><span class="lines">@@ -1598,7 +1645,7 @@
</span><span class="cx">         margin: 0 0 1.625em;
</span><span class="cx"> }
</span><span class="cx"> .widget_search #s {
</span><del>-        width: 58%;
</del><ins>+        width: 77%;
</ins><span class="cx"> }
</span><span class="cx"> .widget_search #searchsubmit {
</span><span class="cx">         background: #ddd;
</span><span class="lines">@@ -2076,8 +2123,11 @@
</span><span class="cx">         }
</span><span class="cx">         /* Simplify the showcase template */
</span><span class="cx">         .page-template-showcase-php .featured-posts {
</span><del>-                height: 280px;
</del><ins>+                min-height: 280px;
</ins><span class="cx">         }
</span><ins>+        .featured-posts section.featured-post {
+                height: auto;
+        }
</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">@@ -2186,6 +2236,13 @@
</span><span class="cx">         #branding #searchform {
</span><span class="cx">                 top: 1.625em !important;
</span><span class="cx">         }
</span><ins>+        /* Floated content doesn't work well at this size */
+        .alignleft,
+        .alignright {
+                float: none;
+                margin-left: 0;
+                margin-right: 0;
+        }
</ins><span class="cx">         /* Make sure the post-post navigation doesn't collide with anything */
</span><span class="cx">         #nav-single {
</span><span class="cx">                 display: block;
</span></span></pre>
</div>
</div>

</body>
</html>