Merge "Revert "Move CSS for patrol from mediawiki.legacy to new module mediawiki.page.patrol""

includes/diff/DifferenceEngine.php

@@ -555,7 +555,6 @@ class DifferenceEngine extends ContextSource {
 			// Build the link
 			if ( $rcid ) {
 				$this->getOutput()->preventClickjacking();
-				$this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
 				if ( $wgEnableAPI && $wgEnableWriteAPI
 					&& $user->isAllowed( 'writeapi' )
 				) {

includes/page/Article.php

@@ -1196,7 +1196,6 @@ class Article implements Page {
 		$token = $user->getEditToken( $rcid );
 
 		$outputPage->preventClickjacking();
-		$outputPage->addModuleStyles( 'mediawiki.page.patrol' );
 		if ( $wgEnableAPI && $wgEnableWriteAPI && $user->isAllowed( 'writeapi' ) ) {
 			$outputPage->addModules( 'mediawiki.page.patrol.ajax' );
 		}

includes/specials/SpecialNewpages.php

@@ -349,7 +349,6 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 		if ( $this->patrollable( $result ) ) {
 			$classes[] = 'not-patrolled';
-			$this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
 		}
 
 		# Add a class for zero byte pages

resources/Resources.php

@@ -1707,14 +1707,6 @@ return [
 		'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' => [

resources/src/mediawiki.legacy/commonPrint.css

@@ -19,6 +19,7 @@ div#column-one,
 #footer-places,
 .mw-hidden-catlinks,
 .usermessage,
+.patrollink,
 .ns-0 .mw-redirectedfrom,
 div.magnify,
 #mw-navigation,

resources/src/mediawiki.legacy/oldshared.css

@@ -289,6 +289,11 @@ table.small {
 	font-style: italic;
 }
 
+span.unpatrolled {
+	font-weight: bold;
+	color: #f00;
+}
+
 div.gallerybox {
 	width: 150px;
 }

resources/src/mediawiki.legacy/shared.css

@@ -115,6 +115,23 @@ span.history-deleted {
 	font-style: italic;
 }
 
+/**
+ * Patrol stuff
+ */
+.not-patrolled {
+	background-color: #ffa;
+}
+
+.unpatrolled {
+	font-weight: bold;
+	color: #f00;
+}
+
+div.patrollink {
+	font-size: 75%;
+	text-align: right;
+}
+
 /**
  * Forms
  */

resources/src/mediawiki/page/mediawiki.page.patrol.css

@@ -1,13 +0,0 @@
-.not-patrolled {
-	background-color: #ffa;
-}
-
-.unpatrolled {
-	font-weight: bold;
-	color: #f00;
-}
-
-.patrollink {
-	font-size: 75%;
-	text-align: right;
-}

resources/src/mediawiki/page/mediawiki.page.patrol.print.css

@@ -1,3 +0,0 @@
-.patrollink {
-	display: none;
-}