From 7c790f1c99b6072dc7916b1237c808d6938108de Mon Sep 17 00:00:00 2001
From: Robin Pepermans <robin@users.mediawiki.org>
Date: Sat, 2 Jul 2011 01:57:48 +0000
Subject: [PATCH] * Put float:left/right for images in shared.css with @noflip.
 This was inconsistent between skins, causing image alignment on RTL wikis to
 be dependent on your skin. Left is left and right is right, even for RTL
 languages :) * Also moving position: relative; from all skins to shared.css *
 Replacing .mw-content-ltr/rtl (added in r90743) with div#content
 [dir="ltr/rtl"] so it also works on e.g. special pages

---
 skins/chick/main.css    | 18 ++++--------------
 skins/common/shared.css | 41 +++++++++++++++++++++++++++--------------
 skins/modern/main.css   | 22 ++++------------------
 skins/monobook/main.css | 22 ++++------------------
 skins/simple/main.css   | 18 ++++--------------
 skins/vector/screen.css | 20 ++++----------------
 6 files changed, 47 insertions(+), 94 deletions(-)

diff --git a/skins/chick/main.css b/skins/chick/main.css
index 23c690224b..cdcd42cb48 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -253,20 +253,14 @@ table.small { font-size: 100% }
 }
 
 /* images */
-div.floatright, table.floatright {
-	clear: right;
-	float: right;
+/* @noflip */div.floatright, table.floatright {
 	margin: 0;
-	position: relative;
 	border: 0.5em solid white;
 	border-width: 0.5em 0 0.8em 1.4em;
 }
 div.floatright p { font-style: italic; }
-div.floatleft, table.floatleft {
-	float: left;
-	clear: left;
+/* @noflip */div.floatleft, table.floatleft {
 	margin: 0.3em 0.5em 0.5em 0;
-	position: relative;
 	border: 0.5em solid white;
 	border-width: 0.5em 1.4em 0.8em 0;
 }
@@ -303,14 +297,10 @@ div.magnify a, div.magnify img {
 	border: none !important;
 	background: none !important;
 }
-div.tright {
-	clear: right;
-	float: right;
+/* @noflip */div.tright {
 	margin: 0.5em 0 1.3em 1.4em;
 }
-div.tleft {
-	float: left;
-	clear: left;
+/* @noflip */div.tleft {
 	margin: 0.5em 1.4em 1.3em 0;
 }
 img.thumbborder {
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 748eb61ada..115ab74bf3 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -63,8 +63,8 @@ div#mw-js-message {
 	margin-left: 5px;
 }
 /* Correct directionality when page dir is different from site/user dir */
-/* @noflip */.mw-content-ltr .editsection, .mw-content-rtl [dir="ltr"] .editsection { float: right; }
-/* @noflip */.mw-content-rtl .editsection, .mw-content-ltr [dir="rtl"] .editsection { float: left; }
+/* @noflip */div#content [dir="ltr"] .editsection, div#content [dir="rtl"] [dir="ltr"] .editsection { float: right; }
+/* @noflip */div#content [dir="rtl"] .editsection, div#content [dir="ltr"] [dir="rtl"] .editsection { float: left; }
 /**
  * File histories
  */
@@ -614,12 +614,12 @@ div.gallerytext {
 }
 
 /* Correct directionality when page dir is different from site/user dir */
-/* @noflip */.mw-content-ltr ul, .mw-content-ltr ol,
-.mw-content-rtl [dir="ltr"] ul, .mw-content-rtl [dir="ltr"] ol {
+/* @noflip */div#content [dir="ltr"] ul, div#content [dir="ltr"] ol,
+div#content [dir="rtl"] [dir="ltr"] ul, div#content [dir="rtl"] [dir="ltr"] ol {
 	margin: .3em 0 0 1.5em;
 }
-/* @noflip */.mw-content-rtl ul, .mw-content-rtl ol,
-.mw-content-ltr [dir="rtl"] ul, .mw-content-ltr [dir="rtl"] ol {
+/* @noflip */div#content [dir="rtl"] ul, div#content [dir="rtl"] ol,
+div#content [dir="ltr"] [dir="rtl"] ul, div#content [dir="ltr"] [dir="rtl"] ol {
 	margin: .3em 1.5em 0 0;
 }
 /* Localised ordered list numbering for some languages */
@@ -649,22 +649,22 @@ ol:lang(or) li {
 }
 
 /* Correct directionality when page dir is different from site/user dir */
-/* @noflip */.mw-content-ltr .toc ul, .mw-content-ltr #toc ul,
-.mw-content-rtl [dir="ltr"] .toc ul, .mw-content-rtl [dir="ltr"] #toc ul {
+/* @noflip */div#content [dir="ltr"] .toc ul, div#content [dir="ltr"] #toc ul,
+div#content [dir="rtl"] [dir="ltr"] .toc ul, div#content [dir="rtl"] [dir="ltr"] #toc ul {
 	text-align: left;
 	margin-left: 0;
 }
-/* @noflip */.mw-content-rtl .toc ul, .mw-content-rtl #toc ul,
-.mw-content-ltr [dir="rtl"] .toc ul, .mw-content-ltr [dir="rtl"] #toc ul {
+/* @noflip */div#content [dir="rtl"] .toc ul, div#content [dir="rtl"] #toc ul,
+div#content [dir="ltr"] [dir="rtl"] .toc ul, div#content [dir="ltr"] [dir="rtl"] #toc ul {
 	text-align: right;
 	margin-right: 0;
 }
-/* @noflip */.mw-content-ltr .toc ul ul, .mw-content-ltr #toc ul ul,
-.mw-content-rtl [dir="ltr"] .toc ul ul, .mw-content-rtl [dir="ltr"] #toc ul ul {
+/* @noflip */div#content [dir="ltr"] .toc ul ul, div#content [dir="ltr"] #toc ul ul,
+div#content [dir="rtl"] [dir="ltr"] .toc ul ul, div#content [dir="rtl"] [dir="ltr"] #toc ul ul {
 	margin: 0 0 0 2em;
 }
-/* @noflip */.mw-content-rtl .toc ul ul, .mw-content-rtl #toc ul ul,
-.mw-content-ltr [dir="rtl"] .toc ul ul, .mw-content-ltr [dir="rtl"] #toc ul ul {
+/* @noflip */div#content [dir="rtl"] .toc ul ul, div#content [dir="rtl"] #toc ul ul,
+div#content [dir="ltr"] [dir="rtl"] .toc ul ul, div#content [dir="ltr"] [dir="rtl"] #toc ul ul {
 	margin: 0 2em 0 0;
 }
 
@@ -775,4 +775,17 @@ th.headerSortDown {
 	border-bottom: 1px solid #aaa;
 	padding-bottom: 0.5em;
 	margin-bottom: 0.5em;
+}
+
+/* Images */
+/* @noflip */div.tright, div.floatright, table.floatright {
+	clear: right;
+	float: right;
+}
+/* @noflip */div.tleft, div.floatleft, table.floatleft {
+	float: left;
+	clear: left;
+}
+div.floatright, table.floatright, div.floatleft, table.floatleft {
+	position: relative;
 }
\ No newline at end of file
diff --git a/skins/modern/main.css b/skins/modern/main.css
index fd266935be..c503b48833 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -479,11 +479,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 /* images */
-/* @noflip */
-div.floatright, table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
+/* @noflip */div.floatright, table.floatright {
 	margin: 0 0 .5em .5em;
 	border: 0;
 /*
@@ -492,11 +488,7 @@ div.floatright, table.floatright {
 */
 }
 div.floatright p { font-style: italic; }
-/* @noflip */
-div.floatleft, table.floatleft {
-	float: left;
-	clear: left;
-	position: relative;
+/* @noflip */div.floatleft, table.floatleft {
 	margin: 0 .5em .5em 0;
 	border: 0;
 /*
@@ -539,16 +531,10 @@ div.magnify a, div.magnify img {
 	border: none !important;
 	background: none !important;
 }
-/* @noflip */
-div.tright {
-	clear: right;
-	float: right;
+/* @noflip */div.tright {
 	margin: .5em 0 .8em 1.4em;
 }
-/* @noflip */
-div.tleft {
-	float: left;
-	clear: left;
+/* @noflip */div.tleft {
 	margin: .5em 1.4em .8em 0;
 }
 img.thumbborder {
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 132c449c50..f27833b59f 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -373,11 +373,7 @@ table.small {
 }
 
 /* images */
-/* @noflip */
-div.floatright, table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
+/* @noflip */div.floatright, table.floatright {
 	margin: 0 0 .5em .5em;
 	border: 0;
 /*
@@ -386,11 +382,7 @@ div.floatright, table.floatright {
 */
 }
 div.floatright p { font-style: italic; }
-/* @noflip */
-div.floatleft, table.floatleft {
-	float: left;
-	clear: left;
-	position: relative;
+/* @noflip */div.floatleft, table.floatleft {
 	margin: 0 .5em .5em 0;
 	border: 0;
 /*
@@ -433,16 +425,10 @@ div.magnify a, div.magnify img {
 	border: none !important;
 	background: none !important;
 }
-/* @noflip */
-div.tright {
-	clear: right;
-	float: right;
+/* @noflip */div.tright {
 	margin: .5em 0 1.3em 1.4em;
 }
-/* @noflip */
-div.tleft {
-	float: left;
-	clear: left;
+/* @noflip */div.tleft {
 	margin: .5em 1.4em 1.3em 0;
 }
 img.thumbborder {
diff --git a/skins/simple/main.css b/skins/simple/main.css
index d5093fc239..db889b9358 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -259,19 +259,13 @@ div.tocindent {
   border-bottom: solid 1px black;
 }
 
-div.floatright, table.floatright {
-    clear: right;
-    float: right;
+/* @noflip */div.floatright, table.floatright {
     margin: 0;
-    position: relative;
     border-width: 0.5em 0 0.8em 1.4em;
 }
 div.floatright p { font-style: italic; }
-div.floatleft, table.floatleft {
-    float: left;
-    clear: left;
+/* @noflip */div.floatleft, table.floatleft {
     margin: 0.3em 0.5em 0.5em 0;
-    position: relative;
     border-width: 0.5em 1.4em 0.8em 0;
 }
 div.floatleft p { font-style: italic; }
@@ -302,14 +296,10 @@ div.magnify a, div.magnify img {
     border: none !important;
     background: none !important;
 }
-div.tright {
-    clear: right;
-    float: right;
+/* @noflip */div.tright {
     border-width: 0.5em 0 0.8em 1.4em;
 }
-div.tleft {
-    float: left;
-    clear: left;
+/* @noflip */div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index 7dc6c69739..44fbffbff3 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -895,18 +895,12 @@ select {
 	font-size: 94%;
 }
 /* Images */
-div.floatright, table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
+/* @noflip */div.floatright, table.floatright {
 	margin: 0 0 .5em .5em;
 	border: 0;
 }
 div.floatright p { font-style: italic; }
-div.floatleft, table.floatleft {
-	float: left;
-	clear: left;
-	position: relative;
+/* @noflip */div.floatleft, table.floatleft {
 	margin: 0 .5em .5em 0;
 	border: 0;
 }
@@ -945,16 +939,10 @@ div.magnify a, div.magnify img {
 	border: none !important;
 	background: none !important;
 }
-/* @noflip */
-div.tright {
-	clear: right;
-	float: right;
+/* @noflip */div.tright {
 	margin: .5em 0 1.3em 1.4em;
 }
-/* @noflip */
-div.tleft {
-	float: left;
-	clear: left;
+/* @noflip */div.tleft {
 	margin: .5em 1.4em 1.3em 0;
 }
 img.thumbborder {
-- 
2.20.1