removed unecessary inner div for .elgg-main because of switch back to overflow: hidden

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

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 99ac0f455b8e4fd7900884a71bc59f845faea640..de421c12482589ab7a21b8ccd8f8966df0d5aa44 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -230,8 +230,6 @@ table.mceLayout {
        border: 1px solid #cccccc;
        padding: 20px;
        position: relative;
-}
-.elgg-main > .elgg-inner {
        min-height: 400px;
 }
 .elgg-sidebar {
@@ -239,7 +237,7 @@ table.mceLayout {
        float: right;
        margin-left: 30px;
 }
-.elgg-main > .elgg-inner > .elgg-head {
+.elgg-main > .elgg-head {
        margin-bottom: 10px;
 }
 .elgg-main h2 {

diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php
index 0d0fd2c3f3df32106ed8cfd18b09fd38f02f5960..fe447715861526a73346aaf4c63d36dc8aaed108 100644 (file)
--- a/views/default/layout/shells/admin.php
+++ b/views/default/layout/shells/admin.php
@@ -46,20 +46,18 @@ $logout = elgg_view('output/url', array(
                ?>
        </div>
        <div class="elgg-main elgg-body">
-               <div class="elgg-inner">
-                       <div class="elgg-head">
-                       <?php
-                               if (isset($vars['title'])) {
-                                       echo elgg_view_title($vars['title']);
-                               }
-                       ?>
-                       </div>
-                       <?php
-                               if (isset($vars['content'])) {
-                                       echo $vars['content'];
-                               }
-                       ?>
+               <div class="elgg-head">
+               <?php
+                       if (isset($vars['title'])) {
+                               echo elgg_view_title($vars['title']);
+                       }
+               ?>
                </div>
+               <?php
+                       if (isset($vars['content'])) {
+                               echo $vars['content'];
+                       }
+               ?>
        </div>
 </div>
 <div class="elgg-page-footer"></div>
\ No newline at end of file