| Index: trunk/phase3/skins/CologneBlue.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | class SkinCologneBlue extends Skin { |
| 20 | 20 | |
| 21 | 21 | function getStylesheet() { |
| 22 | | - return "common/cologneblue.css?3"; |
| | 22 | + return "common/cologneblue.css?4"; |
| 23 | 23 | } |
| 24 | 24 | function getSkinName() { |
| 25 | 25 | return "cologneblue"; |
| Index: trunk/phase3/skins/common/common.css |
| — | — | @@ -58,6 +58,7 @@ |
| 59 | 59 | } |
| 60 | 60 | div.tright { |
| 61 | 61 | float: right; |
| | 62 | + clear: right; |
| 62 | 63 | margin-left:0.5em; |
| 63 | 64 | } |
| 64 | 65 | div.tleft { |
| Index: trunk/phase3/skins/common/cologneblue.css |
| — | — | @@ -1,4 +1,4 @@ |
| 2 | | -@import url("common.css?2"); |
| | 2 | +@import url("common.css?3"); |
| 3 | 3 | |
| 4 | 4 | body { margin: 0px; padding: 0px; color: black; } |
| 5 | 5 | #specialform { display: inline; } |
| Index: trunk/phase3/skins/common/commonPrint.css |
| — | — | @@ -67,6 +67,7 @@ |
| 68 | 68 | div.magnify { display: none; } |
| 69 | 69 | div.tright { |
| 70 | 70 | float: right; |
| | 71 | + clear: right; |
| 71 | 72 | border-width: 0.5em 0 0.8em 1.4em; |
| 72 | 73 | } |
| 73 | 74 | div.tleft { |
| Index: trunk/phase3/skins/common/common_rtl.css |
| — | — | @@ -16,4 +16,10 @@ |
| 17 | 17 | div.editsection { |
| 18 | 18 | float: left; |
| 19 | 19 | margin-right: 5px; |
| | 20 | +} |
| | 21 | +div.tright { |
| | 22 | + clear: none; |
| | 23 | +} |
| | 24 | +div.tleft { |
| | 25 | + clear: left; |
| 20 | 26 | } |
| \ No newline at end of file |
| Index: trunk/phase3/skins/common/nostalgia.css |
| — | — | @@ -1,4 +1,4 @@ |
| 2 | | -@import url("common.css?1"); |
| | 2 | +@import url("common.css?3"); |
| 3 | 3 | body { |
| 4 | 4 | /* Background color is set separately on page type */ |
| 5 | 5 | color: black; |
| Index: trunk/phase3/skins/common/wikistandard.css |
| — | — | @@ -1,4 +1,4 @@ |
| 2 | | -@import url("common.css?1"); |
| | 2 | +@import url("common.css?3"); |
| 3 | 3 | |
| 4 | 4 | #article { padding: 4px; } |
| 5 | 5 | #content { margin: 0; padding: 0; } |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | <?php $this->html('headlinks') ?> |
| 59 | 59 | <title><?php $this->text('pagetitle') ?></title> |
| 60 | 60 | <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?10"; /*]]>*/</style> |
| 61 | | - <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css" /> |
| | 61 | + <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css?1" /> |
| 62 | 62 | <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]--> |
| 63 | 63 | <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]--> |
| 64 | 64 | <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]--> |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -139,7 +139,7 @@ |
| 140 | 140 | |
| 141 | 141 | /** @return string path to the skin stylesheet */ |
| 142 | 142 | function getStylesheet() { |
| 143 | | - return 'common/wikistandard.css?1'; |
| | 143 | + return 'common/wikistandard.css?2'; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** @return string skin name */ |
| — | — | @@ -364,7 +364,7 @@ |
| 365 | 365 | $sheet = $this->getStylesheet(); |
| 366 | 366 | $action = $wgRequest->getText('action'); |
| 367 | 367 | $s = "@import \"$wgStylePath/$sheet\";\n"; |
| 368 | | - if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css\";\n"; |
| | 368 | + if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?1\";\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" . |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -42,8 +42,8 @@ |
| 43 | 43 | * (bug 6918) Stopped borders and backgrounds from showing through floated |
| 44 | 44 | tables in Monobook |
| 45 | 45 | * (bug 6868) Un-hardcode section edit link style |
| | 46 | +* (bug 3205) Stop right floats from stacking horizontally in non-Monobook skins |
| 46 | 47 | |
| 47 | | - |
| 48 | 48 | == Languages updated == |
| 49 | 49 | |
| 50 | 50 | * Occitan (oc) |