Merge branch 'master' of github.com:johnbintz/comicpress-2.8

This commit is contained in:
Philip M. Hofer (Frumph) 2009-11-30 13:28:34 -08:00
commit 06ff53ea54
2 changed files with 20 additions and 12 deletions

View File

@ -116,9 +116,9 @@
$post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null; $post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null;
} }
} }
if ('open' == $post->comment_status) {
comments_template('', true); comments_template('', true);
}
?> ?>
<?php else: ?> <?php else: ?>

View File

@ -605,7 +605,7 @@ h3, h3 a {
.comment .comment .comment { .comment .comment .comment {
margin-left: 45px; margin-left: 45px;
} }
.comment-avatar { .comment-avatar {
width: 80px; width: 80px;
height: 80px; height: 80px;
@ -622,7 +622,23 @@ h3, h3 a {
width: 40px; width: 40px;
height: 40px; height: 40px;
} }
.comment-content {
margin-left: 90px;
}
.comment .comment .comment-content {
margin-left: 45px;
}
.pingback .comment-content {
margin-left: 0;
}
.trackback .comment-content {
margin-left: 0;
}
.comment-author cite { .comment-author cite {
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
@ -654,14 +670,6 @@ h3, h3 a {
font-size: 15px; font-size: 15px;
} }
.comment-content {
margin-left: 90px;
}
.comment .comment .comment-content {
margin-left: 45px;
}
.comment-text p { .comment-text p {
padding: 5px 0 0 0; padding: 5px 0 0 0;
margin: 0; margin: 0;