From ad15aad60dd63aaad946f825377f0f9181094340 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 2 Feb 2007 00:29:35 +0000
Subject: [PATCH] * (bug 8711) Stop floats in previews from spilling into edit
 area with toolbar disabled.  Doesn't seem to happen on most browsers anyway,
 but no harm in adding an extra clear for any it might work that way on.

---
 RELEASE-NOTES                | 1 +
 includes/DefaultSettings.php | 2 +-
 skins/chick/main.css         | 5 +++--
 skins/common/common.css      | 5 +++--
 skins/monobook/handheld.css  | 5 +++--
 skins/monobook/main.css      | 5 +++--
 skins/simple/main.css        | 5 +++--
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bd5cdaa7c4..54bf8f3fd9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -157,6 +157,7 @@ lighter making things easier to read.
 * (bug 8819) Fix full path disclosure in with skins dependencies
 * Fixed bug affecting HTML formatting in sortable table column titles
 * Merged table sorting code into wikibits.js
+* (bug 8711) Stop floats in previews from spilling into edit area
 
 
 == Languages updated ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 44e0c837f8..15ac0442f5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1110,7 +1110,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '53';
+$wgStyleVersion = '54';
 
 
 # Server-side caching:
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 24ca32ed29..af4a6fae22 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -489,6 +489,7 @@ div.gallerytext {
  * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
  * When the day comes, it can be moved to a *real* common.css.
  */
-#toolbar { clear: both; }
 .mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
\ No newline at end of file
+.texvc { direction: ltr; unicode-bidi: embed; }
+/* Stop floats from intruding into edit area in previews */
+#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
diff --git a/skins/common/common.css b/skins/common/common.css
index 46f6588e8d..f05a4a5f62 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -463,6 +463,7 @@ p.mw-ipb-conveniencelinks {
  * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
  * When the day comes, it can be moved to a *real* common.css.
  */
-#toolbar { clear: both; }
 .mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
\ No newline at end of file
+.texvc { direction: ltr; unicode-bidi: embed; }
+/* Stop floats from intruding into edit area in previews */
+#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
diff --git a/skins/monobook/handheld.css b/skins/monobook/handheld.css
index d6375de13d..85e6ad4f74 100644
--- a/skins/monobook/handheld.css
+++ b/skins/monobook/handheld.css
@@ -1327,6 +1327,7 @@ tr.sv-space td { display: none; }
  * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
  * When the day comes, it can be moved to a *real* common.css.
  */
-#toolbar { clear: both; }
 .mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
\ No newline at end of file
+.texvc { direction: ltr; unicode-bidi: embed; }
+/* Stop floats from intruding into edit area in previews */
+#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 517765c4b8..3bf74e2f8a 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1613,6 +1613,7 @@ p.mw-ipb-conveniencelinks {
  * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
  * When the day comes, it can be moved to a *real* common.css.
  */
-#toolbar { clear: both; }
 .mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
\ No newline at end of file
+.texvc { direction: ltr; unicode-bidi: embed; }
+/* Stop floats from intruding into edit area in previews */
+#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
diff --git a/skins/simple/main.css b/skins/simple/main.css
index f24f3f46de..03b0da9e8f 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -442,6 +442,7 @@ table.collapsed tr.collapsable {
  * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
  * When the day comes, it can be moved to a *real* common.css.
  */
-#toolbar { clear: both; }
 .mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
\ No newline at end of file
+.texvc { direction: ltr; unicode-bidi: embed; }
+/* Stop floats from intruding into edit area in previews */
+#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
-- 
2.20.1