dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba84011
)
Remove semantically incorrect wrapper table from toc and replace it with an inline...
author
Leo Koppelkamm
<diebuche@users.mediawiki.org>
Wed, 27 Jul 2011 13:24:19 +0000
(13:24 +0000)
committer
Leo Koppelkamm
<diebuche@users.mediawiki.org>
Wed, 27 Jul 2011 13:24:19 +0000
(13:24 +0000)
includes/Linker.php
patch
|
blob
|
history
skins/common/shared.css
patch
|
blob
|
history
skins/modern/main.css
patch
|
blob
|
history
skins/monobook/main.css
patch
|
blob
|
history
skins/vector/screen.css
patch
|
blob
|
history
diff --git
a/includes/Linker.php
b/includes/Linker.php
index
f724ca6
..
525a6fa
100644
(file)
--- 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
static function tocList( $toc, $lang = false ) {
$title = wfMsgExt( 'toc', array( 'language' => $lang, 'escape' ) );
return
- '<
table id="toc" class="toc"><tr><td
>'
+ '<
div id="toc" class="toc"
>'
. '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
. $toc
. '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
. $toc
- . "</ul>\n</
td></tr></table
>\n";
+ . "</ul>\n</
div
>\n";
}
/**
}
/**
diff --git
a/skins/common/shared.css
b/skins/common/shared.css
index
f01b4b4
..
b0d0689
100644
(file)
--- a/
skins/common/shared.css
+++ b/
skins/common/shared.css
@@
-783,4
+783,14
@@
div.floatright, table.floatright, div.floatleft, table.floatleft {
}
/* bug 12205 */
}
/* bug 12205 */
-#mw-credits a { unicode-bidi: embed; }
\ No newline at end of file
+#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
diff --git
a/skins/modern/main.css
b/skins/modern/main.css
index
49af0b9
..
5c6f67a
100644
(file)
--- a/
skins/modern/main.css
+++ b/
skins/modern/main.css
@@
-556,11
+556,6
@@
img.thumbborder {
border: solid 1px #bbb;
}
border: solid 1px #bbb;
}
-#toc tr, #toc td {
- margin: 0;
- padding: 0;
-}
-
#toctitle {
border-bottom: solid 1px #3c78b5;
background-color: #ddd;
#toctitle {
border-bottom: solid 1px #3c78b5;
background-color: #ddd;
@@
-587,7
+582,7
@@
img.thumbborder {
list-style-type: none;
list-style-image: none;
margin: 0 1em;
list-style-type: none;
list-style-image: none;
margin: 0 1em;
- padding
-left
: 0;
+ padding: 0;
text-align: left;
}
text-align: left;
}
diff --git
a/skins/monobook/main.css
b/skins/monobook/main.css
index
75b57e3
..
0fcb478
100644
(file)
--- a/
skins/monobook/main.css
+++ b/
skins/monobook/main.css
@@
-348,8
+348,7
@@
table.small {
.toc ul {
list-style-type: none;
list-style-image: none;
.toc ul {
list-style-type: none;
list-style-image: none;
- margin-left: 0;
- padding-left: 0;
+ padding: 0 .4em;
text-align: left;
}
#toc ul ul,
text-align: left;
}
#toc ul ul,
diff --git
a/skins/vector/screen.css
b/skins/vector/screen.css
index
8f611b7
..
ba604b4
100644
(file)
--- a/
skins/vector/screen.css
+++ b/
skins/vector/screen.css
@@
-884,8
+884,7
@@
select {
.toc ul {
list-style-type: none;
list-style-image: none;
.toc ul {
list-style-type: none;
list-style-image: none;
- margin-left: 0;
- padding-left: 0;
+ padding: 0 .4em;
text-align: left;
}
#toc ul ul,
text-align: left;
}
#toc ul ul,