From 841cda2d1ac8b3ac31ac194fcfe2af4d2dcc30f6 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 25 Apr 2012 19:54:04 +0000
Subject: [PATCH] Remove monospace from TinyMCE caption/alignment image edit
 popup. see #18311.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../js/tinymce/plugins/wpeditimage/css/editimage.css        | 4 ----
 wp-includes/js/tinymce/plugins/wpeditimage/editimage.html   | 6 +++---
 wp-includes/version.php                                     | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css b/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css
index f071fd06fc..97250ef6cc 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css
@@ -357,10 +357,6 @@ div#media-upload-error {
 	color: #CFCFCF;
 }
 
-#img-edit #img_cap_text {
-	font: normal 12px/18px monospace;
-}
-
 .hidden {
 	display: none;
 }
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
index 886cd941e1..b584461be9 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
@@ -4,9 +4,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title></title>
 
-<link rel="stylesheet" href="css/editimage.css?ver=348" type="text/css" media="all" />
-<script type="text/javascript" src="js/editimage.js?ver=348"></script>
-<script type="text/javascript" src="../../utils/form_utils.js?ver=348"></script>
+<link rel="stylesheet" href="css/editimage.css?ver=349-20592" type="text/css" media="all" />
+<script type="text/javascript" src="js/editimage.js?ver=349-20592"></script>
+<script type="text/javascript" src="../../utils/form_utils.js?ver=349-20592"></script>
 <base target="_self" />
 </head>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 79556349d2..6150e072ed 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -18,7 +18,7 @@ $wp_db_version = 20148;
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '349-20521';
+$tinymce_version = '349-20592';
 
 /**
  * Holds the cache manifest version