VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319242
Change subject: [WIP] Deprecate, rename, move icons
......................................................................
[WIP] Deprecate, rename, move icons
Change-Id: Id055edded7d24fd01121c5647c1a51d47458553c
---
M build/modules.yaml
M demos/demo.js
M demos/pages/icons.js
R src/themes/apex/icons-notifications.json
A src/themes/mediawiki/icons-deprecated.json
M src/themes/mediawiki/icons-editing-advanced.json
M src/themes/mediawiki/icons-interactions.json
A src/themes/mediawiki/icons-messages.json
M src/themes/mediawiki/icons-movement.json
R src/themes/mediawiki/icons-notifications.json
M src/themes/mediawiki/icons-wikimedia.json
M src/themes/mediawiki/icons.json
R src/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg
13 files changed, 146 insertions(+), 119 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/42/319242/1
diff --git a/build/modules.yaml b/build/modules.yaml
index 70381b1..ec946de 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -200,30 +200,30 @@
],
"theme": "mediawiki"
},
- "oojs-ui-{theme}-icons-movement": {
- "styles": [
- "src/themes/{theme}/icons-movement.json"
- ]
- },
"oojs-ui-{theme}-icons-content": {
"styles": [
"src/themes/{theme}/icons-content.json"
]
},
- "oojs-ui-{theme}-icons-alerts": {
+ "oojs-ui-{theme}-icons-moderation": {
"styles": [
- "src/themes/{theme}/icons-alerts.json"
+ "src/themes/{theme}/icons-moderation.json"
+ ]
+ },
+ "oojs-ui-{theme}-icons-movement": {
+ "styles": [
+ "src/themes/{theme}/icons-movement.json"
+ ]
+ },
+ "oojs-ui-{theme}-icons-notifications": {
+ "styles": [
+ "src/themes/{theme}/icons-notifications.json"
],
"theme": "mediawiki"
},
"oojs-ui-{theme}-icons-interactions": {
"styles": [
"src/themes/{theme}/icons-interactions.json"
- ]
- },
- "oojs-ui-{theme}-icons-moderation": {
- "styles": [
- "src/themes/{theme}/icons-moderation.json"
]
},
"oojs-ui-{theme}-icons-editing-core": {
diff --git a/demos/demo.js b/demos/demo.js
index 7a39a9d..2230737 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -103,11 +103,12 @@
mediawiki: {
fileSuffix: '-mediawiki',
additionalSuffixes: [
- '-icons-movement',
'-icons-content',
- '-icons-alerts',
+ '-icons-messages',
+ '-icons-notifications',
'-icons-interactions',
'-icons-moderation',
+ '-icons-movement',
'-icons-editing-core',
'-icons-editing-styling',
'-icons-editing-list',
@@ -126,7 +127,7 @@
additionalSuffixes: [
'-icons-movement',
'-icons-content',
- '-icons-alerts',
+ '-icons-notifications',
'-icons-interactions',
'-icons-moderation',
'-icons-editing-core',
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 4c9bdc1..119f623 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -1,29 +1,11 @@
OO.ui.Demo.static.pages.icons = function ( demo ) {
var i, len, iconSet, iconsFieldset, iconButton, selector,
icons = {
- core: [
- 'add',
- 'advanced',
+ messages: [
'alert',
- 'cancel',
- 'check',
- 'circle',
- 'close',
- 'collapse',
- 'comment',
- 'ellipsis',
- 'expand',
'help',
- 'history',
'info',
- 'menu',
- 'next',
- 'notice',
- 'previous',
- 'search',
- 'settings',
- 'tag',
- 'window'
+ 'notice'
],
movement: [
'arrowLast',
@@ -34,6 +16,7 @@
'caretNext',
'caretDown',
'caretUp',
+ 'circle',
'move'
],
content: [
@@ -51,48 +34,45 @@
'download',
'upload'
],
- alerts: [
- 'bell',
- 'bellOn',
- 'eye',
- 'eyeClosed',
- 'message',
- 'signature',
- 'speechBubble',
- 'speechBubbleAdd',
- 'speechBubbles',
- 'tray'
- ],
interactions: [
- 'beta',
- 'betaLaunch',
+ 'add',
+ 'advanced',
'bookmark',
'browser',
+ 'cancel',
+ 'check',
'clear',
'clock',
+ 'close',
+ 'collapse',
+ 'ellipsis',
+ 'expand',
'funnel',
'heart',
'key',
'keyboard',
'logOut',
+ 'menu',
'newWindow',
+ 'next',
+ 'previous',
'printer',
- 'ribbonPrize',
+ 'search',
'sun',
'watchlist'
],
moderation: [
'block',
- 'blockUndo',
+ 'unBlock',
'flag',
- 'flagUndo',
+ 'unFlag',
'lock',
+ 'unLock',
'ongoingConversation',
'star',
+ 'unStar,',
'trash',
- 'trashUndo',
- 'unStar',
- 'unLock'
+ 'trashUndo'
],
'editing-core': [
'edit',
@@ -130,7 +110,9 @@
'attachment',
'calendar',
'code',
+ 'comment',
'find',
+ 'history',
'language',
'layout',
'markup',
@@ -142,6 +124,7 @@
'quotesAdd',
'searchCaseSensitive',
'searchRegularExpression',
+ 'settings',
'specialCharacter',
'table',
'tableAddColumnAfter',
@@ -150,8 +133,10 @@
'tableAddRowBefore',
'tableCaption',
'tableMergeCells',
+ 'tag',
'templateAdd',
- 'wikiText'
+ 'wikiText',
+ 'window'
],
media: [
'fullScreen',
@@ -161,6 +146,18 @@
'imageGallery',
'play',
'stop'
+ ],
+ notifications: [
+ 'bell',
+ 'bellOn',
+ 'eye',
+ 'eyeClosed',
+ 'message',
+ 'signature',
+ 'speechBubble',
+ 'speechBubbleAdd',
+ 'speechBubbles',
+ 'tray'
],
location: [
'map',
@@ -194,7 +191,12 @@
wikimedia: [
'logoCC',
'logoWikimediaCommons',
+ 'logoWikimediaDiscovery',
'logoWikipedia'
+ ],
+ deprecated: [
+ 'beta',
+ 'ribbonPrize'
]
},
indicators = [
diff --git a/src/themes/apex/icons-alerts.json
b/src/themes/apex/icons-notifications.json
similarity index 100%
rename from src/themes/apex/icons-alerts.json
rename to src/themes/apex/icons-notifications.json
diff --git a/src/themes/mediawiki/icons-deprecated.json
b/src/themes/mediawiki/icons-deprecated.json
new file mode 100644
index 0000000..d18d548
--- /dev/null
+++ b/src/themes/mediawiki/icons-deprecated.json
@@ -0,0 +1,25 @@
+{
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
+ "intro": "@import '../../../../src/styles/common';",
+ "variants": {
+ "invert": {
+ "color": "#fff",
+ "global": true
+ },
+ "progressive": {
+ "color": "#36c",
+ "global": true
+ },
+ "destructive": {
+ "color": "#c33"
+ },
+ "warning": {
+ "color": "#ff5d00"
+ }
+ },
+ "images": {
+ "beta": { "file": "images/icons/beta.svg" },
+ "ribbonPrize": { "file": "images/icons/ribbonPrize.svg" }
+ }
+}
diff --git a/src/themes/mediawiki/icons-editing-advanced.json
b/src/themes/mediawiki/icons-editing-advanced.json
index 6b9e490..10b8500 100644
--- a/src/themes/mediawiki/icons-editing-advanced.json
+++ b/src/themes/mediawiki/icons-editing-advanced.json
@@ -34,10 +34,12 @@
"rtl": "images/icons/calendar-rtl.svg"
} },
"code": { "file": "images/icons/code.svg" },
+ "comment": { "file": "images/icons/comment.svg" },
"find": { "file": {
"ltr": "images/icons/find-ltr.svg",
"rtl": "images/icons/find-rtl.svg"
} },
+ "history": { "file": "images/icons/history.svg" },
"language": { "file": {
"ltr": "images/icons/language-ltr.svg",
"rtl": "images/icons/language-rtl.svg"
@@ -77,6 +79,7 @@
} },
"searchCaseSensitive": { "file":
"images/icons/case-sensitive.svg" },
"searchRegularExpression": { "file":
"images/icons/regular-expression.svg" },
+ "settings": { "file": "images/icons/settings.svg" },
"specialCharacter": { "file":
"images/icons/specialCharacter.svg" },
"table": { "file": "images/icons/table.svg" },
"tableAddColumnAfter": { "file": {
@@ -91,6 +94,7 @@
"tableAddRowBefore": { "file":
"images/icons/table-insert-row-before.svg" },
"tableCaption": { "file": "images/icons/table-caption.svg" },
"tableMergeCells": { "file":
"images/icons/table-merge-cells.svg" },
+ "tag": { "file": "images/icons/tag.svg", "variants": [
"destructive", "warning", "constructive" ] },
"templateAdd": { "file": {
"ltr": "images/icons/templateAdd-ltr.svg",
"rtl": "images/icons/templateAdd-rtl.svg"
@@ -99,6 +103,7 @@
"ltr": "images/icons/language-ltr.svg",
"rtl": "images/icons/language-rtl.svg"
} },
- "wikiText": { "file": "images/icons/wikiText.svg" }
+ "wikiText": { "file": "images/icons/wikiText.svg" },
+ "window": { "file": "images/icons/window.svg" }
}
}
diff --git a/src/themes/mediawiki/icons-interactions.json
b/src/themes/mediawiki/icons-interactions.json
index 7efe531..b0af392 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -22,8 +22,8 @@
}
},
"images": {
- "beta": { "file": "images/icons/beta.svg" },
- "betaLaunch": { "file": "images/icons/betaLaunch.svg" },
+ "add": { "file": "images/icons/add.svg", "variants": [
"constructive", "progressive" ] },
+ "advanced": { "file": "images/icons/advanced.svg" },
"bookmark": { "file": {
"ltr": "images/icons/bookmark-ltr.svg",
"rtl": "images/icons/bookmark-rtl.svg"
@@ -32,8 +32,17 @@
"ltr": "images/icons/browser-ltr.svg",
"rtl": "images/icons/browser-rtl.svg"
} },
+ "cancel": { "file": "images/icons/cancel.svg", "variants": [
"destructive" ] },
+ "check": { "file": "images/icons/check.svg", "variants": [
"constructive", "progressive", "destructive" ] },
"clear": { "file": "images/icons/clear.svg" },
"clock": { "file": "images/icons/clock.svg" },
+ "close": { "file": {
+ "ltr": "images/icons/close-ltr.svg",
+ "rtl": "images/icons/close-rtl.svg"
+ } },
+ "collapse": { "file": "images/icons/collapse.svg" },
+ "ellipsis": { "file": "images/icons/ellipsis.svg" },
+ "expand": { "file": "images/icons/expand.svg" },
"funnel": { "file": {
"ltr": "images/icons/funnel-ltr.svg",
"rtl": "images/icons/funnel-rtl.svg"
@@ -51,15 +60,27 @@
"ltr": "images/icons/logOut-ltr.svg",
"rtl": "images/icons/logOut-rtl.svg"
} },
+ "menu": { "file": "images/icons/menu.svg" },
"newWindow": { "file": {
"ltr": "images/icons/newWindow-ltr.svg",
"rtl": "images/icons/newWindow-rtl.svg"
+ } },
+ "next": { "file": {
+ "ltr": "images/icons/move-ltr.svg",
+ "rtl": "images/icons/move-rtl.svg"
+ } },
+ "previous": { "file": {
+ "ltr": "images/icons/move-rtl.svg",
+ "rtl": "images/icons/move-ltr.svg"
} },
"printer": { "file": {
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
- "ribbonPrize": { "file": "images/icons/ribbonPrize.svg" },
+ "search": { "file": {
+ "ltr": "images/icons/search-ltr.svg",
+ "rtl": "images/icons/search-rtl.svg"
+ } },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
"rtl": "images/icons/sun-rtl.svg"
diff --git a/src/themes/mediawiki/icons-messages.json
b/src/themes/mediawiki/icons-messages.json
new file mode 100644
index 0000000..c32c4ef
--- /dev/null
+++ b/src/themes/mediawiki/icons-messages.json
@@ -0,0 +1,29 @@
+{
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
+ "intro": "@import '../../../../src/styles/common';",
+ "variants": {
+ "invert": {
+ "color": "#fff",
+ "global": true
+ },
+ "destructive": {
+ "color": "#c33"
+ },
+ "warning": {
+ "color": "#ff5d00"
+ }
+ },
+ "images": {
+ "alert": { "file": "images/icons/alert.svg", "variants": [
"warning" ] },
+ "help": { "file": {
+ "ltr": "images/icons/help-ltr.svg",
+ "rtl": "images/icons/help-rtl.svg",
+ "lang": {
+ "he,yi": "images/icons/help-ltr.svg"
+ }
+ } },
+ "info": { "file": "images/icons/info.svg" },
+ "notice": { "file": "images/icons/notice.svg" }
+ }
+}
diff --git a/src/themes/mediawiki/icons-movement.json
b/src/themes/mediawiki/icons-movement.json
index c545a49..2c89fc2 100644
--- a/src/themes/mediawiki/icons-movement.json
+++ b/src/themes/mediawiki/icons-movement.json
@@ -40,6 +40,7 @@
} },
"caretDown": { "file": "images/icons/caretDown.svg" },
"caretUp": { "file": "images/icons/caretUp.svg" },
+ "circle": { "file": "images/icons/circle.svg", "variants": [
"constructive", "progressive" ] },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
"move": { "file": "images/icons/move.svg" },
"upTriangle": { "file": "images/icons/upTriangle.svg" }
diff --git a/src/themes/mediawiki/icons-alerts.json
b/src/themes/mediawiki/icons-notifications.json
similarity index 100%
rename from src/themes/mediawiki/icons-alerts.json
rename to src/themes/mediawiki/icons-notifications.json
diff --git a/src/themes/mediawiki/icons-wikimedia.json
b/src/themes/mediawiki/icons-wikimedia.json
index bac9768..3bdecff 100644
--- a/src/themes/mediawiki/icons-wikimedia.json
+++ b/src/themes/mediawiki/icons-wikimedia.json
@@ -10,20 +10,12 @@
"progressive": {
"color": "#36c",
"global": true
- },
- "constructive": {
- "color": "#36c"
- },
- "destructive": {
- "color": "#c33"
- },
- "warning": {
- "color": "#ff5d00"
}
},
"images": {
"logoCC": { "file": "images/icons/logo-cc.svg" },
"logoWikimediaCommons": { "file":
"images/icons/logo-wikimediaCommons.svg" },
+ "logoWikimediaDiscovery": { "file":
"images/icons/logo-wikimediaDiscovery.svg" },
"logoWikipedia": { "file": "images/icons/logo-wikipedia.svg" }
}
}
diff --git a/src/themes/mediawiki/icons.json b/src/themes/mediawiki/icons.json
index 6a7c565..4a29d11 100644
--- a/src/themes/mediawiki/icons.json
+++ b/src/themes/mediawiki/icons.json
@@ -22,55 +22,6 @@
}
},
"images": {
- "add": { "file": "images/icons/add.svg", "variants": [
"constructive", "progressive" ] },
- "advanced": { "file": "images/icons/advanced.svg" },
- "alert": { "file": "images/icons/alert.svg", "variants": [
"warning" ] },
- "cancel": { "file": "images/icons/cancel.svg", "variants": [
"destructive" ] },
- "check": { "file": "images/icons/check.svg", "variants": [
"constructive", "progressive", "destructive" ] },
- "circle": { "file": "images/icons/circle.svg", "variants": [
"constructive", "progressive" ] },
- "close": { "file": {
- "ltr": "images/icons/close-ltr.svg",
- "rtl": "images/icons/close-rtl.svg"
- } },
- "code": { "file": "images/icons/code.svg" },
- "collapse": { "file": "images/icons/collapse.svg" },
- "comment": { "file": "images/icons/comment.svg" },
- "ellipsis": { "file": "images/icons/ellipsis.svg" },
- "expand": { "file": "images/icons/expand.svg" },
- "help": { "file": {
- "ltr": "images/icons/help-ltr.svg",
- "rtl": "images/icons/help-rtl.svg",
- "lang": {
- "he,yi": "images/icons/help-ltr.svg"
- }
- } },
- "history": { "file": "images/icons/history.svg" },
- "info": { "file": "images/icons/info.svg" },
- "menu": { "file": "images/icons/menu.svg" },
- "next": { "file": {
- "ltr": "images/icons/move-ltr.svg",
- "rtl": "images/icons/move-rtl.svg"
- } },
- "notice": { "file": "images/icons/notice.svg" },
- "previous": { "file": {
- "ltr": "images/icons/move-rtl.svg",
- "rtl": "images/icons/move-ltr.svg"
- } },
- "redo": { "file": {
- "ltr": "images/icons/arched-arrow-ltr.svg",
- "rtl": "images/icons/arched-arrow-rtl.svg"
- } },
- "remove": { "file": "images/icons/trash.svg", "variants": [
"destructive" ] },
- "search": { "file": {
- "ltr": "images/icons/search-ltr.svg",
- "rtl": "images/icons/search-rtl.svg"
- } },
- "settings": { "file": "images/icons/settings.svg" },
- "tag": { "file": "images/icons/tag.svg", "variants": [
"destructive", "warning", "constructive" ] },
- "undo": { "file": {
- "ltr": "images/icons/arched-arrow-rtl.svg",
- "rtl": "images/icons/arched-arrow-ltr.svg"
- } },
- "window": { "file": "images/icons/window.svg" }
+ "remove": { "file": "images/icons/trash.svg", "variants": [
"destructive" ] }
}
}
diff --git a/src/themes/mediawiki/images/icons/betaLaunch.svg
b/src/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg
similarity index 100%
rename from src/themes/mediawiki/images/icons/betaLaunch.svg
rename to src/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg
--
To view, visit https://gerrit.wikimedia.org/r/319242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id055edded7d24fd01121c5647c1a51d47458553c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
