jenkins-bot has submitted this change and it was merged.
Change subject: Move css for Special:Notifications from global css namespace
......................................................................
Move css for Special:Notifications from global css namespace
Address a nameclash on the way
Add a FIXME to prevent future nameclashes
Change-Id: Id01aff4cb20e30017b9df3b2ee53054d1a731af2
---
M includes/Resources.php
M includes/specials/UnlistedSpecialMobilePage.php
M less/common/user.less
A less/specials/notifications.less
M stylesheets/common/user.css
A stylesheets/specials/notifications.css
6 files changed, 41 insertions(+), 34 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index bab9a98..8ea065e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -359,7 +359,7 @@
),
),
- 'mobile.notifications.styles' => $wgMFMobileResourceBoilerplate + array(
+ 'mobile.toast.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
'stylesheets/common/notifications.css',
),
@@ -383,7 +383,7 @@
'dependencies' => array(
'mobile.startup',
'mobile.stable.dependencies',
- 'mobile.notifications.styles',
+ 'mobile.toast.styles',
'mediawiki.jqueryMsg',
),
'scripts' => array(
@@ -589,6 +589,12 @@
// stop flash of unstyled content when loading from cache
'position' => 'top',
),
+ 'mobile.notifications.styles' => $wgMFMobileResourceBoilerplate + array(
+ 'styles' => array(
+ 'stylesheets/specials/notifications.css',
+ ),
+ 'position' => 'top',
+ ),
'mobile.search.styles' => $wgMFMobileSpecialPageResourceBoilerplate +
array(
'styles' => array(
'stylesheets/specials/search.css',
diff --git a/includes/specials/UnlistedSpecialMobilePage.php
b/includes/specials/UnlistedSpecialMobilePage.php
index 23af2a9..82ba874 100644
--- a/includes/specials/UnlistedSpecialMobilePage.php
+++ b/includes/specials/UnlistedSpecialMobilePage.php
@@ -13,6 +13,7 @@
$title = $this->getTitle();
list( $name, /* $subpage */ ) =
SpecialPageFactory::resolveAlias( $title->getDBkey() );
$id = strtolower( $name );
+ // FIXME: These names should be more specific
$specialStyleModuleName = 'mobile.' . $id . '.styles';
$specialScriptModuleName = 'mobile.' . $id . '.scripts';
diff --git a/less/common/user.less b/less/common/user.less
index 3afcd32..208190c 100644
--- a/less/common/user.less
+++ b/less/common/user.less
@@ -1,5 +1,4 @@
// FIXME: merge with navigation when notifications in stable
-@import '../mf-variables.less';
@import '../mf-mixins.less';
#user-button {
@@ -23,22 +22,4 @@
display: none;
}
}
-}
-
-// FIXME: Echo's HTML is bad
-#mw-echo-special-container {
- list-style: none;
-
- .mw-echo-date-section {
- font-family: @fontFamilyHeading;
- font-size: 1.16em;
- }
-
- .mw-echo-notification {
- margin: .5em 0 1em;
- }
-}
-
-.mw-echo-unread .mw-echo-title {
- font-weight: bold;
}
diff --git a/less/specials/notifications.less b/less/specials/notifications.less
new file mode 100644
index 0000000..43e79e5
--- /dev/null
+++ b/less/specials/notifications.less
@@ -0,0 +1,19 @@
+@import '../mf-variables.less';
+
+// FIXME: Echo's HTML is bad
+#mw-echo-special-container {
+ list-style: none;
+
+ .mw-echo-date-section {
+ font-family: @fontFamilyHeading;
+ font-size: 1.16em;
+ }
+
+ .mw-echo-notification {
+ margin: .5em 0 1em;
+ }
+}
+
+.mw-echo-unread .mw-echo-title {
+ font-weight: bold;
+}
diff --git a/stylesheets/common/user.css b/stylesheets/common/user.css
index fe896da..44408eb 100644
--- a/stylesheets/common/user.css
+++ b/stylesheets/common/user.css
@@ -25,16 +25,3 @@
#user-button span.zero {
display: none;
}
-#mw-echo-special-container {
- list-style: none;
-}
-#mw-echo-special-container .mw-echo-date-section {
- font-family: Georgia, serif;
- font-size: 1.16em;
-}
-#mw-echo-special-container .mw-echo-notification {
- margin: .5em 0 1em;
-}
-.mw-echo-unread .mw-echo-title {
- font-weight: bold;
-}
diff --git a/stylesheets/specials/notifications.css
b/stylesheets/specials/notifications.css
new file mode 100644
index 0000000..655b5b0
--- /dev/null
+++ b/stylesheets/specials/notifications.css
@@ -0,0 +1,13 @@
+#mw-echo-special-container {
+ list-style: none;
+}
+#mw-echo-special-container .mw-echo-date-section {
+ font-family: Georgia, serif;
+ font-size: 1.16em;
+}
+#mw-echo-special-container .mw-echo-notification {
+ margin: .5em 0 1em;
+}
+.mw-echo-unread .mw-echo-title {
+ font-weight: bold;
+}
--
To view, visit https://gerrit.wikimedia.org/r/67908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id01aff4cb20e30017b9df3b2ee53054d1a731af2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
