* (bug 17648) Prevent floats from intruding into edit area in previews if no toolbar...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 26e333d..2f95a43 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -220,6 +220,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17546) Correct Tongan language native name is "lea faka-Tonga"
 * (bug 17621) Special:WantedFiles has no link to Special:Whatlinkshere
 * (bug 17460) Client ecoding is now correctly set for PostgreSQL
+* (bug 17648) Prevent floats from intruding into edit area in previews if no toolbar present
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/skins/common/shared.css b/skins/common/shared.css
index b66ca0e..1a80176 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -14,7 +14,7 @@ span.texhtml { font-family: serif; }
 #wikiPreview.ontop { margin-bottom: 1em; }
 
 /* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
+#editform, #toolbar, #wpTextbox1 { clear: both; }
 
 div#mw-js-message {
        margin: 1em 5%;