Index: includes/DefaultSettings.php =================================================================== --- includes/DefaultSettings.php (revision 58284) +++ includes/DefaultSettings.php (working copy) @@ -1605,7 +1605,7 @@ * to ensure that client-side caches do not keep obsolete copies of global * styles. */ -$wgStyleVersion = '249'; +$wgStyleVersion = '250'; # Server-side caching: Index: includes/Linker.php =================================================================== --- includes/Linker.php (revision 58284) +++ includes/Linker.php (working copy) @@ -1385,10 +1385,11 @@ * @return string HTML headline */ public function makeHeadline( $level, $attribs, $anchor, $text, $link, $legacyAnchor = false ) { - $ret = "" + . "$text" - . ""; + . "" + . "$link "; if ( $legacyAnchor !== false ) { $ret = "$ret"; } Index: skins/chick/IE60Fixes.css =================================================================== --- skins/chick/IE60Fixes.css (revision 58284) +++ skins/chick/IE60Fixes.css (working copy) @@ -70,7 +70,6 @@ width: 96%; } -div.editsection, #catlinks, div.tright, div.tleft { Index: skins/chick/main.css =================================================================== --- skins/chick/main.css (revision 58284) +++ skins/chick/main.css (working copy) @@ -41,34 +41,36 @@ margin: 0.2em 0 0.2em 0; } -h1, h2, h3, h4, h5, h6 { - color: Black; - background: none; - font-weight: normal; - margin: 0; - padding-top: 0.5em; - padding-bottom: 0.17em; - border-bottom: 1px solid #aaaaaa; +/* Headers */ +.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { + color: black; + background: none; + margin: 0; + border-bottom: 1px solid #aaa; } -.editsection { +.mw-h3, .mw-h4, .mw-h5, .mw-h6 { + border-bottom: none; +} +h1, h2 { font-weight: normal; } 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%; } +/* To replicate the old padding, where h# were block-level elements and edit + * links were floated, we need to multiply .5em top padding and .17em bottom + * padding by the header text sizes. */ +.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ +.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ +.mw-h3 { padding: .66em 0 .22em; } /* etc. */ +.mw-h4 { padding: .58em 0 .20em; } +.mw-h5 { padding: .50em 0 .17em; } +.mw-h6 { padding: .40em 0 .14em; } + ul { line-height: 1.5em; margin: 0.3em 0 0 1.5em; Index: skins/common/cologneblue.css =================================================================== --- skins/common/cologneblue.css (revision 58284) +++ skins/common/cologneblue.css (working copy) @@ -83,7 +83,6 @@ font-family: Verdana, Arial, sans-serif; font-size: 180%; 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; @@ -96,6 +95,6 @@ a.printable { text-decoration: underline; } a.stub, #quickbar a.stub { color:#772233; text-decoration:none; } a.new, #quickbar a.new { color: #CC2200; } -h2, h3, h4, h5, h6 { margin-bottom: 0; } +.mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { margin-bottom: 0; } small { font-size: 75%; } input.mw-searchInput { width: 106px; } Index: skins/common/common_rtl.css =================================================================== --- skins/common/common_rtl.css (revision 58284) +++ skins/common/common_rtl.css (working copy) @@ -19,10 +19,6 @@ margin-right: 1.4em; margin-left: 0.4em; } -.editsection { - float: left; - margin-right: 5px; -} div.tright, div.floatright { clear: none; } Index: skins/common/oldshared.css =================================================================== --- skins/common/oldshared.css (revision 58284) +++ skins/common/oldshared.css (working copy) @@ -4,28 +4,6 @@ * CologneBlue, the old pre-Monobook skins */ -/* 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; -} -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; } Index: skins/common/shared.css =================================================================== --- skins/common/shared.css (revision 58284) +++ skins/common/shared.css (working copy) @@ -37,11 +37,17 @@ background-color: #fcfcfc; } -/* Edit section links */ -.editsection { - float: right; - margin-left: 5px; -} +/* Display headings on the same line as edit link */ +h1, h2, h3, h4, h5, h6 { display: inline; margin: 0; } +/* But then we have to reintroduce the margin. We use the W3 recommended mar- + * gins , multiplying by the recom- + * mended font-size. */ +.mw-h1 { margin: 1.34em 0; } +.mw-h2 { margin: 1.13em 0; } +.mw-h3 { margin: 0.97em 0; } +.mw-h4 { margin: 1.12em 0; } +.mw-h5 { margin: 1.25em 0; } +.mw-h6 { margin: 1.25em 0; } /** * File histories Index: skins/common/wikistandard.css =================================================================== --- skins/common/wikistandard.css (revision 58284) +++ skins/common/wikistandard.css (working copy) @@ -27,18 +27,12 @@ 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;} Index: skins/MonoBook.php =================================================================== --- skins/MonoBook.php (revision 58284) +++ skins/MonoBook.php (working copy) @@ -84,7 +84,7 @@
data['sitenotice']) { ?>
html('sitenotice') ?>
-

html('title') ?>

+

html('title') ?>

msg('tagline') ?>

html('subtitle') ?>
Index: skins/monobook/IE60Fixes.css =================================================================== --- skins/monobook/IE60Fixes.css (revision 58284) +++ skins/monobook/IE60Fixes.css (working copy) @@ -85,7 +85,6 @@ width: 96%; } -div.editsection, #catlinks, div.tright, div.tleft { Index: skins/monobook/IE70Fixes.css =================================================================== --- skins/monobook/IE70Fixes.css (revision 58284) +++ skins/monobook/IE70Fixes.css (working copy) @@ -69,7 +69,6 @@ } /* -div.editsection, #catlinks, div.tright, div.tleft { Index: skins/monobook/main.css =================================================================== --- skins/monobook/main.css (revision 58284) +++ skins/monobook/main.css (working copy) @@ -112,32 +112,34 @@ margin: .2em 0 .2em 0; } -h1, h2, h3, h4, h5, h6 { +/* Headers */ +.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { color: black; background: none; - font-weight: normal; margin: 0; - padding-top: .5em; - padding-bottom: .17em; border-bottom: 1px solid #aaa; } +.mw-h3, .mw-h4, .mw-h5, .mw-h6 { + border-bottom: none; +} +h1, h2 { font-weight: normal; } 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; } +/* To replicate the old padding, where h# were block-level elements and edit + * links were floated, we need to multiply .5em top padding and .17em bottom + * padding by the header text sizes. */ +.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ +.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ +.mw-h3 { padding: .66em 0 .22em; } /* etc. */ +.mw-h4 { padding: .58em 0 .20em; } +.mw-h5 { padding: .50em 0 .17em; } +.mw-h6 { padding: .40em 0 .14em; } + ul { line-height: 1.5em; list-style-type: square; Index: skins/monobook/rtl.css =================================================================== --- skins/monobook/rtl.css (revision 58284) +++ skins/monobook/rtl.css (working copy) @@ -40,11 +40,6 @@ float: right; clear: right; } -.editsection { - float: left; - margin-right: 5px; - margin-left: 0; /* bug 9122: undo default LTR */ -} /* recover IEMac (might be fine with the float, but usually it's close to IE */ *>body .portlet { float: none; Index: skins/simple/main.css =================================================================== --- skins/simple/main.css (revision 58284) +++ skins/simple/main.css (working copy) @@ -1,26 +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 */ -.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% } - - #toolbar { display: none; } @@ -86,11 +63,22 @@ } p img { margin: 0; } -h1, h2, h3, h4, h5, h6 { - margin: 0; - padding-top: 0.5em; - padding-bottom: 0.17em; +.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { + margin: 0; } +/* To replicate the old padding, where h# were block-level elements and edit + * links were floated, we need to multiply .5em top padding and .17em bottom + * padding by the header text sizes. We assume the W3 recommendations are + * used: 200%, 150%, 117%, 100%, 83%, 75% size in that order + * . If not the padding may be margin- + * ally off. */ +.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ +.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ +.mw-h3 { padding: .66em 0 .22em; } /* etc. */ +.mw-h4 { padding: .58em 0 .20em; } +.mw-h5 { padding: .50em 0 .17em; } +.mw-h6 { padding: .40em 0 .14em; } + fieldset { margin: 1em 0em 1em 0em; padding: 0em 1em 1em 1em; @@ -195,7 +183,7 @@ border: solid 1px black; } -h1.firstHeading, h2 { +.firstHeading, .mw-h2 { border-bottom: solid 1px black; } #bodyContent a[href ^="http://"], @@ -383,10 +371,5 @@ display: none; } -.editsection { - float: right; - margin-left: 5px; -} - .templatesUsed { margin-top: 1.5em; } Index: skins/simple/rtl.css =================================================================== --- skins/simple/rtl.css (revision 58284) +++ skins/simple/rtl.css (working copy) @@ -40,11 +40,6 @@ float: right; clear: right; } -.editsection { - float: left; - margin-right: 5px; - margin-left: 0; /* bug 9122: undo default LTR */ -} /* recover IEMac (might be fine with the float, but usually it's close to IE */ *>body .portlet { float: none; Index: skins/Vector.php =================================================================== --- skins/Vector.php (revision 58284) +++ skins/Vector.php (working copy) @@ -472,7 +472,7 @@ -

