Merge "(bug 260) Handle <pre> overflow automatically with a scroll bar"

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index ed92593..fcbb531 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -148,6 +148,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
   who don't have access to /tmp can specify an alternative.
 * (bug 27283) SqlBagOStuff breaks PostgreSQL transactions.
 * (bug 35727) mw.Api ajax() should put token parameter last.
+* (bug 260) Handle <pre> overflow automatically with a scroll bar.
 * (bug 37708) mw.Uri.clone() should make a deep copy.
 * (bug 38024) ResourceLoader should not create empty stylesheets for modules
   that don't have stylesheets.

diff --git a/skins/common/commonElements.css b/skins/common/commonElements.css
index 02fd29f..903a4f7 100644 (file)
--- a/skins/common/commonElements.css
+++ b/skins/common/commonElements.css
@@ -198,6 +198,12 @@ pre, .mw-code {
        border: 1px dashed #2f6fab;
        color: black;
        background-color: #f9f9f9;
+       /* Handle overflow (bug 260) */
+       overflow: auto;
+       /* IE 7 is the first IE to support overflow but got it wrong */
+       /* IE 8+ is fine */
+       *padding-bottom: 21px;
+       *overflow-y: hidden;
 }
 
 /* Tables */