<!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>[36957] trunk/src/wp-content/themes/twentyeleven: Twenty Elevent: Captioned image fix for editor</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36957">36957</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36957","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>karmatosed</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-10 21:12:25 +0000 (Thu, 10 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Elevent: Captioned image fix for editor
Fixes <a href="https://core.trac.wordpress.org/ticket/33153">#33153</a>
Props: @iseulde</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyeleveneditorstylecss">trunk/src/wp-content/themes/twentyeleven/editor-style.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenstylecss">trunk/src/wp-content/themes/twentyeleven/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyeleveneditorstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/editor-style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/editor-style.css 2016-03-10 21:06:07 UTC (rev 36956)
+++ trunk/src/wp-content/themes/twentyeleven/editor-style.css 2016-03-10 21:12:25 UTC (rev 36957)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,21 +3,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Description: Used to style the TinyMCE editor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-html .mceContentBody {
- max-width: 584px;
-}
-* {
- color: inherit;
- font: 15px "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-style: inherit;
- font-weight: inherit;
- line-height: 1.625;
-}
</del><span class="cx" style="display: block; padding: 0 10px"> body {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #333;
</span><span class="cx" style="display: block; padding: 0 10px"> font: 15px "Helvetica Neue", Helvetica, Arial, "Nimbus Sans L", sans-serif;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 300;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.625;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: 584px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Headings */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,10 +228,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Images */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-img[class*="wp-image-"] {
- height: auto;
- max-width: 97.5%;
-}
</del><span class="cx" style="display: block; padding: 0 10px"> img.size-full {
</span><span class="cx" style="display: block; padding: 0 10px"> width: auto; /* Prevent stretching of full-size images in IE8 */
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,10 +241,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-caption {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 0.4em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-img,
-.editor-attachment {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+img {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #ddd;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 6px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height: auto;
+ max-width: 97.5%;
+ max-width: calc( 100% - 14px );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> img.alignleft,
</span><span class="cx" style="display: block; padding: 0 10px"> img.alignright,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,25 +258,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border: none;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 1.625em;
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 96%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 9px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: calc( 100% - 22px );
+ padding: 9px 11px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-caption img {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 5px auto 0 !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 0 -2px;
</ins><span class="cx" style="display: block; padding: 0 10px"> max-width: 98%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: calc( 100% - 10px );
</ins><span class="cx" style="display: block; padding: 0 10px"> border-color: #eee;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-caption .wp-caption-text,
-.wp-caption-dd {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-caption .wp-caption-dd {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- font-family: Georgia, serif !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ font-family: Georgia, serif;
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 12px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 0 0 0.6em 0 !important;
- padding: 0 0 5px 40px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-bottom: 0.6em;
+ padding: 10px 0 5px 40px;
</ins><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-align: left;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-caption .wp-caption-text:before {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-caption .wp-caption-dd:before {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span><span class="cx" style="display: block; padding: 0 10px"> content: '\2014';
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,9 +287,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> left: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 7px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-a:focus img[class*="wp-image-"],
-a:hover img[class*="wp-image-"],
-a:active img[class*="wp-image-"] {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+a:focus img,
+a:hover img,
+a:active img {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #eee;
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: #bbb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,4 +298,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-caption a:hover img {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: #ddd;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/style.css 2016-03-10 21:06:07 UTC (rev 36956)
+++ trunk/src/wp-content/themes/twentyeleven/style.css 2016-03-10 21:12:25 UTC (rev 36957)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,12 +910,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: #eee;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 1.625em;
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 96%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: calc( 100% - 18px );
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 9px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-caption img {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: -2px 0 0 -2px;
</del><span class="cx" style="display: block; padding: 0 10px"> max-width: 98%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: calc( 100% - 14px );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-caption .wp-caption-text,
</span><span class="cx" style="display: block; padding: 0 10px"> .gallery-caption {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,6 +966,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #ddd;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 6px;
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 97.5%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: calc( 100% - 14px );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-caption img {
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: #eee;
</span></span></pre>
</div>
</div>
</body>
</html>