html( 'title' ) ?>

+

html('title') ?>

Index: skins/vector/main-ltr.css =================================================================== --- skins/vector/main-ltr.css (revision 58284) +++ skins/vector/main-ltr.css (working copy) @@ -643,40 +643,38 @@ } /* Structural Elements */ -h1, -h2, -h3, -h4, -h5, -h6 { +.mw-h1, +.mw-h2, +.mw-h3, +.mw-h4, +.mw-h5, +.mw-h6 { color: black; background: none; - font-weight: normal; margin: 0; - padding-top: .5em; - padding-bottom: .17em; border-bottom: 1px solid #aaa; width: auto; } -h1 { font-size: 188%; } -h1 .editsection { font-size: 53%; } -h2 { font-size: 150%; } -h2 .editsection { font-size: 67%; } -h3, -h4, -h5, -h6 { +.mw-h3, .mw-h4, .mw-h5, .mw-h6 { border-bottom: none; - font-weight: bold; } +h1, h2 { font-weight: normal; } +h1 { font-size: 188%; } +h2 { font-size: 150%; } 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; } +/* To replicate the old padding, where h# were block-level elements and edit + * links were floated, we need to multiply .5em top padding and .17em bottom + * padding by the header text sizes. */ +.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ +.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ +.mw-h3 { padding: .66em 0 .22em; } /* etc. */ +.mw-h4 { padding: .58em 0 .20em; } +.mw-h5 { padding: .50em 0 .17em; } +.mw-h6 { padding: .40em 0 .14em; } + p { margin: .4em 0 .5em 0; line-height: 1.5em; Index: skins/vector/main-rtl.css =================================================================== --- skins/vector/main-rtl.css (revision 58284) +++ skins/vector/main-rtl.css (working copy) @@ -643,40 +643,38 @@ } /* Structural Elements */ -h1, -h2, -h3, -h4, -h5, -h6 { +.mw-h1, +.mw-h2, +.mw-h3, +.mw-h4, +.mw-h5, +.mw-h6 { color: black; background: none; - font-weight: normal; margin: 0; - padding-top: .5em; - padding-bottom: .17em; border-bottom: 1px solid #aaa; width: auto; } -h1 { font-size: 188%; } -h1 .editsection { font-size: 53%; } -h2 { font-size: 150%; } -h2 .editsection { font-size: 67%; } -h3, -h4, -h5, -h6 { +.mw-h3, .mw-h4, .mw-h5, .mw-h6 { border-bottom: none; - font-weight: bold; } +h1, h2 { font-weight: normal; } +h1 { font-size: 188%; } +h2 { font-size: 150%; } 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; } +/* To replicate the old padding, where h# were block-level elements and edit + * links were floated, we need to multiply .5em top padding and .17em bottom + * padding by the header text sizes. */ +.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */ +.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */ +.mw-h3 { padding: .66em 0 .22em; } /* etc. */ +.mw-h4 { padding: .58em 0 .20em; } +.mw-h5 { padding: .50em 0 .17em; } +.mw-h6 { padding: .40em 0 .14em; } + p { margin: .4em 0 .5em 0; line-height: 1.5em;