From 288c42cb6d7561e95a06bc36af3b9507574559df Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Sun, 23 Dec 2007 02:41:28 +0000
Subject: [PATCH] Revert extraneous parts of last commit, I didn't mean to
 check in cruddy half-finished garbage on edit section links that I was about
 to throw out anyway.

---
 includes/DefaultSettings.php |  2 +-
 includes/Linker.php          |  6 +-----
 skins/common/oldshared.css   | 22 ++++++++++++++++++++++
 skins/common/shared.css      |  6 ++++++
 skins/monobook/IE50Fixes.css |  1 +
 skins/monobook/IE55Fixes.css |  6 ------
 skins/monobook/IE60Fixes.css |  5 +----
 skins/monobook/main.css      | 13 ++++++++-----
 8 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 50b2e6fafd..f066a119b4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1246,7 +1246,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '105';
+$wgStyleVersion = '104';
 
 
 # Server-side caching:
diff --git a/includes/Linker.php b/includes/Linker.php
index 6c69773936..17e988b4db 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1225,11 +1225,7 @@ class Linker {
 	 * @return string HTML headline
 	 */
 	public function makeHeadline( $level, $attribs, $anchor, $text, $link ) {
-		# See related bugs 1629, 11270, 11555.
-		return "<a name=\"$anchor\"></a>
-<div class=\"mw-h$level\">
-	<h$level$attribs$text</h$level> $link
-</div>";
+		return "<a name=\"$anchor\"></a><h$level$attribs$link <span class=\"mw-headline\">$text</span></h$level>";
 	}
 
 	/**
diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css
index 4559cd32ed..ead422dc78 100644
--- a/skins/common/oldshared.css
+++ b/skins/common/oldshared.css
@@ -4,6 +4,28 @@
  * CologneBlue, the old pre-Monobook skins
  */
 
+/* For clarity, explicitly state some recommendations from <http://www.w3.org/
+   TR/CSS21/sample.html> to make sure the editsection links scale right */
+
+h1 { font-size: 2em; }
+h2 { font-size: 1.5em; }
+h3 { font-size: 1.17em; }
+h5 { font-size: .83em; }
+h6 { font-size: .75em; }
+h1, h2, h3, h4, h5, h6 { font-weight: bolder }
+
+/* Now the custom parts */
+
+/* Make edit sections (which are inside h# tags) normal-sized */
+.editsection {
+	font-weight: normal;
+}
+h1 .editsection { font-size: 50% }
+h2 .editsection { font-size: 66.7% }
+h3 .editsection { font-size: 85.5% }
+h5 .editsection { font-size: 120% }
+h6 .editsection { font-size: 133% }
+
 #footer { clear: both }
 /* images */
 div.floatright { float: right; clear: right; margin: 0 0 1em 1em; }
diff --git a/skins/common/shared.css b/skins/common/shared.css
index e50a24029d..61f68395f0 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -19,6 +19,12 @@ div#mw-js-message {
 	background-color: #fcfcfc;
 }
 
+/* Edit section links */
+.editsection {
+	float: right;
+	margin-left: 5px;
+}
+
 /**
  * File histories
  */
diff --git a/skins/monobook/IE50Fixes.css b/skins/monobook/IE50Fixes.css
index b512f9193d..027e32ed0c 100644
--- a/skins/monobook/IE50Fixes.css
+++ b/skins/monobook/IE50Fixes.css
@@ -64,3 +64,4 @@ li#pt-logout {
 	margin: 0;
 }
 .firstHeading { margin-bottom: .3em; }
+/*div{ border:1px solid Red !important;}*/
diff --git a/skins/monobook/IE55Fixes.css b/skins/monobook/IE55Fixes.css
index 608722064d..637daae17f 100644
--- a/skins/monobook/IE55Fixes.css
+++ b/skins/monobook/IE55Fixes.css
@@ -83,9 +83,3 @@ body { font-size: xx-small; }
 #editform {
 	width: 100%;
 }
-
-
-/* IE 5, 5.5, 6 ignore the space in between the header and the link.  We can
- * fix this with a margin for 5.5 and 6, but 5 ignores margins on inline
- * elements, so that looks a little uglier. */
-.editsection { margin-left: 0.3em; }
diff --git a/skins/monobook/IE60Fixes.css b/skins/monobook/IE60Fixes.css
index 671c7de7b4..6b646c703b 100644
--- a/skins/monobook/IE60Fixes.css
+++ b/skins/monobook/IE60Fixes.css
@@ -80,8 +80,5 @@ div.tright,
 div.tleft {
 	position: relative;
 }
+/*{ border:1px solid Red !important;}*/
 
-/* IE 5, 5.5, 6 ignore the space in between the header and the link.  We can
- * fix this with a margin for 5.5 and 6, but 5 ignores margins on inline
- * elements, so that looks a little uglier. */
-.editsection { margin-left: 0.3em; }
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 466aecc8c3..02cc9c9f9b 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -111,28 +111,31 @@ hr {
 	margin: .2em 0 .2em 0;
 }
 
-.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 {
+h1, h2, h3, h4, h5, h6 {
 	color: black;
 	background: none;
+	font-weight: normal;
 	margin: 0;
 	padding-top: .5em;
 	padding-bottom: .17em;
 	border-bottom: 1px solid #aaa;
 }
-h1, h2, h3, h4, h5, h6 {
-	font-weight: normal;
-	display: inline;
-}
 h1 { font-size: 188%; }
+h1 .editsection { font-size: 53%; }
 h2 { font-size: 150%; }
+h2 .editsection { font-size: 67%; }
 h3, h4, h5, h6 {
 	border-bottom: none;
 	font-weight: bold;
 }
 h3 { font-size: 132%; }
+h3 .editsection { font-size: 76%; font-weight: normal; }
 h4 { font-size: 116%; }
+h4 .editsection { font-size: 86%; font-weight: normal; }
 h5 { font-size: 100%; }
+h5 .editsection { font-weight: normal; }
 h6 { font-size: 80%;  }
+h6 .editsection { font-size: 125%; font-weight: normal; }
 
 ul {
 	line-height: 1.5em;
-- 
2.20.1