http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70605

Revision: 70605
Author:   catrope
Date:     2010-08-06 22:51:50 +0000 (Fri, 06 Aug 2010)

Log Message:
-----------
1.16wmf4: MFT r67784, r67928

Modified Paths:
--------------
    branches/wmf/1.16wmf4/includes/GlobalFunctions.php
    branches/wmf/1.16wmf4/skins/vector/main-ltr.css
    branches/wmf/1.16wmf4/skins/vector/main-rtl.css

Modified: branches/wmf/1.16wmf4/includes/GlobalFunctions.php
===================================================================
--- branches/wmf/1.16wmf4/includes/GlobalFunctions.php  2010-08-06 22:24:57 UTC 
(rev 70604)
+++ branches/wmf/1.16wmf4/includes/GlobalFunctions.php  2010-08-06 22:51:50 UTC 
(rev 70605)
@@ -2063,7 +2063,7 @@
                        $notice = '';
                }
        }
-
+       $notice = '<div id="localNotice">'.$notice.'</div>';
        wfProfileOut( $fname );
        return $notice;
 }

Modified: branches/wmf/1.16wmf4/skins/vector/main-ltr.css
===================================================================
--- branches/wmf/1.16wmf4/skins/vector/main-ltr.css     2010-08-06 22:24:57 UTC 
(rev 70604)
+++ branches/wmf/1.16wmf4/skins/vector/main-ltr.css     2010-08-06 22:51:50 UTC 
(rev 70605)
@@ -936,18 +936,15 @@
        padding: .5em 1em;
        vertical-align: middle;
 }
-/* Site Notice */
+/* Site Notice (includes notices from CentralNotice extension) */
 #siteNotice {
        text-align: center;
        font-size: 0.8em;
        margin: 0;
 }
-       #siteNotice div,
-       #siteNotice p {
-               margin: 0;
-               padding: 0;
-               margin-bottom: 0.9em;
-       }
+#localNotice {
+       margin-bottom: 0.9em;
+}
 /* Categories */
 .catlinks {
        border: 1px solid #aaa;

Modified: branches/wmf/1.16wmf4/skins/vector/main-rtl.css
===================================================================
--- branches/wmf/1.16wmf4/skins/vector/main-rtl.css     2010-08-06 22:24:57 UTC 
(rev 70604)
+++ branches/wmf/1.16wmf4/skins/vector/main-rtl.css     2010-08-06 22:51:50 UTC 
(rev 70605)
@@ -936,18 +936,15 @@
        padding: .5em 1em;
        vertical-align: middle;
 }
-/* Site Notice */
+/* Site Notice (includes notices from CentralNotice extension) */
 #siteNotice {
        text-align: center;
        font-size: 0.8em;
        margin: 0;
 }
-       #siteNotice div,
-       #siteNotice p {
-               margin: 0;
-               padding: 0;
-               margin-bottom: 0.9em;
-       }
+#localNotice {
+       margin-bottom: 0.9em;
+}
 /* Categories */
 .catlinks {
        border: 1px solid #aaa;



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to