jenkins-bot has submitted this change and it was merged.
Change subject: Further improve load order of RC and watchlist styling
......................................................................
Further improve load order of RC and watchlist styling
This mainly addresses a regression in
I639a5ccbc3b7b2794e7b12ecb64e5ee6b10a640a, causing the bolding of
unread titles to be applied trough JS loading of the CSS.
Bug: 49610
Change-Id: I5cc20a342ebb566262e3aa1e9fe2cdf866a662c3
---
M includes/ChangesList.php
M resources/Resources.php
M resources/mediawiki.special/mediawiki.special.changeslist.css
A resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
4 files changed, 68 insertions(+), 52 deletions(-)
Approvals:
Matmarex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 02c02e0..57c8f0b 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -194,7 +194,7 @@
$this->rcCacheIndex = 0;
$this->lastdate = '';
$this->rclistOpen = false;
- $this->getOutput()->addModules( 'mediawiki.special.changeslist'
);
+ $this->getOutput()->addModuleStyles(
'mediawiki.special.changeslist' );
return '';
}
@@ -703,7 +703,14 @@
$this->rcCacheIndex = 0;
$this->lastdate = '';
$this->rclistOpen = false;
- $this->getOutput()->addModules( 'mediawiki.special.changeslist'
);
+ $this->getOutput()->addModuleStyles( array(
+ 'mediawiki.special.changeslist',
+ 'mediawiki.special.changeslist.enhanced',
+ ) );
+ $this->getOutput()->addModules( array(
+ 'jquery.makeCollapsible',
+ 'mediawiki.icon',
+ ) );
return '';
}
/**
diff --git a/resources/Resources.php b/resources/Resources.php
index 90c6c95..73c73a4 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -913,7 +913,9 @@
),
'mediawiki.special.changeslist' => array(
'styles' =>
'resources/mediawiki.special/mediawiki.special.changeslist.css',
- 'dependencies' => array( 'jquery.makeCollapsible',
'mediawiki.icon' ),
+ ),
+ 'mediawiki.special.changeslist.enhanced' => array(
+ 'styles' =>
'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
),
'mediawiki.special.movePage' => array(
'scripts' =>
'resources/mediawiki.special/mediawiki.special.movePage.js',
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css
b/resources/mediawiki.special/mediawiki.special.changeslist.css
index 7b3740e..5e4af7b 100644
--- a/resources/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.css
@@ -2,54 +2,6 @@
* Styling for Special:Watchlist and Special:RecentChanges
*/
-table.mw-enhanced-rc {
- border: 0;
- border-spacing: 0;
-}
-
-table.mw-enhanced-rc th,
-table.mw-enhanced-rc td {
- padding: 0;
- vertical-align: top;
-}
-
-td.mw-enhanced-rc {
- white-space: nowrap;
- font-family: monospace;
-}
-
-.mw-enhanced-rc-time {
- font-family: monospace;
-}
-
-table.mw-enhanced-rc td.mw-enhanced-rc-nested {
- padding-left: 1em;
-}
-
-/* Show/hide arrows in enhanced changeslist */
-.mw-enhanced-rc .collapsible-expander {
- float: none;
-}
-
-/* If JS is disabled, the arrows or the placeholder space shouldn't be shown */
-.client-nojs .mw-enhancedchanges-arrow-space {
- display: none;
-}
-
-.mw-enhancedchanges-arrow-space {
- display: inline-block;
- *display: inline; /* IE7 and below */
- zoom: 1;
- width: 15px;
- height: 15px;
-}
-
-/* let it look like it is clickable */
-.mw-enhancedchanges-arrow.mw-collapsible-toggle {
- cursor: pointer;
-}
-
-.mw-changeslist-line-watched .mw-title,
-.mw-enhanced-watched .mw-enhanced-rc-time {
+.mw-changeslist-line-watched .mw-title {
font-weight: bold;
}
diff --git
a/resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
b/resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
new file mode 100644
index 0000000..2632c78
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
@@ -0,0 +1,55 @@
+/**
+ * Styling for Special:Watchlist and Special:RecentChanges when preference
'usenewrc'
+ * a.k.a. Enhanced Recent Changes is enabled.
+ */
+
+table.mw-enhanced-rc {
+ border: 0;
+ border-spacing: 0;
+}
+
+table.mw-enhanced-rc th,
+table.mw-enhanced-rc td {
+ padding: 0;
+ vertical-align: top;
+}
+
+td.mw-enhanced-rc {
+ white-space: nowrap;
+ font-family: monospace;
+}
+
+.mw-enhanced-rc-time {
+ font-family: monospace;
+}
+
+table.mw-enhanced-rc td.mw-enhanced-rc-nested {
+ padding-left: 1em;
+}
+
+/* Show/hide arrows in enhanced changeslist */
+.mw-enhanced-rc .collapsible-expander {
+ float: none;
+}
+
+/* If JS is disabled, the arrows or the placeholder space shouldn't be shown */
+.client-nojs .mw-enhancedchanges-arrow-space {
+ display: none;
+}
+
+.mw-enhancedchanges-arrow-space {
+ display: inline-block;
+ *display: inline; /* IE7 and below */
+ zoom: 1;
+ width: 15px;
+ height: 15px;
+}
+
+/* let it look like it is clickable */
+.mw-enhancedchanges-arrow.mw-collapsible-toggle {
+ cursor: pointer;
+}
+
+.mw-enhanced-watched .mw-enhanced-rc-time {
+ font-weight: bold;
+}
--
To view, visit https://gerrit.wikimedia.org/r/68601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cc20a342ebb566262e3aa1e9fe2cdf866a662c3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Matmarex <matma....@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
