(bug 7932) Make sure that edit toolbar clears floats so it appears correctly.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 290d7cb..5d67f47 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -70,8 +70,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6427) Block blocked IPs from using the mail password function
   to allow blocking of flooders
 * Include common.css from classic-style skins in main HTML with the bump URL
-  FIXME: this may leave doubled rules which won't stand up to certain changes.
-  Will want to adjust these more to eliminate the dupe @includes.
 * (bug 7607) Add Karakalpak (kaa) to Names.php and stub message file for linktrail
 * (bug 7582) Add 'tog-nolangconversion' to MessagesEn.php.
   This key is need for languages with variants (zh, sr, kk)
@@ -185,6 +183,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add auto-summaries to blankings and large removals without summaries.
 * (bug 7811) Allow preview of edit summaries.
 * (bug 6839) Wikibits.js minor changes to make JS-lint happier.
+* (bug 7932) Make sure that edit toolbar clears floats so it appears correctly.
 
 
 == Languages updated ==

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4ec38c7..e898387 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1037,7 +1037,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '27';
+$wgStyleVersion = '28';
 
 # Server-side caching:
 

diff --git a/skins/chick/main.css b/skins/chick/main.css
index 24034c8..b736722 100644 (file)
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -490,4 +490,6 @@ div.gallerytext {
   display: none;
 }
 
-.templatesUsed { margin-top: 1.5em; }
\ No newline at end of file
+.templatesUsed { margin-top: 1.5em; }
+
+#toolbar { clear: both; }
\ No newline at end of file

diff --git a/skins/common/common.css b/skins/common/common.css
index 3d4bc5e..d7ec2df 100644 (file)
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -455,4 +455,6 @@ table.multipageimage td {
 .imagelist .TablePager_col_img_description { white-space: normal }
 .imagelist th.TablePager_sort { background-color: #ccccff }
 
-.templatesUsed { margin-top: 1em; }
\ No newline at end of file
+.templatesUsed { margin-top: 1em; }
+
+#toolbar { clear: both; }
\ No newline at end of file

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 898b3a6..16496a3 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1538,3 +1538,4 @@ table.multipageimage td {
 .mw-summary-preview {
        margin: 0.1em 0;
 }
+#toolbar { clear: both; }
\ No newline at end of file

diff --git a/skins/simple/main.css b/skins/simple/main.css
index 8bed0f9..abbb259 100644 (file)
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -434,4 +434,5 @@ table.collapsed tr.collapsable {
        margin-left: 5px;
 }
 
-.templatesUsed { margin-top: 1.5em; }
\ No newline at end of file
+.templatesUsed { margin-top: 1.5em; }
+#toolbar { clear: both; }
\ No newline at end of file