jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Move CSS for patrol from mediawiki.legacy to new module
mediawiki.page.patrol"
......................................................................
Revert "Move CSS for patrol from mediawiki.legacy to new module
mediawiki.page.patrol"
This reverts commit e9f896d6a5c09838b92bcb871c306b25526c3f96.
Bug: T142750
Change-Id: Idb815d64d795d790ea2c07f2b5188ea5a46bfefb
---
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
D resources/src/mediawiki/page/mediawiki.page.patrol.css
D resources/src/mediawiki/page/mediawiki.page.patrol.print.css
9 files changed, 23 insertions(+), 27 deletions(-)
Approvals:
Dereckson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index 4a6ac8e..baec396 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -555,7 +555,6 @@
// 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 f5a860e..6396aaa 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1196,7 +1196,6 @@
$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 d2513ed..718a6dc 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -349,7 +349,6 @@
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 053c3f3..d210aab 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1707,14 +1707,6 @@
'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 6a7c76a..d387a2d 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -19,6 +19,7 @@
#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 786f53d..7ccf59e 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -289,6 +289,11 @@
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 38d2a27..de442e9 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -116,6 +116,23 @@
}
/**
+ * 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
deleted file mode 100644
index f237dbd..0000000
--- a/resources/src/mediawiki/page/mediawiki.page.patrol.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.not-patrolled {
- background-color: #ffa;
-}
-
-.unpatrolled {
- font-weight: bold;
- color: #f00;
-}
-
-.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
deleted file mode 100644
index 497bceb..0000000
--- a/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.patrollink {
- display: none;
-}
--
To view, visit https://gerrit.wikimedia.org/r/304412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb815d64d795d790ea2c07f2b5188ea5a46bfefb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.14
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
