aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-22 23:27:04 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-22 23:27:04 +0000
commit2fdc9c014a24bd12ca157b626da176b02eb33e9e (patch)
tree19d9415e6b9bdf6e90e4e71e18cf42d4f06a998e
parentbff46f5fb754515aecbe864715e327c18e4b0db3 (diff)
downloadelgg-2fdc9c014a24bd12ca157b626da176b02eb33e9e.tar.gz
elgg-2fdc9c014a24bd12ca157b626da176b02eb33e9e.tar.bz2
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
-rw-r--r--views/default/css/elements/page_layout.php19
-rw-r--r--views/default/page/elements/sidebar_alt.php4
-rw-r--r--views/default/page/layouts/one_column.php4
-rw-r--r--views/default/page/layouts/one_sidebar.php6
-rw-r--r--views/default/page/layouts/two_sidebar.php10
5 files changed, 23 insertions, 20 deletions
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 5dac2127b..553356738 100644
--- 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
index 000000000..41982539e
--- /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 ab6a24878..55e4b204c 100644
--- 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 53f065b3e..d2a0b85c3 100644
--- 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 1e6c2aae7..4e0bab21b 100644
--- 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>