<!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>[18132] trunk/wp-content/themes/twentyeleven: Twenty Eleven: Add border styles to images so we can better style linked images on :focus; includes updates to editor styles and improvements to Image Post styles; See #17524</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/18132">18132</a></dd>
<dt>Author</dt> <dd>iandstewart</dd>
<dt>Date</dt> <dd>2011-06-03 21:11:41 +0000 (Fri, 03 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven: Add border styles to images so we can better style linked images on :focus; includes updates to editor styles and improvements to Image Post styles; See <a href="http://trac.wordpress.org/ticket/17524">#17524</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevencolorsdarkcss">trunk/wp-content/themes/twentyeleven/colors/dark.css</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentimagephp">trunk/wp-content/themes/twentyeleven/content-image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyeleveneditorstylecss">trunk/wp-content/themes/twentyeleven/editor-style.css</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenstylecss">trunk/wp-content/themes/twentyeleven/style.css</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 (18131 => 18132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/colors/dark.css 2011-06-03 18:59:12 UTC (rev 18131)
+++ trunk/wp-content/themes/twentyeleven/colors/dark.css 2011-06-03 21:11:41 UTC (rev 18132)
</span><span class="lines">@@ -145,6 +145,42 @@
</span><span class="cx"> color: #000;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Images */
+.wp-caption {
+ background: #2c2c2c;
+}
+.wp-caption .wp-caption-text {
+ color: #999;
+}
+.wp-caption .wp-caption-text:before {
+ color: #999;
+}
+
+/* Image borders */
+.entry-content img,
+.widget img,
+#content .gallery .gallery-icon img {
+ border-color: #2c2c2c;
+}
+.wp-caption img {
+ border-color: #2c2c2c;
+}
+.entry-content a:focus img,
+.entry-content a:hover img,
+.entry-content a:active img,
+.widget a:focus img,
+.widget a:hover img,
+.widget a:active img {
+ background: #2c2c2c;
+ border-color: #444;
+}
+.wp-caption a:focus img,
+.wp-caption a:active img,
+.wp-caption a:hover img {
+ background: #0f0f0f;
+ border-color: #2c2c2c;
+}
+
</ins><span class="cx"> /* Password Protected Posts */
</span><span class="cx"> .post-password-required input[type=password] {
</span><span class="cx"> background: #ddd;
</span><span class="lines">@@ -208,10 +244,13 @@
</span><span class="cx"> /* =Image
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><del>-.format-image .entry-meta .edit-link a {
</del><ins>+.indexed.format-image .wp-caption {
+ background: #242424;
+}
+.indexed.format-image .entry-meta .edit-link a {
</ins><span class="cx"> color: #ddd;
</span><span class="cx"> }
</span><del>-.format-image .entry-meta .edit-link a:hover {
</del><ins>+.indexed.format-image .entry-meta .edit-link a:hover {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -339,20 +378,15 @@
</span><span class="cx"> background: #060606;
</span><span class="cx"> border-color: #222;
</span><span class="cx"> }
</span><del>-
-
-/* =Images
------------------------------------------------ */
-
-.wp-caption {
- background: #0b0d12;
</del><ins>+.image-attachment div.attachment a img {
+ border-color: #060606;
</ins><span class="cx"> }
</span><del>-.wp-caption .wp-caption-text {
- color: #999;
</del><ins>+.image-attachment div.attachment a:focus img,
+.image-attachment div.attachment a:hover img,
+.image-attachment div.attachment a:active img {
+ border-color: #2c2c2c;
+ background: #0f0f0f;
</ins><span class="cx"> }
</span><del>-.wp-caption .wp-caption-text:before {
- color: #64759d;
-}
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> /* =Widgets
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-image.php (18131 => 18132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-image.php 2011-06-03 18:59:12 UTC (rev 18131)
+++ trunk/wp-content/themes/twentyeleven/content-image.php 2011-06-03 21:11:41 UTC (rev 18132)
</span><span class="lines">@@ -9,8 +9,7 @@
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><del>-
- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</del><ins>+ <article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
</ins><span class="cx"> <header class="entry-header">
</span><span class="cx"> <hgroup>
</span><span class="cx"> <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>
</span><span class="lines">@@ -24,16 +23,10 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><del>- <?php if ( is_search() ) : // Only display Excerpts for Search ?>
- <div class="entry-summary">
- <?php the_excerpt(); ?>
- </div><!-- .entry-summary -->
- <?php else : ?>
</del><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
</span><span class="cx"> <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( '<span>Pages:</span>', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><span class="cx"> <?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyeleveneditorstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/editor-style.css (18131 => 18132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/editor-style.css 2011-06-03 18:59:12 UTC (rev 18131)
+++ trunk/wp-content/themes/twentyeleven/editor-style.css 2011-06-03 21:11:41 UTC (rev 18132)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Text elements */
</span><ins>+p, ul, ol, dl {
+ font-weight: 300;
+}
</ins><span class="cx"> p {
</span><span class="cx"> margin-bottom: 1.625em;
</span><span class="cx"> }
</span><span class="lines">@@ -247,17 +250,27 @@
</span><span class="cx"> .wp-caption {
</span><span class="cx"> margin-top: 0.4em;
</span><span class="cx"> }
</span><ins>+img {
+ border: 1px solid #ddd;
+ padding: 6px;
+}
+img.alignleft,
+img.alignright,
+img.aligncenter {
+ margin-bottom: 1.625em;
+}
</ins><span class="cx"> .wp-caption {
</span><del>- background: #f4f2ed;
</del><ins>+ background: #eee;
</ins><span class="cx"> border: none;
</span><span class="cx"> margin-bottom: 1.625em;
</span><span class="cx"> max-width: 96%;
</span><del>- padding: 12px;
</del><ins>+ padding: 9px;
</ins><span class="cx"> }
</span><span class="cx"> .wp-caption img {
</span><span class="cx"> display: block;
</span><span class="cx"> margin: 5px auto 0 !important;
</span><span class="cx"> max-width: 98%;
</span><ins>+ border-color: #eee;
</ins><span class="cx"> }
</span><span class="cx"> .wp-caption .wp-caption-text,
</span><span class="cx"> .wp-caption-dd {
</span><span class="lines">@@ -270,7 +283,7 @@
</span><span class="cx"> text-align: left;
</span><span class="cx"> }
</span><span class="cx"> .wp-caption .wp-caption-text:before {
</span><del>- color: #9b8a62;
</del><ins>+ color: #666;
</ins><span class="cx"> content: '\2014';
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> font-style: normal;
</span><span class="lines">@@ -279,4 +292,16 @@
</span><span class="cx"> position: absolute;
</span><span class="cx"> left: 10px;
</span><span class="cx"> top: 7px;
</span><ins>+}
+a:focus img,
+a:hover img,
+a:active img {
+ background: #eee;
+ border-color: #bbb;
+}
+.wp-caption a:focus img,
+.wp-caption a:active img,
+.wp-caption a:hover img {
+ background: #fff;
+ border-color: #ddd;
</ins><span class="cx"> }
</span><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 (18131 => 18132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/style.css 2011-06-03 18:59:12 UTC (rev 18131)
+++ trunk/wp-content/themes/twentyeleven/style.css 2011-06-03 21:11:41 UTC (rev 18132)
</span><span class="lines">@@ -828,6 +828,98 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Images */
+img.size-auto,
+img.size-large,
+img.size-full,
+img.size-medium,
+img.size-thumbnail {
+ height: auto;
+ max-width: 97.5%;
+}
+img.wp-smiley {
+ margin-bottom: 0;
+ margin-top: 0;
+}
+img.alignleft,
+img.alignright,
+img.aligncenter {
+ margin-bottom: 1.625em;
+}
+p img,
+.wp-caption {
+ margin-top: 0.4em;
+}
+.wp-caption {
+ background: #eee;
+ margin-bottom: 1.625em;
+ max-width: 96%;
+ padding: 9px;
+}
+.wp-caption img {
+ display: block;
+ margin: 0 auto;
+ max-width: 98%;
+}
+.wp-caption .wp-caption-text,
+.gallery-caption {
+ color: #666;
+ font-family: Georgia, serif;
+ font-size: 12px;
+}
+.wp-caption .wp-caption-text {
+ margin-bottom: 0.6em;
+ padding: 10px 0px 5px 40px;
+ position: relative;
+}
+.wp-caption .wp-caption-text:before {
+ color: #666;
+ content: '\2014';
+ font-size: 14px;
+ font-style: normal;
+ font-weight: bold;
+ margin-right: 5px;
+ position: absolute;
+ left: 10px;
+ top: 7px;
+}
+.gallery {
+ margin: 0 auto 1.625em !important;
+}
+#content .gallery a img {
+ border: none;
+}
+img#wpstats {
+ display: block;
+ margin: 0 auto 1.625em;
+}
+
+/* Image borders */
+.entry-content img,
+.widget img,
+#content .gallery .gallery-icon img {
+ border: 1px solid #ddd;
+ padding: 6px;
+}
+.wp-caption img {
+ border-color: #eee;
+}
+.entry-content a:focus img,
+.entry-content a:hover img,
+.entry-content a:active img,
+.widget a:focus img,
+.widget a:hover img,
+.widget a:active img {
+ background: #eee;
+ border-color: #bbb;
+}
+.wp-caption a:focus img,
+.wp-caption a:active img,
+.wp-caption a:hover img {
+ background: #fff;
+ border-color: #ddd;
+}
+
</ins><span class="cx"> /* Password Protected Posts */
</span><span class="cx"> .post-password-required .entry-header .comments-link {
</span><span class="cx"> margin: 1.625em 0 0;
</span><span class="lines">@@ -1104,54 +1196,55 @@
</span><span class="cx"> /* =Image
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><del>-.format-image .entry-content {
</del><ins>+.indexed.format-image .entry-content {
</ins><span class="cx"> padding-top: 0.5em;
</span><span class="cx"> }
</span><del>-.format-image p {
- margin: 0;
</del><ins>+.indexed.format-image p img {
+ margin-bottom: 0;
</ins><span class="cx"> }
</span><del>-.format-image footer.entry-meta {
</del><ins>+.indexed.format-image footer.entry-meta {
</ins><span class="cx"> background: #e0e6e8;
</span><span class="cx"> margin-top: -6px;
</span><span class="cx"> padding: 20px 30px;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>-.format-image div.entry-meta {
</del><ins>+.indexed.format-image div.entry-meta {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> float: left;
</span><span class="cx"> width: 35%;
</span><span class="cx"> }
</span><del>-.format-image div.entry-meta + div.entry-meta {
</del><ins>+.indexed.format-image div.entry-meta + div.entry-meta {
</ins><span class="cx"> float: none;
</span><span class="cx"> width: 65%;
</span><span class="cx"> }
</span><del>-.format-image .entry-meta span.cat-links,
-.format-image .entry-meta span.tag-links,
-.format-image .entry-meta span.comments-link {
</del><ins>+.indexed.format-image .entry-meta span.cat-links,
+.indexed.format-image .entry-meta span.tag-links,
+.indexed.format-image .entry-meta span.comments-link {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><del>-.format-image footer.entry-meta a {
</del><ins>+.indexed.format-image footer.entry-meta a {
</ins><span class="cx"> color: #444;
</span><span class="cx"> }
</span><del>-.format-image .wp-caption {
</del><ins>+#content .indexed.format-image img {
+ border: none;
+ max-width: 100%;
+ padding: 0;
+}
+.indexed.format-image .wp-caption {
</ins><span class="cx"> background: #111;
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> max-width: 96%;
</span><span class="cx"> padding: 11px;
</span><span class="cx"> }
</span><del>-.format-image .wp-caption .wp-caption-text {
</del><ins>+.indexed.format-image .wp-caption .wp-caption-text {
</ins><span class="cx"> color: #ddd;
</span><span class="cx"> }
</span><del>-.format-image .wp-caption .wp-caption-text:before {
</del><ins>+.indexed.format-image .wp-caption .wp-caption-text:before {
</ins><span class="cx"> color: #444;
</span><span class="cx"> }
</span><del>-.single .format-image footer.entry-meta {
- background: transparent;
- padding: 30px 0;
</del><ins>+.indexed.format-image a:hover img {
+ opacity: 0.8;
</ins><span class="cx"> }
</span><del>-.one-column .format-image footer.entry-meta {
- margin-right: 2px;
-}
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> /* =error404
</span><span class="lines">@@ -1502,6 +1595,15 @@
</span><span class="cx"> margin: 0 auto 1.625em;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><ins>+.image-attachment div.attachment a img {
+ border-color: #f9f9f9;
+}
+.image-attachment div.attachment a:focus img,
+.image-attachment div.attachment a:hover img,
+.image-attachment div.attachment a:active img {
+ border-color: #ddd;
+ background: #fff;
+}
</ins><span class="cx"> .image-attachment .entry-caption p {
</span><span class="cx"> font-size: 10px;
</span><span class="cx"> letter-spacing: 0.1em;
</span><span class="lines">@@ -1511,69 +1613,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Images
------------------------------------------------ */
-
-img.size-auto,
-img.size-large,
-img.size-full,
-img.size-medium,
-img.size-thumbnail {
- height: auto;
- max-width: 100%;
-}
-img.wp-smiley {
- margin-bottom: 0;
- margin-top: 0;
-}
-p img,
-.wp-caption {
- margin-top: 0.4em;
-}
-.wp-caption {
- background: #f4f2ed;
- margin-bottom: 1.625em;
- max-width: 96%;
- padding: 12px;
-}
-.wp-caption img {
- display: block;
- margin: 5px auto 0;
- max-width: 98%;
-}
-.wp-caption .wp-caption-text {
- color: #666;
- font-family: Georgia, serif;
- font-size: 12px;
- margin-bottom: 0.6em;
- padding: 10px 0px 5px 40px;
- position: relative;
-}
-.wp-caption .wp-caption-text:before {
- color: #9b8a62;
- content: '\2014';
- font-size: 14px;
- font-style: normal;
- font-weight: bold;
- margin-right: 5px;
- position: absolute;
- left: 10px;
- top: 7px;
-}
-.gallery {
- margin: 0 auto 1.625em !important;
-}
-#content .gallery a img {
- border: none;
-}
-.gallery-caption {
-}
-img#wpstats {
- display: block;
- margin: 0 auto 1.625em;
-}
-
-
</del><span class="cx"> /* =Navigation
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>