From 579ec5dee1cdb08fc6c94121ff5570a501f98e0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Sun, 16 Aug 2015 16:06:46 +0200 Subject: [PATCH] Rename mediawiki.legacy.feeds to mediawiki.feedlink Follow-up to d51317ccc24940b77f4f7226d9455c801c09b457. There's nothing "legacy" about this newly added module. Also updated comments and marked the copy in shared.css for removal when cached page renders expire. Change-Id: Iabaebe9bf1e11a06bb951769693b1be4404e5b00 --- includes/skins/SkinTemplate.php | 2 +- resources/Resources.php | 10 ++++------ resources/src/mediawiki.legacy/shared.css | 7 ++++--- .../images/feed-icon.png | Bin .../images/feed-icon.svg | 0 .../feeds.css => mediawiki/mediawiki.feedlink.css} | 6 ++++-- 6 files changed, 13 insertions(+), 12 deletions(-) rename resources/src/{mediawiki.legacy => mediawiki}/images/feed-icon.png (100%) rename resources/src/{mediawiki.legacy => mediawiki}/images/feed-icon.svg (100%) rename resources/src/{mediawiki.legacy/feeds.css => mediawiki/mediawiki.feedlink.css} (70%) diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index cc294f8636..a1844a81b2 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -58,7 +58,7 @@ class SkinTemplate extends Skin { 'mediawiki.sectionAnchor' ); if ( $out->isSyndicated() ) { - $moduleStyles[] = 'mediawiki.legacy.feeds'; + $moduleStyles[] = 'mediawiki.feedlink'; } $out->addModuleStyles( $moduleStyles ); } diff --git a/resources/Resources.php b/resources/Resources.php index ec1523e33f..d575c8d6db 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -970,7 +970,10 @@ return array( 'feedback-useragent' ), ), - + 'mediawiki.feedlink' => array( + 'position' => 'top', + 'styles' => 'resources/src/mediawiki/mediawiki.feedlink.css', + ), 'mediawiki.filewarning' => array( 'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js', 'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less', @@ -978,7 +981,6 @@ return array( 'oojs-ui', ), ), - 'mediawiki.helplink' => array( 'position' => 'top', 'styles' => array( @@ -1695,10 +1697,6 @@ return array( /* MediaWiki Legacy */ - 'mediawiki.legacy.feeds' => array( - 'position' => 'top', - 'styles' => 'resources/src/mediawiki.legacy/feeds.css', - ), 'mediawiki.legacy.commonPrint' => array( 'position' => 'top', 'styles' => array( diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index 248ea19fc1..14fd286db2 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -493,13 +493,14 @@ a.new { } /* feed links */ +/* To be removed before 1.26 release, moved to mediawiki.feedlink module */ a.feedlink { /* SVG support using a transparent gradient to guarantee cross-browser * compatibility (browsers able to understand gradient syntax support also SVG). * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */ - background-image: url(images/feed-icon.png); - background-image: -webkit-linear-gradient(transparent, transparent), url(images/feed-icon.svg); - background-image: linear-gradient(transparent, transparent), url(images/feed-icon.svg); + background-image: url(../mediawiki/images/feed-icon.png); + background-image: -webkit-linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg); + background-image: linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg); background-position: center left; background-repeat: no-repeat; background-size: 12px 12px; diff --git a/resources/src/mediawiki.legacy/images/feed-icon.png b/resources/src/mediawiki/images/feed-icon.png similarity index 100% rename from resources/src/mediawiki.legacy/images/feed-icon.png rename to resources/src/mediawiki/images/feed-icon.png diff --git a/resources/src/mediawiki.legacy/images/feed-icon.svg b/resources/src/mediawiki/images/feed-icon.svg similarity index 100% rename from resources/src/mediawiki.legacy/images/feed-icon.svg rename to resources/src/mediawiki/images/feed-icon.svg diff --git a/resources/src/mediawiki.legacy/feeds.css b/resources/src/mediawiki/mediawiki.feedlink.css similarity index 70% rename from resources/src/mediawiki.legacy/feeds.css rename to resources/src/mediawiki/mediawiki.feedlink.css index 9737fd466d..1dda2ac4d1 100644 --- a/resources/src/mediawiki.legacy/feeds.css +++ b/resources/src/mediawiki/mediawiki.feedlink.css @@ -1,5 +1,7 @@ -/* Extracted from mediawiki.legacy.shared, which no longer @embeds the - * background image. The selector below must be more specific. */ +/* Styles for links to RSS/Atom feeds in sidebar */ + +/* Until the copy of this code in mediawiki.legacy.shared is removed, which no longer @embeds the + * background image, the selector below must be kept more specific. */ #feedlinks a.feedlink { /* SVG support using a transparent gradient to guarantee cross-browser * compatibility (browsers able to understand gradient syntax support also SVG). -- 2.20.1