]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7747c44)
Fixes #3057 page wrapper now sets the margin so messages don't end up in far left
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 10 Mar 2011 01:42:32 +0000 (01:42 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 10 Mar 2011 01:42:32 +0000 (01:42 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8644 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/css/admin.php patch | blob | history
views/default/page/admin.php patch | blob | history

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 5d921021a89d83a2b44f0b44cd9ee097e4da7c66..00503a91638aa7faa447adfb29e5c3d3377f81dd 100644 (file)
--- 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 0738991d3cd594bc095154ad75bd3d8187dcadf0..93985a9f21fc270f0c9fbf4edda44c86609416d5 100644 (file)
--- 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>
Social Networking Engine