WP Merge with revision 8300

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1360 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 8 insertions, 8 deletions

diff --git a/wp-content/themes/classic/style.css b/wp-content/themes/classic/style.css
index 04f612d..93dc883 100644
--- a/wp-content/themes/classic/style.css
+++ b/wp-content/themes/classic/style.css
@@ -322,7 +322,7 @@ ul.post-meta span.post-meta-key {
 
 /* Captions & aligment */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
@@ -336,7 +336,7 @@ dl.aligncenter {
 	float: right;
 }
 
-.wp_caption {
+.wp-caption {
 	border: 1px solid #ddd;
 	text-align: center;
 	background-color: #f3f3f3;
@@ -348,13 +348,13 @@ dl.aligncenter {
 	border-radius: 3px;
 }
 
-.wp_caption img {
+.wp-caption img {
 	margin: 0;
 	padding: 0;
 	border: 0 none;
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
 	font-size: 11px;
 	line-height: 17px;
 	padding: 0 4px 5px;
diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css
index ba84cb1..7cc120e 100644
--- a/wp-content/themes/default/style.css
+++ b/wp-content/themes/default/style.css
@@ -640,13 +640,13 @@ a img {
 
 /* Captions */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
 }
 
-.wp_caption {
+.wp-caption {
 	border: 1px solid #ddd;
 	text-align: center;
 	background-color: #f3f3f3;
@@ -658,13 +658,13 @@ dl.aligncenter {
 	border-radius: 3px;
 }
 
-.wp_caption img {
+.wp-caption img {
 	margin: 0;
 	padding: 0;
 	border: 0 none;
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
 	font-size: 11px;
 	line-height: 17px;
 	padding: 0 4px 5px;