VolkerE has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355614 )
Change subject: Follow-up f3c34870 again: Add 'destructive' flag to 'trash' icon
......................................................................
Follow-up f3c34870 again: Add 'destructive' flag to 'trash' icon
And fix use in demos missed when we moved this in 0.14.0.
Change-Id: I9af541200e6d50286092f701b9ef8d441b36da64
---
M demos/pages/widgets.js
M src/themes/wikimediaui/icons-moderation.json
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index c57abf9..c185350 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -285,7 +285,7 @@
new OO.ui.ButtonWidget( {
framed: false,
flags: [ 'destructive' ],
- icon: 'remove',
+ icon: 'trash',
label: 'Destructive'
} ),
{
@@ -1926,7 +1926,7 @@
),
new OO.ui.FieldLayout(
new OO.ui.IconWidget( {
- icon: 'remove',
+ icon: 'trash',
flags: 'destructive',
title: 'Remove icon'
} ),
diff --git a/src/themes/wikimediaui/icons-moderation.json
b/src/themes/wikimediaui/icons-moderation.json
index 554b82b..8f0ff15 100644
--- a/src/themes/wikimediaui/icons-moderation.json
+++ b/src/themes/wikimediaui/icons-moderation.json
@@ -51,7 +51,7 @@
"rtl": "images/icons/halfStar-rtl.svg"
}, "variants": [ "constructive", "progressive" ] },
"unStar": { "file": "images/icons/unStar.svg", "variants": [
"constructive", "progressive" ] },
- "trash": { "file": "images/icons/trash.svg" },
+ "trash": { "file": "images/icons/trash.svg", "variants": [
"destructive" ] },
"unTrash": { "file": {
"ltr": "images/icons/unTrash-ltr.svg",
"rtl": "images/icons/unTrash-rtl.svg"
--
To view, visit https://gerrit.wikimedia.org/r/355614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9af541200e6d50286092f701b9ef8d441b36da64
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
