Trying to simplify layout css:

nixed elgg-aside
.elgg-sidebar.elgg-alt => .elgg-sidebar-alt (similar to .elgg-image-alt)

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

diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 5dac2127b998a5acd1ed3f99249a37f18b12e400..553356738bc1fffcc32579d0dfd48c10f53f2437 100644 (file)
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -91,33 +91,32 @@
 }
 
 /***** PAGE BODY ******/
-.elgg-page-body > .elgg-inner {
+.elgg-layout {
        min-height: 360px;
 }
-#elgg-layout-one-column {
+.elgg-layout-one-column {
        padding: 10px 0;
 }
-#elgg-layout-sidebar {
+.elgg-layout-one-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;
 }
-.elgg-aside {
-       padding: 20px 10px;
-       position: relative;
-       min-height: 360px;
-}
 .elgg-sidebar {
+       position: relative;
+       padding: 20px 10px;
        float: right;
        width: 210px;
        margin: 0 0 0 10px;
 }
-.elgg-sidebar.elgg-alt {
+.elgg-sidebar-alt {
+       position: relative;
+       padding: 20px 10px;
        float: left;
        width: 160px;
        margin: 0 10px 0 0;

diff --git a/views/default/page/elements/sidebar_alt.php b/views/default/page/elements/sidebar_alt.php
new file mode 100644 (file)
index 0000000..4198253
--- /dev/null
+++ b/views/default/page/elements/sidebar_alt.php
@@ -0,0 +1,4 @@
+<?php 
+/**
+ * Elgg secondary sidebar contents
+ */

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

diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index 53f065b3e7afc3fc90eacf9242d421da3b0fba7c..d2a0b85c3c3c089618414a87e8e1ab29ac28a2a4 100644 (file)
--- a/views/default/page/layouts/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
@@ -11,15 +11,15 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-sidebar elgg-inner clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }
 
 ?>
 
-<div class="<?php echo $class; ?>" id="elgg-layout-sidebar">
-       <div class="elgg-sidebar elgg-aside">
+<div class="<?php echo $class; ?>">
+       <div class="elgg-sidebar">
                <?php
                        echo elgg_view('page/elements/sidebar', $vars);
                ?>

diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php
index 1e6c2aae76358ab4967c47e548300bbc74487730..4e0bab21b417658e112f858f82514e310c707e93 100644 (file)
--- a/views/default/page/layouts/two_sidebar.php
+++ b/views/default/page/layouts/two_sidebar.php
@@ -11,26 +11,26 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-two-sidebar clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }
 ?>
 
-<div class="<?php echo $class; ?>" id="elgg-layout-two-sidebar">
-       <div class="elgg-sidebar elgg-aside">
+<div class="<?php echo $class; ?>">
+       <div class="elgg-sidebar">
                <?php
                        echo elgg_view('page/elements/sidebar', $vars);
                ?>
        </div>
-       <div class="elgg-sidebar elgg-alt elgg-aside">
+       <div class="elgg-sidebar-alt">
                <?php
                        //$params = $vars;
                        //$params['sidebar'] = $vars['sidebar_alt'];
                        $params = array(
                                'sidebar' => elgg_view_module('test', 'Testing', 'Hello, world!'),
                        );
-                       echo elgg_view('page/elements/sidebar', $params);
+                       echo elgg_view('page/elements/sidebar_alt', $params);
                ?>
        </div>