adjusted page body css to use top level class to determine width and centering

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

diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/skin.php
index a37b5a5842c6aadcc0dafd9593e46c0594adbdcf..9e5fbe9ff0c7eac0e813afeb02993ab1004ac198 100644 (file)
--- a/views/default/css/elements/skin.php
+++ b/views/default/css/elements/skin.php
@@ -39,13 +39,7 @@ a.selected {
        height: 24px;
        z-index: 9000;
 }
-.elgg-page-header .elgg-inner {
-       width: 990px;
-       margin: 0 auto;
-       height: 90px;
-       position: relative;
-}
-.elgg-page-topbar .elgg-inner {
+.elgg-page-topbar > .elgg-inner {
        padding: 2px 10px 2px 8px;
 }
 .elgg-page-topbar a {
@@ -77,6 +71,12 @@ a.selected {
        background-repeat: repeat-x;
        background-position: bottom left;
 }
+.elgg-classic .elgg-page-header > .elgg-inner {
+       width: 990px;
+       margin: 0 auto;
+       height: 90px;
+       position: relative;
+}
 .elgg-page-header h1 a {
        font-size: 2em;
        line-height: 1.4em;
@@ -89,15 +89,19 @@ a.selected {
 
 /***** PAGE BODY ******/
 
-.elgg-layout-one_column {
+.elgg-classic .elgg-page-body > .elgg-inner {
+       width: 990px;
+       margin: 0 auto;
+}
+#elgg-layout-one-column {
        padding: 10px 0;
 }
-.elgg-layout-sidebar {
+#elgg-layout-sidebar {
        background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
        background-repeat: repeat-y;
        background-position: right top;
 }
-.elgg-layout-two-sidebar {
+#elgg-layout-two-sidebar {
        background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif);
        background-repeat: repeat-y;
        background-position: right top;
@@ -149,7 +153,7 @@ a.selected {
        position: relative;
        z-index: 999;
 }
-.elgg-page-footer .elgg-inner {
+.elgg-classic .elgg-page-footer > .elgg-inner {
        width: 990px;
        margin: 0 auto;
        padding: 5px 0;

diff --git a/views/default/layout/shells/one_column.php b/views/default/layout/shells/one_column.php
index ff0070e183ab83ac6b4ee974e1ea376340d17a60..ab6a248785cea1cd6517a32234694abe8f958a92 100644 (file)
--- a/views/default/layout/shells/one_column.php
+++ b/views/default/layout/shells/one_column.php
@@ -9,12 +9,12 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout-one-column elgg-center elgg-width-classic clearfix';
+$class = 'elgg-inner clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }
 ?>
-<div class="<?php echo $class; ?>">
+<div class="<?php echo $class; ?>" id="elgg-layout-one-column">
        <div class="elgg-body">
        <?php echo $vars['content']; ?>
        <?php

diff --git a/views/default/layout/shells/one_sidebar.php b/views/default/layout/shells/one_sidebar.php
index ed7700f5a32d3da3cdf41d4a8386228f6fd29e9a..00c661e2f17094329d31782ac76b0ae2a1602f3e 100644 (file)
--- a/views/default/layout/shells/one_sidebar.php
+++ b/views/default/layout/shells/one_sidebar.php
@@ -11,14 +11,14 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout-sidebar elgg-center elgg-width-classic clearfix';
+$class = 'elgg-inner clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }
 
 ?>
 
-<div class="<?php echo $class; ?>">
+<div class="<?php echo $class; ?>" id="elgg-layout-sidebar">
        <div class="elgg-sidebar elgg-aside">
                <?php
                        echo elgg_view('layout/elements/sidebar', $vars);

diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index 23a5a9dd4a11088bb9571ef214c79bf53538f3b2..5a033e0917f79e97336582f211034550a770047e 100644 (file)
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -11,13 +11,13 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout-two-sidebar elgg-center elgg-width-classic clearfix';
+$class = 'elgg-inner clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }
 ?>
 
-<div class="<?php echo $class; ?>">
+<div class="<?php echo $class; ?>" id="elgg-layout-two-sidebar">
        <div class="elgg-sidebar elgg-aside">
                <?php
                        echo elgg_view('layout/elements/sidebar', $vars);