more cleanup of the basic layout css

git-svn-id: http://code.elgg.org/elgg/trunk@7500 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 25 insertions, 8 deletions

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 2c7ed27c8..596da1b24 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -241,10 +241,11 @@ h2 {
 
 .elgg-width-classic {
 	width: 990px;
-	/* temp until layout css is sorted */
+	/* temp until layout css is sorted 
 	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
 	background-repeat:repeat-y;
 	background-position: right top;
+*/
 }
 
 /* ***************************************
@@ -303,6 +304,22 @@ h2 {
 	background-repeat:repeat-y;
 	background-position: right top;
 }
+.elgg-layout > .elgg-body {
+	float:left;
+	width:730px;
+	position: relative;
+	min-height: 360px;
+	margin:10px 20px 20px 10px;
+}
+.elgg-layout > .elgg-aside {
+	background-color:#eeeeee;
+	border-left:1px solid #DEDEDE;
+	float:right;
+	width:209px;
+	padding:20px 10px;
+	position: relative;
+	min-height:360px;
+}
 #elgg-page-contents { /* main page contents */
 	float:left;
 	width:730px;
@@ -315,16 +332,16 @@ h2 {
 	margin-right:10px;
 }
 .elgg-aside { /* elgg sidebar */
-	float:right;
-	width:210px;
-	margin:20px 10px;
-	position: relative;
-	min-height:360px;
+
 }
 .elgg-footer {
 	position: relative;
 	z-index: 999;
 }
+.elgg-footer > .elgg-inner {
+	border-top:1px solid #DEDEDE;
+	padding:3px 0 10px 0;
+}
 #elgg-footer-contents {
 	border-top:1px solid #DEDEDE;
 	margin:0 auto;
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php
index f2c70a02a..4d99a9308 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layouts/one_column_with_sidebar.php
@@ -16,7 +16,7 @@
 		?>
 	</div>
 	
-	<div id="elgg-page-contents" class="elgg-body clearfix">
+	<div class="elgg-body">
 		<?php
 			// @todo deprecated so remove in Elgg 2.0
 			if (isset($vars['area1'])) {
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 66509ba84..8262c4d58 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -10,7 +10,7 @@
 
 ?>
 <div class="elgg-footer">
-	<div id="elgg-footer-contents" class="clearfix">
+	<div class="elgg-inner elgg-center elgg-width-classic">
 		<?php echo elgg_view('footer/links'); ?>
 		<a href="http://www.elgg.org" class="powered-by-elgg-badge">
 			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />