From bb04e23b5bd8490bc1daa0d08ed79e10f8d1886a Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 3 Dec 2010 00:56:29 +0000 Subject: Refs #2700 completed the _ to - conversion for screen.css (leaves admin.css and plugin css) git-svn-id: http://code.elgg.org/elgg/trunk@7506 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/annotation/generic_comment.php | 2 +- views/default/annotation/latest_comments.php | 2 +- views/default/css/screen.php | 22 +++++++++++----------- views/default/js/initialise_elgg.php | 2 +- views/default/likes/forms/edit.php | 2 +- views/default/page_elements/content_header.php | 2 +- .../page_elements/content_header_member.php | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'views') 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); ?> -
+
" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . ""; + echo "
" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . ""; echo "
username}\">{$comment_owner->name} " . elgg_echo('on') . " {$url_display} ({$friendlytime})
"; echo "
"; 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(_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 ""; + echo ""; //show the users who liked the object echo "