7 files changed, 17 insertions, 17 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 5f23b6300..26fd468b7 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -7,7 +7,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
 <a class="anchor_link" name="comment_<?php echo $vars['annotation']->id; ?>"></a>
-<div class="generic_comment clearfix">
+<div class="generic-comment clearfix">
 	<div class="generic-comment-icon">
 		<?php
 			echo elgg_view("profile/icon", array(
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 4de93cf90..a43ec4fee 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -28,7 +28,7 @@ if($vars['comments']){
 			$url_display = $objecttitle;
 		}
 	
-		echo "<div class='generic_comment latest clearfix'><span class='generic-comment-icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+		echo "<div class='generic-comment latest clearfix'><span class='generic-comment-icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
 		echo "<div class='generic-comment-details'><span class='entity-subtext'><a href=\"".elgg_get_site_url()."pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity-title'>{$url_display}</span> ({$friendlytime})</span></div>";
 		echo "</div>";
 	
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 6fc967bb5..2e6c9c1a7 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -327,7 +327,7 @@ h2 {
 	min-height: 360px;
 	margin:10px 20px 20px 10px;
 }
-#elgg-page-contents.one_column { /* class on #elgg-page-contents when no sidebar */
+#elgg-page-contents.one-column { /* class on #elgg-page-contents when no sidebar */
 	width:970px;
 	margin-right:10px;
 }
@@ -1102,10 +1102,10 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 /* ***************************************
 	CONTENT HEADER
 **************************************** */
-#content_header {
+#content-header {
 	border-bottom:1px solid #CCCCCC;
 }
-#content_header:after {
+#content-header:after {
 	content: ".";
 	display: block;
 	height: 0;
@@ -1136,7 +1136,7 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 /* ***************************************
 	DEFAULT COMMENTS
 **************************************** */
-.generic_comment {
+.generic-comment {
 	border-bottom:1px dotted #cccccc;
 	clear:both;
 	display:block;
@@ -1144,7 +1144,7 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 	padding:5px 0 7px;
 	position:relative;
 }
-.generic_comment:first-child {
+.generic-comment:first-child {
 	border-top:1px dotted #cccccc;
 }
 .generic-comment-icon {
@@ -1177,19 +1177,19 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 	margin-bottom: 10px;
 }
 /* latest comments in sidebar */
-.elgg-aside .generic_comment.latest {
+.elgg-aside .generic-comment.latest {
 	padding:2px 0;
 }
-.elgg-aside .generic_comment.latest .generic-comment-icon  {
+.elgg-aside .generic-comment.latest .generic-comment-icon  {
 	margin-left:1px;
 	margin-top:5px;
 }
-.elgg-aside .generic_comment.latest .generic-comment-details {
+.elgg-aside .generic-comment.latest .generic-comment-details {
 	width:177px;
 	line-height:1.1em;
 	overflow:hidden;
 }
-.elgg-aside .generic_comment.latest .entity-title {
+.elgg-aside .generic-comment.latest .entity-title {
 	font-size: inherit;
 	line-height: inherit;
 }
@@ -1461,14 +1461,14 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 .likes-list-holder a.user-like:hover {
 	background-position: left -131px;
 }
-.likes-list-holder .likes-list_button.link {
+.likes-list-holder .likes-list-button.link {
 	float:left;
 	text-align: left;
 	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -131px;
 	padding-left:21px;
 	height:20px;
 }
-.likes-list-holder .likes-list_button.link.not-liked {
+.likes-list-holder .likes-list-button.link.not-liked {
 	background:none;
 	padding-left:0;
 }
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 0db4b88bb..2db51d991 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -119,7 +119,7 @@ $(document).ready(function () {
 	});
 
 	// user likes
-	$(".likes-list_button").click(function(event) {
+	$(".likes-list-button").click(function(event) {
 		if ($(this).next(".likes-list").css('display') == 'none') {	// show list
 			// hide any other currently viewable likes lists
 			$('.likes-list').fadeOut();
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index b4ced1453..33527b53a 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -29,7 +29,7 @@ if (isset($vars['entity']) && isloggedin()) {
 			$user_string = elgg_echo('likes:userslikedthis');
 		}
 
-		echo "<a class='likes-list_button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
+		echo "<a class='likes-list-button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
 
 		//show the users who liked the object
 		echo "<div class='likes-list hidden clearfix'>";
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 64d122877..8809ad8b7 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -86,7 +86,7 @@ if (isloggedin()) {
 }
 
 echo <<<HTML
-<div id="content_header" class="clearfix">
+<div id="content-header" class="clearfix">
 	$title $new_button
 </div>
 HTML;
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
index 91a4b4976..4cfee9258 100644
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page_elements/content_header_member.php
@@ -18,7 +18,7 @@ $title = elgg_echo($type);
 $title = $name . "'s " . $type;
 ?>
 
-<div id="content_header" class="clearfix">
+<div id="content-header" class="clearfix">
 	<?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>
 </div>