aboutsummaryrefslogtreecommitdiff
path: root/views/default/canvas
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 05:27:47 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 05:27:47 +0000
commit5170cc2b677a9d521dbc2176c6bb1f25efbbc785 (patch)
tree05233623823df1dda4ee9202fb3b11215a281ee7 /views/default/canvas
parent037148770b5bc8c8682d8c992f9fbf490d608a48 (diff)
downloadelgg-5170cc2b677a9d521dbc2176c6bb1f25efbbc785.tar.gz
elgg-5170cc2b677a9d521dbc2176c6bb1f25efbbc785.tar.bz2
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
Diffstat (limited to 'views/default/canvas')
-rw-r--r--views/default/canvas/layouts/administration.php8
-rw-r--r--views/default/canvas/layouts/one_column.php4
-rw-r--r--views/default/canvas/layouts/one_column_with_sidebar.php4
3 files changed, 8 insertions, 8 deletions
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
index 335fb55e5..c8d8e31e4 100644
--- a/views/default/canvas/layouts/administration.php
+++ b/views/default/canvas/layouts/administration.php
@@ -165,7 +165,7 @@ h2 {
border-bottom:1px solid #CCCCCC;
padding-bottom:5px;
}
-.clearfloat:after {
+.clearfix:after {
content: ".";
display: block;
height: 0;
@@ -882,14 +882,14 @@ ul.admin_plugins {
</h2></span>
</div>
-<div id="elgg_content" class="clearfloat admin_area">
+<div id="elgg_content" class="clearfix admin_area">
- <div id="elgg_page_contents" class="clearfloat">
+ <div id="elgg_page_contents" class="clearfix">
<?php
if (isset($vars['area1'])) echo $vars['area1'];
?>
</div>
- <div id="elgg_sidebar" class="clearfloat">
+ <div id="elgg_sidebar" class="clearfix">
<?php
echo elgg_view('page_elements/elgg_sidebar', $vars);
?>
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index e9c2cb113..67366efc6 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -6,8 +6,8 @@
* @subpackage Core
*/
?>
-<div id="elgg_content" class="clearfloat">
- <div id="elgg_page_contents" class="clearfloat one_column">
+<div id="elgg_content" class="clearfix">
+ <div id="elgg_page_contents" class="clearfix one_column">
<?php echo $vars['area1']; ?>
</div>
</div> \ No newline at end of file
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
index b7efee4d0..5b6207a92 100644
--- a/views/default/canvas/layouts/one_column_with_sidebar.php
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -6,14 +6,14 @@
* @subpackage Core
*/
?>
-<div id="elgg_content" class="clearfloat sidebar">
+<div id="elgg_content" class="clearfix sidebar">
<div id="elgg_sidebar">
<?php
echo elgg_view('page_elements/elgg_sidebar', $vars);
?>
</div>
- <div id="elgg_page_contents" class="clearfloat">
+ <div id="elgg_page_contents" class="clearfix">
<?php
if (isset($vars['area1'])) {
echo $vars['area1'];