aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-05 03:14:46 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-05 03:14:46 +0000
commit059515703b680040a3a256c54f14252c2d41ce82 (patch)
tree6b27a6562b49054adf9037e1b2b81ca04e74b29c
parenta05e685b79a3c0978972eeb296d1b22800ff2114 (diff)
downloadelgg-059515703b680040a3a256c54f14252c2d41ce82.tar.gz
elgg-059515703b680040a3a256c54f14252c2d41ce82.tar.bz2
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
-rw-r--r--views/default/css/admin.php4
-rw-r--r--views/default/layout/shells/admin.php24
2 files changed, 12 insertions, 16 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 99ac0f455..de421c124 100644
--- 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 0d0fd2c3f..fe4477158 100644
--- 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