| Index: trunk/phase3/skins/monobook/IE50Fixes.css |
| — | — | @@ -64,3 +64,4 @@ |
| 65 | 65 | margin: 0; |
| 66 | 66 | } |
| 67 | 67 | .firstHeading { margin-bottom: .3em; } |
| | 68 | +/*div{ border:1px solid Red !important;}*/ |
| Index: trunk/phase3/skins/monobook/IE60Fixes.css |
| — | — | @@ -80,8 +80,5 @@ |
| 81 | 81 | div.tleft { |
| 82 | 82 | position: relative; |
| 83 | 83 | } |
| | 84 | +/*{ border:1px solid Red !important;}*/ |
| 84 | 85 | |
| 85 | | -/* IE 5, 5.5, 6 ignore the space in between the header and the link. We can |
| 86 | | - * fix this with a margin for 5.5 and 6, but 5 ignores margins on inline |
| 87 | | - * elements, so that looks a little uglier. */ |
| 88 | | -.editsection { margin-left: 0.3em; } |
| Index: trunk/phase3/skins/monobook/IE55Fixes.css |
| — | — | @@ -83,9 +83,3 @@ |
| 84 | 84 | #editform { |
| 85 | 85 | width: 100%; |
| 86 | 86 | } |
| 87 | | - |
| 88 | | - |
| 89 | | -/* IE 5, 5.5, 6 ignore the space in between the header and the link. We can |
| 90 | | - * fix this with a margin for 5.5 and 6, but 5 ignores margins on inline |
| 91 | | - * elements, so that looks a little uglier. */ |
| 92 | | -.editsection { margin-left: 0.3em; } |
| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -111,28 +111,31 @@ |
| 112 | 112 | margin: .2em 0 .2em 0; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | | -.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { |
| | 115 | +h1, h2, h3, h4, h5, h6 { |
| 116 | 116 | color: black; |
| 117 | 117 | background: none; |
| | 118 | + font-weight: normal; |
| 118 | 119 | margin: 0; |
| 119 | 120 | padding-top: .5em; |
| 120 | 121 | padding-bottom: .17em; |
| 121 | 122 | border-bottom: 1px solid #aaa; |
| 122 | 123 | } |
| 123 | | -h1, h2, h3, h4, h5, h6 { |
| 124 | | - font-weight: normal; |
| 125 | | - display: inline; |
| 126 | | -} |
| 127 | 124 | h1 { font-size: 188%; } |
| | 125 | +h1 .editsection { font-size: 53%; } |
| 128 | 126 | h2 { font-size: 150%; } |
| | 127 | +h2 .editsection { font-size: 67%; } |
| 129 | 128 | h3, h4, h5, h6 { |
| 130 | 129 | border-bottom: none; |
| 131 | 130 | font-weight: bold; |
| 132 | 131 | } |
| 133 | 132 | h3 { font-size: 132%; } |
| | 133 | +h3 .editsection { font-size: 76%; font-weight: normal; } |
| 134 | 134 | h4 { font-size: 116%; } |
| | 135 | +h4 .editsection { font-size: 86%; font-weight: normal; } |
| 135 | 136 | h5 { font-size: 100%; } |
| | 137 | +h5 .editsection { font-weight: normal; } |
| 136 | 138 | h6 { font-size: 80%; } |
| | 139 | +h6 .editsection { font-size: 125%; font-weight: normal; } |
| 137 | 140 | |
| 138 | 141 | ul { |
| 139 | 142 | line-height: 1.5em; |
| Index: trunk/phase3/skins/common/oldshared.css |
| — | — | @@ -4,6 +4,28 @@ |
| 5 | 5 | * CologneBlue, the old pre-Monobook skins |
| 6 | 6 | */ |
| 7 | 7 | |
| | 8 | +/* For clarity, explicitly state some recommendations from <http://www.w3.org/ |
| | 9 | + TR/CSS21/sample.html> to make sure the editsection links scale right */ |
| | 10 | + |
| | 11 | +h1 { font-size: 2em; } |
| | 12 | +h2 { font-size: 1.5em; } |
| | 13 | +h3 { font-size: 1.17em; } |
| | 14 | +h5 { font-size: .83em; } |
| | 15 | +h6 { font-size: .75em; } |
| | 16 | +h1, h2, h3, h4, h5, h6 { font-weight: bolder } |
| | 17 | + |
| | 18 | +/* Now the custom parts */ |
| | 19 | + |
| | 20 | +/* Make edit sections (which are inside h# tags) normal-sized */ |
| | 21 | +.editsection { |
| | 22 | + font-weight: normal; |
| | 23 | +} |
| | 24 | +h1 .editsection { font-size: 50% } |
| | 25 | +h2 .editsection { font-size: 66.7% } |
| | 26 | +h3 .editsection { font-size: 85.5% } |
| | 27 | +h5 .editsection { font-size: 120% } |
| | 28 | +h6 .editsection { font-size: 133% } |
| | 29 | + |
| 8 | 30 | #footer { clear: both } |
| 9 | 31 | /* images */ |
| 10 | 32 | div.floatright { float: right; clear: right; margin: 0 0 1em 1em; } |
| Index: trunk/phase3/skins/common/shared.css |
| — | — | @@ -19,6 +19,12 @@ |
| 20 | 20 | background-color: #fcfcfc; |
| 21 | 21 | } |
| 22 | 22 | |
| | 23 | +/* Edit section links */ |
| | 24 | +.editsection { |
| | 25 | + float: right; |
| | 26 | + margin-left: 5px; |
| | 27 | +} |
| | 28 | + |
| 23 | 29 | /** |
| 24 | 30 | * File histories |
| 25 | 31 | */ |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1225,11 +1225,7 @@ |
| 1226 | 1226 | * @return string HTML headline |
| 1227 | 1227 | */ |
| 1228 | 1228 | public function makeHeadline( $level, $attribs, $anchor, $text, $link ) { |
| 1229 | | - # See related bugs 1629, 11270, 11555. |
| 1230 | | - return "<a name=\"$anchor\"></a> |
| 1231 | | -<div class=\"mw-h$level\"> |
| 1232 | | - <h$level$attribs$text</h$level> $link |
| 1233 | | -</div>"; |
| | 1229 | + return "<a name=\"$anchor\"></a><h$level$attribs$link <span class=\"mw-headline\">$text</span></h$level>"; |
| 1234 | 1230 | } |
| 1235 | 1231 | |
| 1236 | 1232 | /** |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1246,7 +1246,7 @@ |
| 1247 | 1247 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1248 | 1248 | * styles. |
| 1249 | 1249 | */ |
| 1250 | | -$wgStyleVersion = '105'; |
| | 1250 | +$wgStyleVersion = '104'; |
| 1251 | 1251 | |
| 1252 | 1252 | |
| 1253 | 1253 | # Server-side caching: |