From 7fc0a99bcf6db6d682918deeb527a1b3a9eebd1a Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sat, 10 Oct 2015 08:41:43 +0200 Subject: [PATCH] Move some styles of convenience links to mediawiki.special Moved the style of convenience links for special pages to the mediawiki.special module to keep it out of shared.css Change-Id: I57ba598c48f8c1ea4bca978b6bf83d157d9dad1c --- includes/specials/SpecialBlock.php | 2 ++ includes/specials/SpecialRevisiondelete.php | 2 ++ includes/specials/SpecialUpload.php | 1 + resources/src/mediawiki.legacy/shared.css | 8 ++------ .../mediawiki.special/mediawiki.special.css | 18 ++++++++++++++++++ 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index cd6cc76e8e..e125d9441d 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -361,6 +361,8 @@ class SpecialBlock extends FormSpecialPage { protected function postText() { $links = array(); + $this->getOutput()->addModuleStyles( 'mediawiki.special' ); + # Link to the user's contributions, if applicable if ( $this->target instanceof User ) { $contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->target->getName() ); diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php index 7c27ac418c..c98aa461e0 100644 --- a/includes/specials/SpecialRevisiondelete.php +++ b/includes/specials/SpecialRevisiondelete.php @@ -408,6 +408,8 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { // Show form if the user can submit if ( $this->mIsAllowed ) { + $out->addModuleStyles( 'mediawiki.special' ); + $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getPageTitle()->getLocalURL( array( 'action' => 'submit' ) ), 'id' => 'mw-revdel-form-revisions' ) ) . diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index ad4407690d..7b98a34815 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -819,6 +819,7 @@ class UploadForm extends HTMLForm { # Add a link to edit MediaWik:Licenses if ( $this->getUser()->isAllowed( 'editinterface' ) ) { + $this->getOutput()->addModuleStyles( 'mediawiki.special' ); $licensesLink = Linker::linkKnown( $this->msg( 'licenses' )->inContentLanguage()->getTitle(), $this->msg( 'licenses-edit' )->escaped(), diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index f8143fa51e..b0201c7526 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -284,15 +284,11 @@ input#wpSummary { } /** - * Convenience links to edit block, delete and protect reasons - * and upload licenses + * Convenience links to edit delete and protect reasons */ -p.mw-ipb-conveniencelinks, p.mw-protect-editreasons, p.mw-filedelete-editreasons, -p.mw-delete-editreasons, -p.mw-revdel-editreasons, -p.mw-upload-editlicenses { +p.mw-delete-editreasons { font-size: 90%; text-align: right; } diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css index 60544d3248..42076f4f8e 100644 --- a/resources/src/mediawiki.special/mediawiki.special.css +++ b/resources/src/mediawiki.special/mediawiki.special.css @@ -43,6 +43,12 @@ ul.mw-allpages-chunk li { font-style: italic; } +/* Special:Block */ +p.mw-ipb-conveniencelinks { + font-size: 90%; + text-align: right; +} + /* Special:BlockList */ table.mw-blocklist span.mw-usertoollinks, span.mw-blocklist-actions { @@ -87,6 +93,12 @@ td#mw-prefixindex-nav-form { text-align: right; } +/* Special:RevisionDelete */ +p.mw-revdel-editreasons { + font-size: 90%; + text-align: right; +} + /* Special:Specialpages */ .mw-specialpagerestricted { font-weight: bold; @@ -124,6 +136,12 @@ table.mw-userrights-groups * th { padding-right: 1.5em; } +/* Special:Upload */ +p.mw-upload-editlicenses { + font-size: 90%; + text-align: right; +} + /* Special:Contributions */ .mw-contributions-form select { vertical-align: middle; -- 2.20.1