Changeset 8289

Timestamp:

07/08/2008 11:37:56 PM (16 years ago)

Author:

ryan

Message:

Use dash instead of underscore for CSS names. Props azaozz. see #6812

Location:

trunk

Files:

• wp-content/themes/classic/style.css (modified) (4 diffs)
• wp-content/themes/default/style.css (modified) (4 diffs)
• wp-includes/media.php (modified) (2 diffs)

trunk/wp-content/themes/classic/style.css

@@ -323 +323 @@
 /* Captions & aligment */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
     display: block;
     margin-left: auto;
@@ -337 +337 @@
 }
 
-.wp_caption {
+.wp-caption {
     border: 1px solid #ddd;
     text-align: center;
@@ -349 +349 @@
 }
 
-.wp_caption img {
+.wp-caption img {
     margin: 0;
     padding: 0;
@@ -355 +355 @@
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
     font-size: 11px;
     line-height: 17px;

trunk/wp-content/themes/default/style.css

@@ -641 +641 @@
 /* Captions */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
     display: block;
     margin-left: auto;
@@ -647 +647 @@
 }
 
-.wp_caption {
+.wp-caption {
     border: 1px solid #ddd;
     text-align: center;
@@ -659 +659 @@
 }
 
-.wp_caption img {
+.wp-caption img {
     margin: 0;
     padding: 0;
@@ -665 +665 @@
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
     font-size: 11px;
     line-height: 17px;

trunk/wp-includes/media.php

@@ -351 +351 @@
 }
 
-add_shortcode('wp_caption', 'wp_caption_shortcode');
-
-function wp_caption_shortcode($attr, $content = null) {
+add_shortcode('wp_caption', 'img_caption_shortcode');
+
+function img_caption_shortcode($attr, $content = null) {
     
     // Allow plugins/themes to override the default caption template.
-    $output = apply_filters('wp_caption_shortcode', '', $attr, $content);
+    $output = apply_filters('img_caption_shortcode', '', $attr, $content);
     if ( $output != '' )
         return $output;
@@ -372 +372 @@
     if ( $id ) $id = 'id="' . $id . '" ';
     
-    return '<dl ' . $id . 'class="wp_caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
-    . '<dt class="wp_caption_dt">' . $content . '</dt><dd class="wp_caption_dd">' . $caption . '</dd></dl>';
+    return '<div ' . $id . 'class="wp-caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
+    . $content . '<p class="wp-caption-text">' . $caption . '</p></div>';
 }