Moved elgg-inner out of layouts and into the page shell

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

3 files changed, 5 insertions, 3 deletions

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index aa8581a74..ba09071f7 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -43,7 +43,9 @@ if (count_messages()) {
 			<?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?>
 		</div>
 		<div class="elgg-page-body">
-			<?php echo $vars['body']; ?>
+			<div class="elgg-inner">
+				<?php echo $vars['body']; ?>
+			</div>
 		</div>
 		<div class="elgg-page-footer">
 			<div class="elgg-inner">
diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php
index 55e4b204c..c59a574e7 100644
--- a/views/default/page/layouts/one_column.php
+++ b/views/default/page/layouts/one_column.php
@@ -9,7 +9,7 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout elgg-layout-one-column elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-column clearfix';
 if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }
diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index d2a0b85c3..1e308f979 100644
--- a/views/default/page/layouts/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
@@ -11,7 +11,7 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout elgg-layout-one-sidebar elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-sidebar clearfix';
 if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }