| Index: trunk/phase3/skins/common/common.css |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | #footer { clear: both } |
| 7 | 7 | /* images */ |
| 8 | | -div.floatright { float: right; margin: 0 0 1em 1em; } |
| | 8 | +div.floatright { float: right; clear: right; margin: 0 0 1em 1em; } |
| 9 | 9 | div.floatright p { font-style: italic; } |
| 10 | 10 | div.floatleft { float: left; margin: 0.3em 0.5em 0.5em 0; } |
| 11 | 11 | div.floatleft p { font-style: italic; } |
| Index: trunk/phase3/skins/common/commonPrint.css |
| — | — | @@ -28,7 +28,8 @@ |
| 29 | 29 | |
| 30 | 30 | /* images */ |
| 31 | 31 | div.floatright { |
| 32 | | - float: right; |
| | 32 | + float: right; |
| | 33 | + clear: right; |
| 33 | 34 | margin: 0; |
| 34 | 35 | position:relative; |
| 35 | 36 | border: 0.5em solid White; |
| — | — | @@ -136,7 +137,7 @@ |
| 137 | 138 | |
| 138 | 139 | p, .documentDescription { |
| 139 | 140 | margin: 1em 0 ! important; |
| 140 | | - line-height: 1.2em; |
| | 141 | + line-height: 1.2em; |
| 141 | 142 | } |
| 142 | 143 | |
| 143 | 144 | .tocindent p { |
| Index: trunk/phase3/skins/common/common_rtl.css |
| — | — | @@ -1,3 +1,6 @@ |
| | 2 | +/* This CSS file is called from absolutely every wiki that's RTL: unlike |
| | 3 | + * common.css, it's actually common to all skins. */ |
| | 4 | + |
| 2 | 5 | /* js pref toc */ |
| 3 | 6 | #preftoc { float: right; } |
| 4 | 7 | /* workaround for moz bug, displayed bullets on left side */ |
| — | — | @@ -17,9 +20,9 @@ |
| 18 | 21 | float: left; |
| 19 | 22 | margin-right: 5px; |
| 20 | 23 | } |
| 21 | | -div.tright { |
| | 24 | +div.tright, div.floatright { |
| 22 | 25 | clear: none; |
| 23 | 26 | } |
| 24 | | -div.tleft { |
| | 27 | +div.tleft, div.floatleft { |
| 25 | 28 | clear: left; |
| 26 | 29 | } |
| \ No newline at end of file |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1030,7 +1030,7 @@ |
| 1031 | 1031 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1032 | 1032 | * styles. |
| 1033 | 1033 | */ |
| 1034 | | -$wgStyleVersion = '13'; |
| | 1034 | +$wgStyleVersion = '14'; |
| 1035 | 1035 | |
| 1036 | 1036 | # Server-side caching: |
| 1037 | 1037 | |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -364,7 +364,7 @@ |
| 365 | 365 | $sheet = $this->getStylesheet(); |
| 366 | 366 | $action = $wgRequest->getText('action'); |
| 367 | 367 | $s = "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n"; |
| 368 | | - if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?1\";\n"; |
| | 368 | + if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n"; |
| 369 | 369 | |
| 370 | 370 | $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage"; |
| 371 | 371 | $s .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" . |