* (bug 8711) Stop floats in previews from spilling into edit area with toolbar disabl...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bd5cdaa..54bf8f3 100644 (file)
--- 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 44e0c83..15ac044 100644 (file)
--- 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 24ca32e..af4a6fa 100644 (file)
--- 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 46f6588..f05a4a5 100644 (file)
--- 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 d6375de..85e6ad4 100644 (file)
--- 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 517765c..3bf74e2 100644 (file)
--- 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 f24f3f4..03b0da9 100644 (file)
--- 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