From 5170cc2b677a9d521dbc2176c6bb1f25efbbc785 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Nov 2010 05:27:47 +0000
Subject: Fixes #2440: Converted clearfloat to clearfix, brought back orig
 clearfloat

git-svn-id: http://code.elgg.org/elgg/trunk@7223 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/riverdashboard/endpoint/get_comments.php                    | 2 +-
 mod/riverdashboard/views/default/river/item/list.php            | 2 +-
 mod/riverdashboard/views/default/river/item/wrapper.php         | 8 ++++----
 mod/riverdashboard/views/default/river/item/wrapper_classic.php | 2 +-
 mod/riverdashboard/views/default/riverdashboard/nav.php         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'mod/riverdashboard')

diff --git a/mod/riverdashboard/endpoint/get_comments.php b/mod/riverdashboard/endpoint/get_comments.php
index cc210b126..22d89bcfd 100644
--- a/mod/riverdashboard/endpoint/get_comments.php
+++ b/mod/riverdashboard/endpoint/get_comments.php
@@ -25,7 +25,7 @@ foreach ($comments as $comment) {
 	$comment_owner_url = $comment_owner->getURL();
 
 	//display comment
-	echo "<div class='river_comment clearfloat'>";
+	echo "<div class='river_comment clearfix'>";
 	echo "<span class='river_comment_owner_icon'>";
 	echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
 	echo "</span>";
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
index e980f5dbd..a0f547e45 100644
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -48,7 +48,7 @@ if ($vars['pagination'] !== false) {
 	}
 
 	if (!empty($nav)) {
-		echo '<div class="pagination clearfloat">'.$nav.'</div>';
+		echo '<div class="pagination clearfix">'.$nav.'</div>';
 	}
 }
 
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index cd474df2a..98c240de5 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -46,7 +46,7 @@ if ($comment_count < 3) {
 		<?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
 	</span>
 
-	<div class="river_item_contents clearfloat">
+	<div class="river_item_contents clearfix">
 <?php
 
 // body contents, generated by the river view in each plugin
@@ -56,7 +56,7 @@ echo $vars['body'];
 if ($comments){
 	$counter = 0;
 
-	echo "<div class='river_comments_tabs clearfloat'>";
+	echo "<div class='river_comments_tabs clearfix'>";
 	echo "<a class='river_more_comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
 
 	if ($likes_count != 0) {
@@ -95,7 +95,7 @@ if ($comments){
 			$alt = 'penultimate';
 		}
 		//display comment
-		echo "<div class='river_comment $alt clearfloat'>";
+		echo "<div class='river_comment $alt clearfix'>";
 		echo "<span class='river_comment_owner_icon'>";
 		echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
 		echo "</span>";
@@ -115,7 +115,7 @@ if ($comments){
 } else {
 	// tab bar nav - for users that liked object
 	if ($vars['item']->type != 'user' && $likes_count != 0) {
-		echo "<div class='river_comments_tabs clearfloat'>";
+		echo "<div class='river_comments_tabs clearfix'>";
 	}
 
 	if ($likes_count != 0) {
diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
index 384beef4d..60568642a 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
@@ -12,7 +12,7 @@
 echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));
 ?>
 	</span>
-	<div class="river_item_contents clearfloat">
+	<div class="river_item_contents clearfix">
 <?php
 echo $vars['body'];
 ?>
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index f5e016b47..820ebb5ae 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -54,4 +54,4 @@ switch($vars['orient']) {
 	?>
 	<input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
 </div>
-<div id="riverdashboard_updates" class="clearfloat"></div>
+<div id="riverdashboard_updates" class="clearfix"></div>
-- 
cgit v1.2.3