From 87a29789ca047d04be0c3b0ea92fb5d44409abcf Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Wed, 18 Oct 2006 05:02:46 +0000
Subject: [PATCH] * Finish fixing bug 3205, and bump up $wgStyleVersion. *
 Added $wgStyleVersion to a stylesheet call that brion missed. * Add
 informative comment to the top of common_rtl.css to the effect that it is
 really common to all skins, unlike common.css.

---
 includes/DefaultSettings.php | 2 +-
 includes/Skin.php            | 2 +-
 skins/common/common.css      | 2 +-
 skins/common/commonPrint.css | 5 +++--
 skins/common/common_rtl.css  | 7 +++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf974f1219..50694b6421 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1030,7 +1030,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '13';
+$wgStyleVersion = '14';
 
 # Server-side caching:
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 6baad7ea95..764817ba78 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -364,7 +364,7 @@ class Skin extends Linker {
 		$sheet = $this->getStylesheet();
 		$action = $wgRequest->getText('action');
 		$s = "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
-		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?1\";\n";
+		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\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/common/common.css b/skins/common/common.css
index 1e143ad5a6..64dbff7220 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -4,7 +4,7 @@
  */
 #footer { clear: both }
 /* images */
-div.floatright { float: right; margin: 0 0 1em 1em; }
+div.floatright { float: right; clear: right; margin: 0 0 1em 1em; }
 div.floatright p { font-style: italic; }
 div.floatleft { float: left; margin: 0.3em 0.5em 0.5em 0; }
 div.floatleft p { font-style: italic; }
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index e23c50b1fe..1bda4fd1f1 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -28,7 +28,8 @@ a.new{ color:#ba0000; text-decoration:none; }
 
 /* images */
 div.floatright { 
-    float: right; 
+    float: right;
+    clear: right;
     margin: 0;
     position:relative;
     border: 0.5em solid White;
@@ -136,7 +137,7 @@ h1, h2, h3, h4, h5, h6
 
 p, .documentDescription {
     margin: 1em 0 ! important;
-    line-height: 1.2em;    
+    line-height: 1.2em;
 }
 
 .tocindent p {
diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css
index 5a7bf05952..651c4dc01e 100644
--- a/skins/common/common_rtl.css
+++ b/skins/common/common_rtl.css
@@ -1,3 +1,6 @@
+/* This CSS file is called from absolutely every wiki that's RTL: unlike
+ * common.css, it's actually common to all skins. */
+
 /* js pref toc */
 #preftoc { float: right; }
 /* workaround for moz bug, displayed bullets on left side */
@@ -17,9 +20,9 @@ div.editsection {
 	float: left;
 	margin-right: 5px;
 }
-div.tright {
+div.tright, div.floatright {
 	clear: none;
 }
-div.tleft {
+div.tleft, div.floatleft {
 	clear: left;
 }
\ No newline at end of file
-- 
2.20.1