Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303353
Change subject: Move CSS for patrol from mediawiki.legacy to new module
mediawiki.page.patrol
......................................................................
Move CSS for patrol from mediawiki.legacy to new module mediawiki.page.patrol
Bug: T89981
Change-Id: Ib79d17fab61b1a7b940b2acff6d19a58a3fe0bc9
---
M includes/diff/DifferenceEngine.php
M includes/page/Article.php
M includes/specials/SpecialNewpages.php
M resources/Resources.php
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/oldshared.css
M resources/src/mediawiki.legacy/shared.css
A resources/src/mediawiki/page/mediawiki.page.patrol.css
A resources/src/mediawiki/page/mediawiki.page.patrol.print.css
9 files changed, 30 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/303353/1
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index 33955b2..89d2389 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -533,6 +533,7 @@
// Build the link
if ( $rcid ) {
$this->getOutput()->preventClickjacking();
+ $this->getOutput()->addModuleStyles(
'mediawiki.page.patrol' );
if ( $wgEnableAPI && $wgEnableWriteAPI
&& $user->isAllowed( 'writeapi' )
) {
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 6396aaa..f5a860e 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1196,6 +1196,7 @@
$token = $user->getEditToken( $rcid );
$outputPage->preventClickjacking();
+ $outputPage->addModuleStyles( 'mediawiki.page.patrol' );
if ( $wgEnableAPI && $wgEnableWriteAPI && $user->isAllowed(
'writeapi' ) ) {
$outputPage->addModules( 'mediawiki.page.patrol.ajax' );
}
diff --git a/includes/specials/SpecialNewpages.php
b/includes/specials/SpecialNewpages.php
index 718a6dc..d2513ed 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -349,6 +349,7 @@
if ( $this->patrollable( $result ) ) {
$classes[] = 'not-patrolled';
+ $this->getOutput()->addModuleStyles(
'mediawiki.page.patrol' );
}
# Add a class for zero byte pages
diff --git a/resources/Resources.php b/resources/Resources.php
index 5c60201..0d8d39f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1706,6 +1706,14 @@
'position' => 'top',
'targets' => [ 'desktop', 'mobile' ],
],
+ 'mediawiki.page.patrol' => [
+ 'position' => 'top',
+ 'styles' => [
+
'resources/src/mediawiki/page/mediawiki.page.patrol.css',
+
'resources/src/mediawiki/page/mediawiki.page.patrol.print.css'
+ => [ 'media' => 'print' ],
+ ]
+ ],
'mediawiki.page.patrol.ajax' => [
'scripts' => 'resources/src/mediawiki/page/patrol.ajax.js',
'dependencies' => [
diff --git a/resources/src/mediawiki.legacy/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
index d387a2d..6a7c76a 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -19,7 +19,6 @@
#footer-places,
.mw-hidden-catlinks,
.usermessage,
-.patrollink,
.ns-0 .mw-redirectedfrom,
div.magnify,
#mw-navigation,
diff --git a/resources/src/mediawiki.legacy/oldshared.css
b/resources/src/mediawiki.legacy/oldshared.css
index 7ccf59e..786f53d 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -289,11 +289,6 @@
font-style: italic;
}
-span.unpatrolled {
- font-weight: bold;
- color: #f00;
-}
-
div.gallerybox {
width: 150px;
}
diff --git a/resources/src/mediawiki.legacy/shared.css
b/resources/src/mediawiki.legacy/shared.css
index 8fcc667..e9cbbcb 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -124,23 +124,6 @@
}
/**
- * Patrol stuff
- */
-.not-patrolled {
- background-color: #ffa;
-}
-
-.unpatrolled {
- font-weight: bold;
- color: #f00;
-}
-
-div.patrollink {
- font-size: 75%;
- text-align: right;
-}
-
-/**
* Forms
*/
td.mw-label {
diff --git a/resources/src/mediawiki/page/mediawiki.page.patrol.css
b/resources/src/mediawiki/page/mediawiki.page.patrol.css
new file mode 100644
index 0000000..8b54172
--- /dev/null
+++ b/resources/src/mediawiki/page/mediawiki.page.patrol.css
@@ -0,0 +1,16 @@
+/**
+ * Patrol stuff
+ */
+.not-patrolled {
+ background-color: #ffa;
+}
+
+.unpatrolled {
+ font-weight: bold;
+ color: #f00;
+}
+
+div.patrollink {
+ font-size: 75%;
+ text-align: right;
+}
diff --git a/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
b/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
new file mode 100644
index 0000000..497bceb
--- /dev/null
+++ b/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
@@ -0,0 +1,3 @@
+.patrollink {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/303353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib79d17fab61b1a7b940b2acff6d19a58a3fe0bc9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
