jenkins-bot has submitted this change and it was merged.
Change subject: Rename mediawiki.legacy.feeds to mediawiki.feedlink
......................................................................
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
---
M includes/skins/SkinTemplate.php
M resources/Resources.php
M resources/src/mediawiki.legacy/shared.css
R resources/src/mediawiki/images/feed-icon.png
R resources/src/mediawiki/images/feed-icon.svg
R resources/src/mediawiki/mediawiki.feedlink.css
6 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index cc294f8..a1844a8 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -58,7 +58,7 @@
'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 ec1523e..d575c8d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -970,7 +970,10 @@
'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 @@
'oojs-ui',
),
),
-
'mediawiki.helplink' => array(
'position' => 'top',
'styles' => array(
@@ -1695,10 +1697,6 @@
/* 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 248ea19..14fd286 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -493,13 +493,14 @@
}
/* 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
Binary files differ
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 69%
rename from resources/src/mediawiki.legacy/feeds.css
rename to resources/src/mediawiki/mediawiki.feedlink.css
index 9737fd4..1dda2ac 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).
--
To view, visit https://gerrit.wikimedia.org/r/231879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabaebe9bf1e11a06bb951769693b1be4404e5b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
