diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-10 01:42:32 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-10 01:42:32 +0000 |
| commit | 2c449ba169b5bb342eda70d3c834f7b6a2c32493 (patch) | |
| tree | c3b951d56855a99f5fff97c2d01e3c8f08c91c2b | |
| parent | 7747c4490db18fbefa9e2bb9ca7d9a3f6594d038 (diff) | |
| download | elgg-2c449ba169b5bb342eda70d3c834f7b6a2c32493.tar.gz elgg-2c449ba169b5bb342eda70d3c834f7b6a2c32493.tar.bz2 | |
Fixes #3057 page wrapper now sets the margin so messages don't end up in far left
git-svn-id: http://code.elgg.org/elgg/trunk@8644 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/css/admin.php | 34 | ||||
| -rw-r--r-- | views/default/page/admin.php | 32 |
2 files changed, 37 insertions, 29 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 5d921021a..00503a916 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -149,17 +149,20 @@ table.mceLayout { .center { text-align: center; } - /* *************************************** - HEADER + PAGE WRAPPER *************************************** */ -.elgg-page-header { +.elgg-page > .elgg-inner { margin: 0 auto; padding: 20px 40px 0; min-width: 800px; max-width: 1600px; } -.elgg-page-header > .elgg-inner { + +/* *************************************** + HEADER +*************************************** */ +.elgg-page-header { background-color: #111111; border: 1px solid #999999; padding: 20px 20px; @@ -204,7 +207,7 @@ table.mceLayout { } .elgg-page-messages { - padding: 20px 40px 0; + padding: 20px 0 0; width: 500px; margin-bottom: -10px; } @@ -221,10 +224,7 @@ table.mceLayout { BODY *************************************** */ .elgg-page-body { - margin: 0 auto; - padding: 20px 40px; - min-width: 800px; - max-width: 1600px; + padding: 20px 0; } .elgg-main { background-color: #ffffff; @@ -249,13 +249,19 @@ table.mceLayout { FOOTER *************************************** */ .elgg-page-footer { - background-color: black; - height: 100%; + background-color: #111111; + border: 1px solid #999999; + padding: 10px 20px; } -.elgg-page-footer > .elgg-inner { - margin: 0 auto; - padding: 10px 40px; +.elgg-page-footer a { + color: #dddddd; + font-weight: bold; + text-decoration: none; } +.elgg-page-footer a:hover { + text-decoration: underline; +} + /* *************************************** SIDEBAR MENU diff --git a/views/default/page/admin.php b/views/default/page/admin.php index 0738991d3..93985a9f2 100644 --- a/views/default/page/admin.php +++ b/views/default/page/admin.php @@ -32,23 +32,25 @@ if ($notices = elgg_get_admin_notices()) { </head> <body> <div class="elgg-page elgg-page-admin"> - <div class="elgg-page-header"> - <div class="elgg-inner clearfix"> - <?php echo elgg_view('admin/header'); ?> + <div class="elgg-inner"> + <div class="elgg-page-header"> + <div class="elgg-inner clearfix"> + <?php echo elgg_view('admin/header'); ?> + </div> </div> - </div> - <div class="elgg-page-messages"> - <?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?> - <?php echo $notices_html; ?> - </div> - <div class="elgg-page-body"> - <div class="elgg-inner"> - <?php echo $vars['body']; ?> + <div class="elgg-page-messages"> + <?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?> + <?php echo $notices_html; ?> </div> - </div> - <div class="elgg-page-footer"> - <div class="elgg-inner"> - <?php echo elgg_view('admin/footer'); ?> + <div class="elgg-page-body"> + <div class="elgg-inner"> + <?php echo $vars['body']; ?> + </div> + </div> + <div class="elgg-page-footer"> + <div class="elgg-inner"> + <?php echo elgg_view('admin/footer'); ?> + </div> </div> </div> </div> |