From 79fe75158833f6c357adb112d0180df1683875a7 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Tue, 18 Dec 2007 16:39:57 +0000 Subject: [PATCH] Revert 28517 for now. Puts non-standards-compliant code in shared.css to work around a Firefox/IE bug, and consequently breaks display for Opera, Safari, Konqueror, and any other browser that behaves correctly here (probably also future versions of FF and IE). It fixes that in Monobook only, and only for a small subset of affected browsers (Opera 7 and KHTML). The correct code should be in shared.css, with workarounds for IE and Firefox for all skins. Furthermore, it's not clear to me why 1.2em was chosen, and it doesn't always seem to work. See for a page (non-Wikimedia, non-English) where the edit links are noticeably too high due, apparently, to this. See also bug 12340, caused by this. --- includes/Linker.php | 2 +- skins/common/shared.css | 1 - skins/monobook/KHTMLFixes.css | 5 ----- skins/monobook/Opera7Fixes.css | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index 6f55e0e325..17e988b4db 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1225,7 +1225,7 @@ class Linker { * @return string HTML headline */ public function makeHeadline( $level, $attribs, $anchor, $text, $link ) { - return "$text$link "; + return "$text"; } /** diff --git a/skins/common/shared.css b/skins/common/shared.css index f16d418260..61f68395f0 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -23,7 +23,6 @@ div#mw-js-message { .editsection { float: right; margin-left: 5px; - margin-top:-1.2em; } /** diff --git a/skins/monobook/KHTMLFixes.css b/skins/monobook/KHTMLFixes.css index ad72f9df88..afa3568b39 100644 --- a/skins/monobook/KHTMLFixes.css +++ b/skins/monobook/KHTMLFixes.css @@ -2,8 +2,3 @@ /* work around the horizontal scrollbars */ #column-content { margin-left: 0; } -/* Edit section links */ -.editsection { - margin-top: 0; -} - diff --git a/skins/monobook/Opera7Fixes.css b/skins/monobook/Opera7Fixes.css index 9ad74f7e11..446ea44cdb 100644 --- a/skins/monobook/Opera7Fixes.css +++ b/skins/monobook/Opera7Fixes.css @@ -9,8 +9,3 @@ background: url(external.png) center right no-repeat; padding-right: 13px; } -/* Edit section links */ -.editsection { - margin-top: 0; -} - -- 2.20.1