From 10dfc9dcb41cd2a6580d72d49c5b870fd8d8edb8 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 13 Oct 2006 06:56:47 +0000
Subject: [PATCH] (bug 3205) Stop right floats from stacking horizontally in
 non-Monobook skins (also correct clearing behavior for RTL)

---
 RELEASE-NOTES                 | 2 +-
 includes/Skin.php             | 4 ++--
 skins/CologneBlue.php         | 2 +-
 skins/MonoBook.php            | 2 +-
 skins/common/cologneblue.css  | 2 +-
 skins/common/common.css       | 1 +
 skins/common/commonPrint.css  | 1 +
 skins/common/common_rtl.css   | 6 ++++++
 skins/common/nostalgia.css    | 2 +-
 skins/common/wikistandard.css | 2 +-
 10 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b2a7a74e58..2df592aa38 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -42,7 +42,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6918) Stopped borders and backgrounds from showing through floated
   tables in Monobook
 * (bug 6868) Un-hardcode section edit link style
-
+* (bug 3205) Stop right floats from stacking horizontally in non-Monobook skins
 
 == Languages updated ==
 
diff --git a/includes/Skin.php b/includes/Skin.php
index ffbe27c7dd..04464f7269 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -139,7 +139,7 @@ class Skin extends Linker {
 
 	/** @return string path to the skin stylesheet */
 	function getStylesheet() {
-		return 'common/wikistandard.css?1';
+		return 'common/wikistandard.css?2';
 	}
 
 	/** @return string skin name */
@@ -364,7 +364,7 @@ class Skin extends Linker {
 		$sheet = $this->getStylesheet();
 		$action = $wgRequest->getText('action');
 		$s = "@import \"$wgStylePath/$sheet\";\n";
-		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css\";\n";
+		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?1\";\n";
 
 		$query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
 		$s .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 7f1fb40b0b..8cc8a92552 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -18,7 +18,7 @@ if( !defined( 'MEDIAWIKI' ) )
 class SkinCologneBlue extends Skin {
 
 	function getStylesheet() {
-		return "common/cologneblue.css?3";
+		return "common/cologneblue.css?4";
 	}
 	function getSkinName() {
 		return "cologneblue";
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index c1df046f05..92c88c9592 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -57,7 +57,7 @@ class MonoBookTemplate extends QuickTemplate {
 		<?php $this->html('headlinks') ?>
 		<title><?php $this->text('pagetitle') ?></title>
 		<style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?10"; /*]]>*/</style>
-		<link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
+		<link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css?1" />
 		<!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]-->
 		<!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
 		<!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index 33c12abb48..0c0b21de05 100644
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -1,4 +1,4 @@
-@import url("common.css?2");
+@import url("common.css?3");
 
 body { margin: 0px; padding: 0px; color: black; }
 #specialform { display: inline; }
diff --git a/skins/common/common.css b/skins/common/common.css
index 57619f0d21..1e143ad5a6 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -58,6 +58,7 @@ div.thumbcaption {
 }
 div.tright {
     float: right;
+    clear: right;
     margin-left:0.5em;
 }
 div.tleft {
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 7dcb5700e9..e23c50b1fe 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -67,6 +67,7 @@ div.thumb div div.thumbcaption {
 div.magnify { display: none; }
 div.tright {
     float: right;
+    clear: right;
     border-width: 0.5em 0 0.8em 1.4em;
 }
 div.tleft {
diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css
index a5ba2d7bcb..5a7bf05952 100644
--- a/skins/common/common_rtl.css
+++ b/skins/common/common_rtl.css
@@ -16,4 +16,10 @@ fieldset.operaprefsection {
 div.editsection {
 	float: left;
 	margin-right: 5px;
+}
+div.tright {
+	clear: none;
+}
+div.tleft {
+	clear: left;
 }
\ No newline at end of file
diff --git a/skins/common/nostalgia.css b/skins/common/nostalgia.css
index cc427bc960..da0f2524bb 100644
--- a/skins/common/nostalgia.css
+++ b/skins/common/nostalgia.css
@@ -1,4 +1,4 @@
-@import url("common.css?1");
+@import url("common.css?3");
 body {
 	/* Background color is set separately on page type */
 	color: black;
diff --git a/skins/common/wikistandard.css b/skins/common/wikistandard.css
index f55582bda0..dd39ebaed7 100644
--- a/skins/common/wikistandard.css
+++ b/skins/common/wikistandard.css
@@ -1,4 +1,4 @@
-@import url("common.css?1");
+@import url("common.css?3");
 
 #article { padding: 4px; }
 #content { margin: 0; padding: 0; }
-- 
2.20.1