From: jdlrobson Date: Tue, 21 Apr 2015 22:05:03 +0000 (-0700) Subject: mediawiki.notification: Allow skins to style notification area X-Git-Tag: 1.31.0-rc.0~11475 X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=3f217db8e6c5a95e6e3f3f902b70749e834e5c09;p=lhc%2Fweb%2Fwiklou.git mediawiki.notification: Allow skins to style notification area Minerva skin styles notifications at the bottom of the screen. This change allows Minerva to style notifications consistently. It is a breaking change for skins that use skinStyles for mediawiki.notification module as these will now need to be adjusted to add to styles rather than replace. See: I1645cbb81a3c76a07695d4c3d9a26a1d698f6ff4 Bug: T66565 Change-Id: Iba35692d38a8248096153146bc296b1079352f01 --- diff --git a/resources/Resources.php b/resources/Resources.php index b32dd33c93..c8cb3a3be6 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -981,10 +981,13 @@ return array( ), 'mediawiki.notification' => array( 'styles' => array( - 'resources/src/mediawiki/mediawiki.notification.css', + 'resources/src/mediawiki/mediawiki.notification.common.css', 'resources/src/mediawiki/mediawiki.notification.hideForPrint.css' => array( 'media' => 'print' ), ), + 'skinStyles' => array( + 'default' => 'resources/src/mediawiki/mediawiki.notification.css', + ), 'scripts' => 'resources/src/mediawiki/mediawiki.notification.js', 'dependencies' => 'mediawiki.page.startup', 'targets' => array( 'desktop', 'mobile' ), diff --git a/resources/src/mediawiki/mediawiki.notification.common.css b/resources/src/mediawiki/mediawiki.notification.common.css new file mode 100644 index 0000000000..a1309c29e5 --- /dev/null +++ b/resources/src/mediawiki/mediawiki.notification.common.css @@ -0,0 +1,7 @@ +.mw-notification-area { + position: absolute; +} + +.mw-notification-area-floating { + position: fixed; +} diff --git a/resources/src/mediawiki/mediawiki.notification.css b/resources/src/mediawiki/mediawiki.notification.css index ae399ce746..954de22234 100644 --- a/resources/src/mediawiki/mediawiki.notification.css +++ b/resources/src/mediawiki/mediawiki.notification.css @@ -1,5 +1,4 @@ .mw-notification-area { - position: absolute; top: 0; right: 0; padding: 1em 1em 0 0; @@ -8,10 +7,6 @@ z-index: 10000; } -.mw-notification-area-floating { - position: fixed; -} - .mw-notification { padding: 0.25em 1em; margin-bottom: 0.5em;