Hello Bartosz Dziewoński, Catrope, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/344806
to review the following change.
Change subject: Revert "Simplify definition of 'ext.echo.badgeicons' module"
......................................................................
Revert "Simplify definition of 'ext.echo.badgeicons' module"
This reverts commit c39fffd82f0f9e292bd2f9af62762fc7f6926ceb.
Change-Id: I9d40ae59d6b93d926831de02fd5c9db2359dc1ba
---
M extension.json
R modules/icons/apex/badgeicons.json
C modules/icons/mediawiki/badgeicons.json
3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/06/344806/1
diff --git a/extension.json b/extension.json
index 4f906bf..d96e2e9 100644
--- a/extension.json
+++ b/extension.json
@@ -519,9 +519,10 @@
]
},
"ext.echo.badgeicons": {
- "class": "ResourceLoaderImageModule",
+ "class": "ResourceLoaderOOUIImageModule",
"position": "top",
- "data": "icons/badgeicons.json",
+ "name": "badgeicons",
+ "rootPath": "icons",
"selectorWithoutVariant": ".oo-ui-icon-{name}",
"selectorWithVariant":
".oo-ui-image-{variant}.oo-ui-icon-{name}"
}
diff --git a/modules/icons/badgeicons.json b/modules/icons/apex/badgeicons.json
similarity index 60%
rename from modules/icons/badgeicons.json
rename to modules/icons/apex/badgeicons.json
index 1593a5c..85ff3ca 100644
--- a/modules/icons/badgeicons.json
+++ b/modules/icons/apex/badgeicons.json
@@ -1,4 +1,5 @@
{
+ "prefix": "oo-ui-icon",
"variants": {
"invert": {
"color": "#FFFFFF"
@@ -6,13 +7,13 @@
},
"images": {
"bell": {
- "file": "icons/bell.svg"
+ "file": "../bell.svg"
},
"tray": {
- "file": "icons/tray.svg"
+ "file": "../tray.svg"
},
"doubleCheck": {
- "file": "icons/double-check.svg",
+ "file": "../double-check.svg",
"variants": [ "invert" ]
}
}
diff --git a/modules/icons/badgeicons.json
b/modules/icons/mediawiki/badgeicons.json
similarity index 60%
copy from modules/icons/badgeicons.json
copy to modules/icons/mediawiki/badgeicons.json
index 1593a5c..85ff3ca 100644
--- a/modules/icons/badgeicons.json
+++ b/modules/icons/mediawiki/badgeicons.json
@@ -1,4 +1,5 @@
{
+ "prefix": "oo-ui-icon",
"variants": {
"invert": {
"color": "#FFFFFF"
@@ -6,13 +7,13 @@
},
"images": {
"bell": {
- "file": "icons/bell.svg"
+ "file": "../bell.svg"
},
"tray": {
- "file": "icons/tray.svg"
+ "file": "../tray.svg"
},
"doubleCheck": {
- "file": "icons/double-check.svg",
+ "file": "../double-check.svg",
"variants": [ "invert" ]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/344806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d40ae59d6b93d926831de02fd5c9db2359dc1ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
