From fcf877606879545674ecee1fc5d9943cfe5650cb Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Mon, 22 Nov 2010 23:52:59 +0000
Subject: [PATCH] Putting .config-page-list (sidebar nav) floating to the right
 as part of the page (instead of floating outside the page content). This
 takes away the dead white space on longer pages by making it grey instead of
 white (previously this made the page look very unorganized and off-grid in
 more narrow windows). This also fixes a layout bug in Safari where the tops
 didn't line up.

---
 includes/installer/WebInstaller.php | 10 +++++-----
 skins/common/config.css             |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 9f4e6da44c..531b45d605 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -469,8 +469,9 @@ class WebInstaller extends CoreInstaller {
 	 * @param $currentPageName String
 	 */
 	private function startPageWrapper( $currentPageName ) {
-		$s = "<div class=\"config-page-wrapper\">\n" .
-			"<div class=\"config-page-list\"><ul>\n";
+		$s = "<div class=\"config-page-wrapper\">\n";
+		$s .= "<div class=\"config-page\">\n";
+		$s .= "<div class=\"config-page-list\"><ul>\n";
 		$lastHappy = -1;
 
 		foreach ( $this->pageSequence as $id => $pageName ) {
@@ -492,9 +493,8 @@ class WebInstaller extends CoreInstaller {
 			$s .= $this->getPageListItem( $pageName, true, $currentPageName );
 		}
 
-		$s .= "</ul></div>\n". // end list pane
-			"<div class=\"config-page\">\n" .
-			Html::element( 'h2', array(),
+		$s .= "</ul></div>\n"; // end list pane
+		$s .= Html::element( 'h2', array(),
 				wfMsg( 'config-page-' . strtolower( $currentPageName ) ) );
 
 		$this->output->addHTMLNoFlush( $s );
diff --git a/skins/common/config.css b/skins/common/config.css
index f322c7a557..efb3604506 100644
--- a/skins/common/config.css
+++ b/skins/common/config.css
@@ -39,14 +39,15 @@
 	float: right;
 	width: 12em;
 	border: 1px solid #aaa;
+	background: #fff;
 	padding: 0.5em;
-	margin: 0.5em;
+	/* 3em left margin to leave space between the list and the page-content */
+	margin: 0.5em 0.5em 0.5em 3.5em;
 }
 
 .config-page {
-	padding: 0.5em 2em 0.5em 2em;
-	/* 15em right margin to leave space for 12em page list */
-	margin: 0.5em 15em 0.5em 0.5em;
+	padding: 0.5em 0.5em 0.5em 2em;
+	margin: 0.5em 0.5em 0.5em 0.5em;
 	background: #eee;
 }
 
-- 
2.20.1