golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@8289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-07-08 23:37:56 +00:00
parent 4cd0c96d03
commit 8a37dfa5b2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-content/themes/classic/style.css
View File

@ -322,7 +322,7 @@ ul.post-meta span.post-meta-key {
/* Captions & aligment */ /* Captions & aligment */
.aligncenter, .aligncenter,
dl.aligncenter { div.aligncenter {
display: block; display: block;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -336,7 +336,7 @@ dl.aligncenter {
float: right; float: right;
} }
.wp_caption { .wp-caption {
border: 1px solid #ddd; border: 1px solid #ddd;
text-align: center; text-align: center;
background-color: #f3f3f3; background-color: #f3f3f3;
@ -348,13 +348,13 @@ dl.aligncenter {
border-radius: 3px; border-radius: 3px;
} }
.wp_caption img { .wp-caption img {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0 none; border: 0 none;
} }
.wp_caption_dd { .wp-caption p.wp-caption-text {
font-size: 11px; font-size: 11px;
line-height: 17px; line-height: 17px;
padding: 0 4px 5px; padding: 0 4px 5px;

8
wp-content/themes/default/style.css
View File

@ -640,13 +640,13 @@ a img {
/* Captions */ /* Captions */
.aligncenter, .aligncenter,
dl.aligncenter { div.aligncenter {
display: block; display: block;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.wp_caption { .wp-caption {
border: 1px solid #ddd; border: 1px solid #ddd;
text-align: center; text-align: center;
background-color: #f3f3f3; background-color: #f3f3f3;
@ -658,13 +658,13 @@ dl.aligncenter {
border-radius: 3px; border-radius: 3px;
} }
.wp_caption img { .wp-caption img {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0 none; border: 0 none;
} }
.wp_caption_dd { .wp-caption p.wp-caption-text {
font-size: 11px; font-size: 11px;
line-height: 17px; line-height: 17px;
padding: 0 4px 5px; padding: 0 4px 5px;

10
wp-includes/media.php
View File

@ -350,12 +350,12 @@ function wp_get_attachment_image($attachment_id, $size='thumbnail', $icon = fals
return $html; return $html;
} }
add_shortcode('wp_caption', 'wp_caption_shortcode'); add_shortcode('wp_caption', 'img_caption_shortcode');
function wp_caption_shortcode($attr, $content = null) { function img_caption_shortcode($attr, $content = null) {
// Allow plugins/themes to override the default caption template. // 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 != '' ) if ( $output != '' )
return $output; return $output;
@ -371,8 +371,8 @@ function wp_caption_shortcode($attr, $content = null) {
if ( $id ) $id = 'id="' . $id . '" '; if ( $id ) $id = 'id="' . $id . '" ';
return '<dl ' . $id . 'class="wp_caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">' return '<div ' . $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>'; . $content . '<p class="wp-caption-text">' . $caption . '</p></div>';
} }
add_shortcode('gallery', 'gallery_shortcode'); add_shortcode('gallery', 'gallery_shortcode');