From 8825de5e6fddefd31bac987ed7c61748504cea6b Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Thu, 12 Oct 2006 09:02:25 +0000 Subject: [PATCH] Revert last two commits. Broke wikibits and don't know how to fix it at the moment. --- RELEASE-NOTES | 2 -- includes/Linker.php | 6 +++--- includes/Parser.php | 7 +++---- skins/chick/main.css | 10 ---------- skins/common/cologneblue.css | 3 +-- skins/common/common.css | 30 +++++------------------------- skins/common/commonPrint.css | 5 +---- skins/common/common_rtl.css | 2 +- skins/common/wikibits.js | 6 +++--- skins/common/wikistandard.css | 6 ------ skins/monobook/main.css | 8 +------- skins/monobook/rtl.css | 2 +- skins/simple/main.css | 26 -------------------------- 13 files changed, 19 insertions(+), 94 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index b1bfd4911d..b3e037f746 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -42,8 +42,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 6918) Stopped borders and backgrounds from showing through floated tables in Monobook * (bug 6868) Un-hardcode section edit link style -* (bug 4525) Move section links down to same level as headings (editsection - links are now inside the h# elements) == Languages updated == diff --git a/includes/Linker.php b/includes/Linker.php index 53deb39f2b..bc5fb64ba8 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1046,11 +1046,11 @@ class Linker { $editurl = '§ion='.$section; $url = $this->makeKnownLinkObj( $title, wfMsg('editsection'), 'action=edit'.$editurl ); - return "[".$url."]"; + return "
[".$url."]
"; } - /** + /** * @param $title Title object. * @param $section Integer: section number. * @param $hint Link String: title, or default if omitted or empty @@ -1062,7 +1062,7 @@ class Linker { $hint = ( $hint=='' ) ? '' : ' title="' . wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) ) . '"'; $url = $this->makeKnownLinkObj( $nt, wfMsg('editsection'), 'action=edit'.$editurl, '', '', '', $hint ); - return "[".$url."]"; + return "
[".$url."]
"; } /** diff --git a/includes/Parser.php b/includes/Parser.php index 05538e9509..cd2cb4fca2 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -3501,9 +3501,6 @@ class Parser if( $enoughToc && ( !isset($wgMaxTocLevel) || $toclevel<$wgMaxTocLevel ) ) { $toc .= $sk->tocLine($anchor, $tocline, $numbering, $toclevel); } - # give headline the correct tag - @$head[$headlineCount] .= "editSectionLink($this->mTitle, $sectionCount+1, $headline_hint); } - $head[$headlineCount] .= $headline.''; + + # give headline the correct tag + @$head[$headlineCount] .= "'; $headlineCount++; if( !$istemplate ) diff --git a/skins/chick/main.css b/skins/chick/main.css index 8c117fa015..5d3d15bdd4 100644 --- a/skins/chick/main.css +++ b/skins/chick/main.css @@ -50,26 +50,16 @@ h1, h2, h3, h4, h5, h6 { padding-bottom: 0.17em; border-bottom: 1px solid #aaaaaa; } -.editsection { - font-weight: normal; - float: right; - margin-left: 5px; -} h1 { font-size: 188%; } -h1 .editsection { font-size: 53.2%; } h2 { font-size: 150%; } -h2 .editsection { font-size: 66.7%; } h3, h4, h5, h6 { border-bottom: none; font-weight: bold; } h3 { font-size: 132%; } -h3 .editsection { font-size: 75.8%; } h4 { font-size: 116%; } -h4 .editsection { font-size: 86.2%; } h5 { font-size: 100%; } h6 { font-size: 80%; } -h6 .editsection { font-size: 125%; } ul { line-height: 1.5em; diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index d108264581..33c12abb48 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -78,9 +78,8 @@ td.bottom { h1 { color: #666666; font-family: Verdana, Arial, sans-serif; - font-size: 180%; line-height: 21pt; + font-size: 18pt; font-weight: bold; line-height: 21pt; } -h1 .editsection { font-size: 55.6%; } h1.pagetitle { padding-bottom: 0; margin-bottom: 0; } #article p.subtitle { color: #666666; font-size: 11pt; font-weight: bold; diff --git a/skins/common/common.css b/skins/common/common.css index bcc5263b74..57619f0d21 100644 --- a/skins/common/common.css +++ b/skins/common/common.css @@ -2,31 +2,6 @@ * common.css * This file contains CSS settings common to Wikistandard, Nostalgia and CologneBlue */ - -/* For clarity, explicitly state some recommendations from 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; - float: right; - margin-left: 5px; -} -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; margin: 0 0 1em 1em; } @@ -339,6 +314,11 @@ li span.deleted { font-style: italic; } +div.editsection { + float: right; + margin-left: 5px; +} + /* Classes for EXIF data display */ table.mw_metadata { margin-left: 0.5em; diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css index 36e08c7863..7dcb5700e9 100644 --- a/skins/common/commonPrint.css +++ b/skins/common/commonPrint.css @@ -130,10 +130,7 @@ ul { h1, h2, h3, h4, h5, h6 { - font-weight: bold; -} -.editsection { - font-weight: normal; + font-weight: bold; } p, .documentDescription { diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css index 20c7813e8d..a5ba2d7bcb 100644 --- a/skins/common/common_rtl.css +++ b/skins/common/common_rtl.css @@ -13,7 +13,7 @@ fieldset.operaprefsection { margin-right: 1.4em; margin-left: 0.4em; } -.editsection { +div.editsection { float: left; margin-right: 5px; } \ No newline at end of file diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 34cc0913a1..3a8fd6c69c 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -503,9 +503,9 @@ function akeytt() { function setupRightClickEdit() { if (document.getElementsByTagName) { - var spans = document.getElementsByTagName('span'); - for (var i = 0; i < spans.length; i++) { - var el = spans[i]; + var divs = document.getElementsByTagName('div'); + for (var i = 0; i < divs.length; i++) { + var el = divs[i]; if(el.className == 'editsection') { addRightClickEditHandler(el); } diff --git a/skins/common/wikistandard.css b/skins/common/wikistandard.css index bf96845d41..3985f1d94f 100644 --- a/skins/common/wikistandard.css +++ b/skins/common/wikistandard.css @@ -29,18 +29,12 @@ textarea { overflow: auto; } h1.pagetitle { padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0; font-size:150%; } -h1.pagetitle .editsection { font-size: 66.7%; } h2 { font-size: 120%; } -h2 .editsection { font-size: 83.3%; } h2, h3, h4, h5, h6 { margin-bottom: 0;} h3 { font-size: 106.25%; } -h3 .editsection { font-size: 94.1%; } h4 { font-size: 103.125%; } -h4 .editsection { font-size: 97.0%; } h5 { font-size: 100%; } -h5 .editsection { font-size: 100%; } h6 { font-size: 95%; } -h6 .editsection { font-size: 105.3%; } hr.sep { color:gray;height:1px;background-color:gray;} p.subpages { font-size:small;} p.subtitle { padding-top: 0; margin-top: 0;} diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 78c9a4a4ca..6b57ed9e6b 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -119,23 +119,17 @@ h1, h2, h3, h4, h5, h6 { border-bottom: 1px solid #aaa; } 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; } -.editsection { +div.editsection { float: right; margin-left: 5px; } diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css index f4a67683ca..bf88e4349d 100644 --- a/skins/monobook/rtl.css +++ b/skins/monobook/rtl.css @@ -41,7 +41,7 @@ html>body .portlet { float: right; clear: right; } -.editsection { +div.editsection { float: left; margin-right: 5px; } diff --git a/skins/simple/main.css b/skins/simple/main.css index c0f34e99a3..d55552fcc8 100644 --- a/skins/simple/main.css +++ b/skins/simple/main.css @@ -1,29 +1,3 @@ -/* For clarity, explicitly state some recommendations from 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 - and otherwise format */ -.editsection { - font-weight: normal; - float: right; - margin-left: 5px; -} -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% } - - #toolbar { display: none; } -- 2.20.1