Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266233
Change subject: MediaWiki theme: Make icon variants actually work for all icons
......................................................................
MediaWiki theme: Make icon variants actually work for all icons
Follow-up to 0f239114458a4f27f13121828412bd71ae2e29ee. The simple
"prefix" configuration only works if there are no variants.
Bug: T124658
Change-Id: If2e4b788738ad3e8715a8a744781378920cd84cb
---
M src/themes/mediawiki/icons-accessibility.json
M src/themes/mediawiki/icons-alerts.json
M src/themes/mediawiki/icons-content.json
M src/themes/mediawiki/icons-editing-advanced.json
M src/themes/mediawiki/icons-editing-core.json
M src/themes/mediawiki/icons-editing-list.json
M src/themes/mediawiki/icons-editing-styling.json
M src/themes/mediawiki/icons-interactions.json
M src/themes/mediawiki/icons-layout.json
M src/themes/mediawiki/icons-location.json
M src/themes/mediawiki/icons-media.json
M src/themes/mediawiki/icons-moderation.json
M src/themes/mediawiki/icons-movement.json
M src/themes/mediawiki/icons-user.json
M src/themes/mediawiki/icons-wikimedia.json
15 files changed, 30 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/33/266233/1
diff --git a/src/themes/mediawiki/icons-accessibility.json
b/src/themes/mediawiki/icons-accessibility.json
index ef539bd..c855f16 100644
--- a/src/themes/mediawiki/icons-accessibility.json
+++ b/src/themes/mediawiki/icons-accessibility.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-alerts.json
b/src/themes/mediawiki/icons-alerts.json
index 701166a..04c5299 100644
--- a/src/themes/mediawiki/icons-alerts.json
+++ b/src/themes/mediawiki/icons-alerts.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-content.json
b/src/themes/mediawiki/icons-content.json
index 73af2f1..f5b6693 100644
--- a/src/themes/mediawiki/icons-content.json
+++ b/src/themes/mediawiki/icons-content.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-advanced.json
b/src/themes/mediawiki/icons-editing-advanced.json
index 27e3b0e..dbb3411 100644
--- a/src/themes/mediawiki/icons-editing-advanced.json
+++ b/src/themes/mediawiki/icons-editing-advanced.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-core.json
b/src/themes/mediawiki/icons-editing-core.json
index 3bacb60..2a383df 100644
--- a/src/themes/mediawiki/icons-editing-core.json
+++ b/src/themes/mediawiki/icons-editing-core.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-list.json
b/src/themes/mediawiki/icons-editing-list.json
index cfd4abc..a8ace26 100644
--- a/src/themes/mediawiki/icons-editing-list.json
+++ b/src/themes/mediawiki/icons-editing-list.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-editing-styling.json
b/src/themes/mediawiki/icons-editing-styling.json
index e070154..f7d63a1 100644
--- a/src/themes/mediawiki/icons-editing-styling.json
+++ b/src/themes/mediawiki/icons-editing-styling.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-interactions.json
b/src/themes/mediawiki/icons-interactions.json
index 02dfffa..d5c0662 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-layout.json
b/src/themes/mediawiki/icons-layout.json
index c507284..47282d9 100644
--- a/src/themes/mediawiki/icons-layout.json
+++ b/src/themes/mediawiki/icons-layout.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-location.json
b/src/themes/mediawiki/icons-location.json
index 0ecc2e1..197989b 100644
--- a/src/themes/mediawiki/icons-location.json
+++ b/src/themes/mediawiki/icons-location.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-media.json
b/src/themes/mediawiki/icons-media.json
index c7684ec..ddd95ad 100644
--- a/src/themes/mediawiki/icons-media.json
+++ b/src/themes/mediawiki/icons-media.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-moderation.json
b/src/themes/mediawiki/icons-moderation.json
index fb1deb1..cec844c 100644
--- a/src/themes/mediawiki/icons-moderation.json
+++ b/src/themes/mediawiki/icons-moderation.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-movement.json
b/src/themes/mediawiki/icons-movement.json
index 8305580..2a3a3c5 100644
--- a/src/themes/mediawiki/icons-movement.json
+++ b/src/themes/mediawiki/icons-movement.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-user.json
b/src/themes/mediawiki/icons-user.json
index e2b2c82..1b9359a 100644
--- a/src/themes/mediawiki/icons-user.json
+++ b/src/themes/mediawiki/icons-user.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
diff --git a/src/themes/mediawiki/icons-wikimedia.json
b/src/themes/mediawiki/icons-wikimedia.json
index 911eb6f..3e74ac6 100644
--- a/src/themes/mediawiki/icons-wikimedia.json
+++ b/src/themes/mediawiki/icons-wikimedia.json
@@ -1,5 +1,6 @@
{
- "prefix": "oo-ui-icon",
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
--
To view, visit https://gerrit.wikimedia.org/r/266233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2e4b788738ad3e8715a8a744781378920cd84cb
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
