Fix editor icons when no SCRIPT_DEBUG, see #17144

git-svn-id: http://svn.automattic.com/wordpress/trunk@18503 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/load-styles.php

@@ -125,10 +125,12 @@ foreach( $load as $handle ) {
 		$content .= get_file($rtl_path) . "\n";
 	}
 
-	if ( strpos( $style->src, '/wp-includes/css/' ) === 0 )
-		$out .= str_replace( '../images/', '../wp-includes/images/', $content );
-	else
+	if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) {
+		$content = str_replace( '../images/', '../wp-includes/images/', $content );
+		$out .= str_replace( '../js/tinymce/', '../wp-includes/js/tinymce/', $content );
+	} else {
 		$out .= str_replace( '../images/', 'images/', $content );
+	}
 }
 
 header('Content-Type: text/css');

wp-includes/css/editor-buttons.dev.css

@@ -420,7 +420,7 @@
 .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor,
 .wp_themeSkin .mceSplitButton span.mce_numlist,
 .wp_themeSkin .mceSplitButton span.mce_bullist {
-	background-image: url(../js/tinymce/themes/advanced/img/wpicons.png);
+	background-image: url(../images/wpicons.png);
 }
 
 /* ColorSplitButton */
@@ -866,7 +866,9 @@
 	background: transparent;
 }
 
-.wp_themeSkin .mceButton {
+.wp_themeSkin .mceButton,
+.wp_themeSkin .mceListBox .mceText,
+.wp_themeSkin .mceListBox .mceOpen {
 	border-color: #ccc;
 	background-color: #eee; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
@@ -908,18 +910,6 @@
 	border-color: #ccc !important;
 }
 
-.wp_themeSkin .mceListBox .mceText,
-.wp_themeSkin .mceListBox .mceOpen	{
-	border-color: #ccc;
-	background-color: #eee; /* Fallback */
-	background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
-	background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
-	background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
-	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
-	background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
-	background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
-}
-
 .wp_themeSkin .mceListBox .mceOpen {
 	border-left: 0 !important;
 }

wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css

@@ -35,13 +35,19 @@ input.checkbox {border:1px none #000000; background:transparent; vertical-align:
 	font-size: 11px;
 	width:94px; 
 	height:24px;
-	background:url(img/fade-butt.png) 0 0;
 	color:#000;
 	cursor:pointer;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
+	background-color: #eee; /* Fallback */
+	background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
+	background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
+	background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
+	background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
+	background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
+	background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
 }
 #insert:hover, #cancel:hover, input.mceButton:hover, .updateButton:hover,
 #insert:focus, #cancel:focus, input.mceButton:focus, .updateButton:focus {
@@ -114,4 +120,4 @@ h3 {font-size:14px;}
 #colorpicker #namedcolors {width:150px;}
 #colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
 #colorpicker #colornamecontainer {margin-top:5px;}
-#colorpicker #picker_panel fieldset {margin:auto;width:325px;}
+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}