aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-08 03:35:22 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-08 03:35:22 +0000
commit559c16cbf249103a6221b2e32f00a52fbaa2b50f (patch)
tree058eb264aeb5106b7be7ef098e0a961db34551eb
parentcf62b99ccb5ebf7a50ca1ac113fdb9e244653200 (diff)
downloadelgg-559c16cbf249103a6221b2e32f00a52fbaa2b50f.tar.gz
elgg-559c16cbf249103a6221b2e32f00a52fbaa2b50f.tar.bz2
using the generic .elgg-inner class on topbar, header, and footer
git-svn-id: http://code.elgg.org/elgg/trunk@7564 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/default/css/screen.php27
-rw-r--r--views/default/page/elements/footer.php2
-rw-r--r--views/default/page/elements/header.php2
-rw-r--r--views/default/page/elements/topbar.php2
-rw-r--r--views/default/page/shells/default.php2
5 files changed, 21 insertions, 14 deletions
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index a41736190..3ca9022b6 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -266,6 +266,14 @@ h2 {
background-repeat: repeat-x;
background-position: bottom left;
}
+
+.elgg-page-header .elgg-inner {
+ width: 990px;
+ margin: 0 auto;
+ height: 90px;
+ position: relative;
+}
+
.elgg-page-footer {
position: relative;
z-index: 999;
@@ -653,25 +661,24 @@ li.navigation-more ul li {
FOOTER CONTENTS
*************************************** */
-.elgg-page-footer-inner {
+.elgg-page-footer .elgg-inner {
+ width: 990px;
+ margin: 0 auto;
padding: 5px 0;
- border-top:1px solid #DEDEDE;
+ border-top: 1px solid #DEDEDE;
}
-#elgg-footer-contents,
-#elgg-footer-contents a,
-#elgg-footer-contents p {
+.elgg-page-footer .elgg-inner,
+.elgg-page-footer .elgg-inner a,
+.elgg-page-footer .elgg-inner p {
color:#999999;
}
-#elgg-footer-contents a:hover {
+.elgg-page-footer .elgg-inner a:hover {
color:#666666;
}
-.#elgg-footer-contents p {
+.elgg-page-footer .elgg-inner p {
margin:0;
}
-.powered-by-elgg-badge {
- float:right;
-}
/* ***************************************
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 6c9cdc55e..4a8220312 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -10,7 +10,7 @@
?>
<div class="elgg-page-footer">
- <div class="elgg-page-footer-inner elgg-center elgg-width-classic clearfix">
+ <div class="elgg-inner clearfix">
<?php echo elgg_view('footer/links'); ?>
<a href="http://www.elgg.org" class="right">
<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 148279b2e..efef1e09f 100644
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -6,7 +6,7 @@
?>
<div class="elgg-page-header">
- <div class="elgg-page-header-inner elgg-center elgg-width-classic">
+ <div class="elgg-inner">
<?php
// link back to main site.
echo elgg_view('page/elements/header_logo', $vars);
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 75df5fa93..3a4507208 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -7,7 +7,7 @@
$user = get_loggedin_user();
if (($user instanceof ElggUser) && ($user->guid > 0)) {
echo '<div class="elgg-page-topbar">';
- echo '<div class="elgg-page-topbar-inner">';
+ echo '<div class="elgg-inner">';
// Elgg logo
echo '<a href="http://www.elgg.org">';
diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php
index 080bc7099..0d0c2e074 100644
--- a/views/default/page/shells/default.php
+++ b/views/default/page/shells/default.php
@@ -26,7 +26,7 @@ if (empty($vars['title'])) {
echo elgg_view('page/elements/html_begin', $vars);
-echo '<div class="elgg-page">';
+echo '<div class="elgg-page elgg-classic">';
echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
echo elgg_view('page/elements/topbar', $vars);
echo elgg_view('page/elements/header', $vars);