From: Brion Vibber Date: Thu, 28 Jul 2011 22:00:09 +0000 (+0000) Subject: Provisional revert of r93319 -- change to TOC styles without coordinated cache updates. X-Git-Tag: 1.31.0-rc.0~28547 X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=3cdc9cfa0c313fc2de9d9189ccd1107686be0f3b;p=lhc%2Fweb%2Fwiklou.git Provisional revert of r93319 -- change to TOC styles without coordinated cache updates. Definitely shows different padding with the old cached markup and new styles in FF 5 though it's not a huge difference. Haven't tested in other browsers; IE needs testing in particular as it has funky special style bits. Recommend: * old markup should work uncahnged with the new styles -- this avoids any transition problems * secondarily, consider updating parser cache version to force updates .... but you'd still want to do the above for pages that have been HTTP-cached! * test all these renderings in all supported browsers and confirm that all is well with old & new markup --- diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index c2f47fcb59..818d98223a 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -28,7 +28,6 @@ production. $wgUploadMissingFileUrl is not set. The first was used for this until the second was introduced in 1.17. * (bug 25355) Parser generates edit section links for special pages -* (bug 13766) Change table of content syntax to be semantically correct === API changes in 1.19 === * (bug 19838) siprop=interwikimap can now use the interwiki cache. diff --git a/includes/Linker.php b/includes/Linker.php index 525a6fad5a..f724ca6d6a 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1456,10 +1456,10 @@ class Linker { static function tocList( $toc, $lang = false ) { $title = wfMsgExt( 'toc', array( 'language' => $lang, 'escape' ) ); return - '
' + '
' . '

' . $title . "

\n" . $toc - . "\n\n"; + . "\n
\n"; } /** diff --git a/skins/common/shared.css b/skins/common/shared.css index 73ac775126..a70b41de11 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -784,14 +784,4 @@ div.floatright, table.floatright, div.floatleft, table.floatleft { } /* bug 12205 */ -#mw-credits a { - unicode-bidi: embed; -} - -/* Standard toc */ -#toc { - display: inline-block; - /* IE6+7 workaround */ - zoom: 1; - display: inline !ie; -} \ No newline at end of file +#mw-credits a { unicode-bidi: embed; } \ No newline at end of file diff --git a/skins/modern/main.css b/skins/modern/main.css index 860de365ba..d1fa902086 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -556,6 +556,11 @@ img.thumbborder { border: solid 1px #bbb; } +#toc tr, #toc td { + margin: 0; + padding: 0; +} + #toctitle { border-bottom: solid 1px #3c78b5; background-color: #ddd; @@ -582,7 +587,7 @@ img.thumbborder { list-style-type: none; list-style-image: none; margin: 0 1em; - padding: 0; + padding-left: 0; text-align: left; } diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 0fcb4780dd..75b57e3555 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -348,7 +348,8 @@ table.small { .toc ul { list-style-type: none; list-style-image: none; - padding: 0 .4em; + margin-left: 0; + padding-left: 0; text-align: left; } #toc ul ul, diff --git a/skins/vector/screen.css b/skins/vector/screen.css index ba604b42de..8f611b76e9 100644 --- a/skins/vector/screen.css +++ b/skins/vector/screen.css @@ -884,7 +884,8 @@ select { .toc ul { list-style-type: none; list-style-image: none; - padding: 0 .4em; + margin-left: 0; + padding-left: 0; text-align: left; } #toc ul ul, diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index c4a0015a99..ef5a663b7d 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -4560,7 +4560,7 @@ Section headings with TOC Some text ===Another headline=== !! result -

Contents

+

Contents

- +

[edit] Headline 1

[edit] Subheadline 1

[edit] Skipping a level
@@ -4608,7 +4608,7 @@ Handling of sections up to level 6 and beyond ========= Level 9 Heading========= ========== Level 10 Heading========== !! result -

Contents

+

Contents

  • 1 Level 1 Heading
      @@ -4636,7 +4636,7 @@ Handling of sections up to level 6 and beyond
- +

[edit] Level 1 Heading

[edit] Level 2 Heading

[edit] Level 3 Heading

@@ -4660,7 +4660,7 @@ TOC regression (bug 9764) == title 2 == === title 2.1 === !! result -

Contents

+

Contents

  • 1 title 1
      @@ -4678,7 +4678,7 @@ TOC regression (bug 9764)
- +

[edit] title 1

[edit] title 1.1

[edit] title 1.1.1

@@ -4700,7 +4700,7 @@ wgMaxTocLevel=3 == title 2 == === title 2.1 === !! result -

Contents

+

Contents

  • 1 title 1
      @@ -4714,7 +4714,7 @@ wgMaxTocLevel=3
- +

[edit] title 1

[edit] title 1.1

[edit] title 1.1.1

@@ -4735,7 +4735,7 @@ wgMaxTocLevel=3 ====Section 1.1.1.1==== ==Section 2== !! result -

Contents

+

Contents

[edit] Section 1

[edit] Section 1.1

[edit] Section 1.1.1

@@ -4827,7 +4827,7 @@ __TOC__ === title 1.1 === == title 2 == !! result -

Contents

+

Contents

[edit] title 1

[edit] title 1.1

[edit] title 2

@@ -4891,7 +4891,7 @@ section 5 !! result

The tooltips shall not show entities to the user (ie. be double escaped)

-

Contents

+

Contents

- +

[edit] text > text

section 1

@@ -6119,11 +6119,11 @@ Fuzz testing: Parser14 http://__TOC__ !! result

[edit] onmouseover=

-http://

Contents

+http://

Contents

- +
!! end @@ -7953,7 +7953,7 @@ Out-of-order TOC heading levels =====5===== ==2== !! result -

Contents

+

Contents

  • 1 2
      @@ -7968,7 +7968,7 @@ Out-of-order TOC heading levels
- +

[edit] 2

[edit] 6

[edit] 3