From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 4 Aug 2016 22:48:34 +0000 (-0700)
Subject: Move Special:Upload styling out of mediawiki.special.styles
X-Git-Tag: 1.31.0-rc.0~6130^2~1
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=2e3ee51f011dc395477f710c790d7a4182b52aa4;p=lhc%2Fweb%2Fwiklou.git

Move Special:Upload styling out of mediawiki.special.styles

...into the specific mediawiki.special.upload.styles module which is
only supposed to be loaded upon Special:Upload.

Change-Id: I782bb3b05ef4fe9f2fc666afe8e1cb9514fc8b52
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index a0e3096f9b..6fcdb00565 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -864,7 +864,7 @@ class UploadForm extends HTMLForm {
 
 		# Add a link to edit MediaWik:Licenses
 		if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
-			$this->getOutput()->addModuleStyles( 'mediawiki.special' );
+			$this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
 			$licensesLink = Linker::linkKnown(
 				$this->msg( 'licenses' )->inContentLanguage()->getTitle(),
 				$this->msg( 'licenses-edit' )->escaped(),
diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css
index f2019e7e4e..4b8eced6fd 100644
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -115,9 +115,3 @@ table.mw-userrights-groups * td,
 table.mw-userrights-groups * th {
 	padding-right: 1.5em;
 }
-
-/* Special:Upload */
-p.mw-upload-editlicenses {
-	font-size: 90%;
-	text-align: right;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.styles.css b/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
index b916248e0c..283df85ae9 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
@@ -8,3 +8,8 @@
 	color: #705000;
 	background-color: #fdf1d1;
 }
+
+p.mw-upload-editlicenses {
+	font-size: 90%;
+	text-align: right;
+}