Ticket #14303: 14303-revised.diff

style.css

@@ -4 +4 @@
 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.
 Author: the WordPress team
 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
+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
 */
 
 
@@ -759 +759 @@
 /* =Images
 -------------------------------------------------------------- */
 
-#content img {
-        margin: 0;
-        height: auto;
-        max-width: 640px;
-        width: auto;
-}
+/*
+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.
+*/
+#content img.size-auto,
+#content img.size-full,
+#content img.size-large,
+#content img.size-medium,
 #content .attachment img {
-        max-width: 900px;
+        max-width: 100%; /* When images are too wide for containing element, force them to fit. */
+        width: auto; /* Necessary for IE8 to resize images correctly. */
+        height: auto; /* Override height to match resized width for correct aspect ratio. */
 }
-#content .alignleft,
-#content img.alignleft {
+.alignleft,
+img.alignleft {
         display: inline;
         float: left;
         margin-right: 24px;
         margin-top: 4px;
 }
-#content .alignright,
-#content img.alignright {
+.alignright,
+img.alignright {
         display: inline;
         float: right;
         margin-left: 24px;
         margin-top: 4px;
 }
-#content .aligncenter,
-#content img.aligncenter {
+.aligncenter,
+img.aligncenter {
         clear: both;
         display: block;
         margin-left: auto;
         margin-right: auto;
 }
-#content img.alignleft,
-#content img.alignright,
-#content img.aligncenter {
+img.alignleft,
+img.alignright,
+img.aligncenter {
         margin-bottom: 12px;
 }
-#content .wp-caption {
+.wp-caption {
         background: #f1f1f1;
         line-height: 18px;
         margin-bottom: 20px;
+        max-width: 632px !important; /* prevent too-wide images from breaking layout */
         padding: 4px;
         text-align: center;
 }
-#content .wp-caption img {
+.wp-caption img {
         margin: 5px 5px 0;
 }
-#content .wp-caption p.wp-caption-text {
+.wp-caption p.wp-caption-text {
         color: #888;
         font-size: 12px;
         margin: 5px;
 }
-#content .wp-smiley {
+.wp-smiley {
         margin: 0;
 }
-#content .gallery {
+.gallery {
         margin: 0 auto 18px;
 }
-#content .gallery .gallery-item {
+.gallery .gallery-item {
         float: left;
         margin-top: 0;
         text-align: center;
         width: 33%;
 }
-#content .gallery img {
+.gallery img {
         border: 2px solid #cfcfcf;
 }
-#content .gallery .gallery-caption {
+.gallery .gallery-caption {
         color: #888;
         font-size: 12px;
         margin: 0 0 12px;
 }
-#content .gallery dl {
+.gallery dl {
         margin: 0;
 }
-#content .gallery img {
+.gallery img {
         border: 10px solid #f1f1f1;
 }
-#content .gallery br+br {
+.gallery br+br {
         display: none;
 }
-#content .attachment img { /* single attachment images should be centered */
+#content .attachment img {/* single attachment images should be centered */
         display: block;
         margin: 0 auto;
 }

editor-style.css

@@ -1 +1 @@
 /*
 Theme Name: Twenty Ten
+Description: Used to style the TinyMCE editor.
 */
-/*
-Used to style the TinyMCE editor.
-*/
 html .mceContentBody {
-        max-width:640px;
+        max-width: 640px;
 }
 * {
+        color: #444;
         font-family: Georgia, "Bitstream Charter", serif;
-        color: #444;
         line-height: 1.5;
 }
 p,
@@ -40 +38 @@
 }
 hr {
         background-color: #e7e7e7;
-        border:0;
+        border: 0;
+        clear: both;
         height: 1px;
         margin-bottom: 18px;
-        clear:both;
 }
 /* Text elements */
 p {
@@ -58 +56 @@
         margin: 0 0 18px 1.5em;
 }
 ol ol {
-        list-style:upper-alpha;
+        list-style: upper-alpha;
 }
 ol ol ol {
-        list-style:lower-roman;
+        list-style: lower-roman;
 }
 ol ol ol ol {
-        list-style:lower-alpha;
+        list-style: lower-alpha;
 }
 ul ul,
 ol ol,
 ul ol,
 ol ul {
-        margin-bottom:0;
+        margin-bottom: 0;
 }
 dl {
-        margin:0 0 24px 0;
+        margin: 0 0 24px 0;
 }
 dt {
         font-weight: bold;
@@ -82 +80 @@
         margin-bottom: 18px;
 }
 strong {
+        color: #000;
         font-weight: bold;
-        color: #000;
 }
 cite,
 em,
 i {
+        border: none;
         font-style: italic;
-        border: none;
 }
 big {
         font-size: 131.25%;
 }
 ins {
-        background: #ffffcc;
+        background: #ffc;
         border: none;
         color: #333;
 }
@@ -129 +127 @@
 }
 sup,
 sub {
+        font-size: 10px;
         height: 0;
         line-height: 1;
+        position: relative;
         vertical-align: baseline;
-        position: relative;
-        font-size: 10px;
 }
 sup {
         bottom: 1ex;
@@ -142 +140 @@
         top: .5ex;
 }
 a:link {
-        color:#0066cc;
+        color: #06c;
 }
 a:visited {
-        color:#743399;
+        color: #743399;
 }
 a:active,
 a:hover {
@@ -157 +155 @@
 dd,
 pre,
 hr {
-        margin-bottom:24px;
+        margin-bottom: 24px;
 }
 ul ul,
 ol ol,
 ul ol,
 ol ul {
-        margin-bottom:0;
+        margin-bottom: 0;
 }
 pre,
 kbd,
@@ -188 +186 @@
 h5,
 h6 {
         color: #000;
+        font-weight: normal;
+        line-height: 1.5em;
         margin: 0 0 20px 0;
-        line-height: 1.5em;
-        font-weight: normal;
 }
 h1 {
         font-size: 2.4em;
@@ -212 +210 @@
 }
 table {
         border: 1px solid #e7e7e7 !important;
+        border-collapse: collapse;
+        border-spacing: 0;
+        margin: 0 -1px 24px 0;
         text-align: left;
-        margin: 0 -1px 24px 0;
         width: 100%;
-        border-collapse: collapse;
-        border-spacing: 0;
 }
 tr th,
 thead th {
@@ -232 +230 @@
         border-top: 1px solid #e7e7e7 !important;
         padding: 6px 24px;
 }
-
-
 img {
         margin: 0;
-        max-width: 640px;
 }
+img.size-auto,
+img.size-large,
+img.size-full,
+img.size-medium {
+        max-width: 100%;
+        width: auto;
+        height: auto;
+}
 .alignleft,
 img.alignleft {
         display: inline;
@@ -265 +268 @@
         margin-bottom: 12px;
 }
 .wp-caption {
+        background: #f1f1f1;
         border: none;
-        background: #f1f1f1;
+        -khtml-border-radius: 0;
+        -moz-border-radius: 0;
+        -webkit-border-radius: 0;
+        border-radius: 0;
         color: #888;
         font-size: 12px;
         line-height: 18px;
-        text-align: center;
         margin-bottom: 20px;
+        max-width: 632px !important; /* prevent too-wide images from breaking layout */
         padding: 4px;
-        -moz-border-radius: 0;
-        -khtml-border-radius: 0;
-        -webkit-border-radius: 0;
-        border-radius: 0;
+        text-align: center;
 }
 .wp-caption img {
         margin: 5px;
@@ -285 +289 @@
         margin: 0 0 4px;
 }
 .wp-smiley {
-        margin:0;
+        margin: 0;
 }
+ No newline at end of file