jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342891 )
Change subject: [DEPRECATING CHANGE] icons: Deprecate and/or move all the core
icons
......................................................................
[DEPRECATING CHANGE] icons: Deprecate and/or move all the core icons
Deprecated:
* circle
Moved to 'alerts':
* alert
* comment
* notice
Moved to 'interactions':
* advanced
* cacncel
* check
* close
* ellipsis
* help
* search
* settings
Moved to 'movement':
* collapse
* expand
* next
* previous
Moved to 'content':
* history
* info
* tag
* window
Moved to 'layout' (added to Apex theme):
* menu
Change-Id: Ib1c975c0eca265e675d34d08929acf66e52ad04c
---
M build/modules.yaml
M demos/demo.js
M demos/pages/icons.js
M src/themes/apex/icons-alerts.json
M src/themes/apex/icons-content.json
M src/themes/apex/icons-interactions.json
A src/themes/apex/icons-layout.json
M src/themes/apex/icons-movement.json
M src/themes/apex/icons.json
A src/themes/apex/images/icons/search-ltr.svg
A src/themes/apex/images/icons/search-rtl.svg
A src/themes/apex/images/icons/stripeFlow-ltr.svg
A src/themes/apex/images/icons/stripeFlow-rtl.svg
A src/themes/apex/images/icons/stripeSideMenu.svg
A src/themes/apex/images/icons/stripeSummary-ltr.svg
A src/themes/apex/images/icons/stripeSummary-rtl.svg
A src/themes/apex/images/icons/stripeToC-ltr.svg
A src/themes/apex/images/icons/stripeToC-rtl.svg
A src/themes/apex/images/icons/viewCompact.svg
A src/themes/apex/images/icons/viewDetails-ltr.svg
A src/themes/apex/images/icons/viewDetails-rtl.svg
M src/themes/mediawiki/icons-alerts.json
M src/themes/mediawiki/icons-content.json
M src/themes/mediawiki/icons-interactions.json
M src/themes/mediawiki/icons-layout.json
M src/themes/mediawiki/icons-movement.json
M src/themes/mediawiki/icons.json
27 files changed, 261 insertions(+), 75 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/build/modules.yaml b/build/modules.yaml
index df434bc..b93ab0c 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -264,11 +264,10 @@
],
"theme": "mediawiki"
},
- "oojs-ui-mediawiki-icons-layout": {
+ "oojs-ui-{theme}-icons-layout": {
"styles": [
- "src/themes/mediawiki/icons-layout.json"
- ],
- "theme": "mediawiki"
+ "src/themes/{theme}/icons-layout.json"
+ ]
},
"oojs-ui-mediawiki-icons-wikimedia": {
"styles": [
diff --git a/demos/demo.js b/demos/demo.js
index f861a46..0f5566a 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -153,7 +153,8 @@
'-icons-editing-styling',
'-icons-editing-list',
'-icons-editing-advanced',
- '-icons-media'
+ '-icons-media',
+ '-icons-layout'
],
theme: OO.ui.ApexTheme
}
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 4debb0a..bcb3d54 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -1,34 +1,15 @@
Demo.static.pages.icons = function ( demo ) {
var i, len, iconSet, iconsFieldset, iconWidget, selector,
icons = {
- core: [
- 'advanced',
- 'alert',
- 'cancel',
- 'check',
- 'circle',
- 'close',
- 'collapse',
- 'comment',
- 'ellipsis',
- 'expand',
- 'help',
- 'history',
- 'info',
- 'menu',
- 'next',
- 'notice',
- 'previous',
- 'search',
- 'settings',
- 'tag',
- 'window'
- ],
movement: [
'arrowLast',
'arrowNext',
'downTriangle',
'upTriangle',
+ 'previous',
+ 'next',
+ 'expand',
+ 'collapse',
'caretLast',
'caretNext',
'caretDown',
@@ -43,19 +24,26 @@
'articleRedirect',
'citeArticle',
'book',
+ 'history',
+ 'info',
'journal',
'newspaper',
'folderPlaceholder',
'die',
'download',
- 'upload'
+ 'tag',
+ 'upload',
+ 'window'
],
alerts: [
+ 'alert',
'bell',
'bellOn',
+ 'comment',
'eye',
'eyeClosed',
'message',
+ 'notice',
'signature',
'speechBubble',
'speechBubbleAdd',
@@ -64,18 +52,26 @@
],
interactions: [
'add',
+ 'advanced',
'bookmark',
'browser',
+ 'cancel',
+ 'check',
'clear',
'clock',
+ 'close',
+ 'ellipsis',
'feedback',
'funnel',
'heart',
+ 'help',
'key',
'keyboard',
'logOut',
'newWindow',
'printer',
+ 'search',
+ 'settings',
'subtract',
'sun',
'watchlist'
@@ -177,6 +173,7 @@
'userTalk'
],
layout: [
+ 'menu',
'stripeFlow',
'stripeSideMenu',
'stripeSummary',
diff --git a/src/themes/apex/icons-alerts.json
b/src/themes/apex/icons-alerts.json
index 892b8db..c3977eb 100644
--- a/src/themes/apex/icons-alerts.json
+++ b/src/themes/apex/icons-alerts.json
@@ -2,17 +2,20 @@
"prefix": "oo-ui-icon",
"intro": "@import '../../../../src/styles/common';",
"images": {
+ "alert": { "file": "images/icons/alert.svg" },
"bell": { "file": "images/icons/bell.svg" },
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
} },
+ "comment": { "file": "images/icons/comment.svg" },
"eye": { "file": "images/icons/eye.svg" },
"eyeClosed": { "file": "images/icons/eyeClosed.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
"rtl": "images/icons/message-rtl.svg"
} },
+ "notice": { "file": "images/icons/notice.svg" },
"signature": { "file": {
"ltr": "images/icons/signature-ltr.svg",
"rtl": "images/icons/signature-rtl.svg"
diff --git a/src/themes/apex/icons-content.json
b/src/themes/apex/icons-content.json
index 0cd901f..a9db33f 100644
--- a/src/themes/apex/icons-content.json
+++ b/src/themes/apex/icons-content.json
@@ -10,13 +10,17 @@
"ltr": "images/icons/articleRedirect-ltr.svg",
"rtl": "images/icons/articleRedirect-rtl.svg"
} },
+ "history": { "file": "images/icons/history.svg" },
+ "info": { "file": "images/icons/info.svg" },
"journal": { "file": {
"ltr": "images/icons/journal-ltr.svg",
"rtl": "images/icons/journal-rtl.svg"
} },
+ "tag": { "file": "images/icons/tag.svg" },
"upload": { "file": {
"ltr": "images/icons/upload-ltr.svg",
"rtl": "images/icons/upload-rtl.svg"
- } }
+ } },
+ "window": { "file": "images/icons/window.svg" }
}
}
diff --git a/src/themes/apex/icons-interactions.json
b/src/themes/apex/icons-interactions.json
index 5b6ac3c..3fafe3c 100644
--- a/src/themes/apex/icons-interactions.json
+++ b/src/themes/apex/icons-interactions.json
@@ -9,6 +9,7 @@
},
"images": {
"add": { "file": "images/icons/add.svg" },
+ "advanced": { "file": "images/icons/advanced.svg" },
"bookmark": { "file": {
"ltr": "images/icons/bookmark-ltr.svg",
"rtl": "images/icons/bookmark-rtl.svg"
@@ -17,8 +18,12 @@
"ltr": "images/icons/browser-ltr.svg",
"rtl": "images/icons/browser-rtl.svg"
} },
+ "cancel": { "file": "images/icons/cancel.svg" },
+ "check": { "file": "images/icons/check.svg" },
"clear": { "file": "images/icons/clear.svg" },
"clock": { "file": "images/icons/clock.svg" },
+ "close": { "file": "images/icons/close.svg" },
+ "ellipsis": { "file": "images/icons/ellipsis.svg" },
"feedback": { "file": {
"ltr": "images/icons/feedback-ltr.svg",
"rtl": "images/icons/feedback-rtl.svg"
@@ -28,6 +33,13 @@
"rtl": "images/icons/funnel-rtl.svg"
} },
"heart": { "file": "images/icons/heart.svg" },
+ "help": { "file": {
+ "ltr": "images/icons/help-ltr.svg",
+ "rtl": "images/icons/help-rtl.svg",
+ "lang": {
+ "he,yi": "images/icons/help-ltr.svg"
+ }
+ } },
"key": { "file": {
"ltr": "images/icons/key-ltr.svg",
"rtl": "images/icons/key-rtl.svg"
@@ -48,6 +60,12 @@
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
+ "search": { "file": {
+ "ltr": "images/icons/search-ltr.svg",
+ "rtl": "images/icons/search-rtl.svg"
+ }
+ },
+ "settings": { "file": "images/icons/settings.svg" },
"subtract": { "file": "images/icons/subtract.svg" },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
diff --git a/src/themes/apex/icons-layout.json
b/src/themes/apex/icons-layout.json
new file mode 100644
index 0000000..173b284
--- /dev/null
+++ b/src/themes/apex/icons-layout.json
@@ -0,0 +1,25 @@
+{
+ "prefix": "oo-ui-icon",
+ "intro": "@import '../../../../src/styles/common';",
+ "images": {
+ "menu": { "file": "images/icons/menu.svg" },
+ "stripeFlow": { "file": {
+ "ltr": "images/icons/stripeFlow-ltr.svg",
+ "rtl": "images/icons/stripeFlow-rtl.svg"
+ } },
+ "stripeSideMenu": { "file": "images/icons/stripeSideMenu.svg" },
+ "stripeSummary": { "file": {
+ "ltr": "images/icons/stripeSummary-ltr.svg",
+ "rtl": "images/icons/stripeSummary-rtl.svg"
+ } },
+ "stripeToC": { "file": {
+ "ltr": "images/icons/stripeToC-ltr.svg",
+ "rtl": "images/icons/stripeToC-rtl.svg"
+ } },
+ "viewCompact": { "file": "images/icons/viewCompact.svg" },
+ "viewDetails": { "file": {
+ "ltr": "images/icons/viewDetails-ltr.svg",
+ "rtl": "images/icons/viewDetails-rtl.svg"
+ } }
+ }
+}
diff --git a/src/themes/apex/icons-movement.json
b/src/themes/apex/icons-movement.json
index 9aa1b80..7ab6eaa 100644
--- a/src/themes/apex/icons-movement.json
+++ b/src/themes/apex/icons-movement.json
@@ -20,8 +20,20 @@
} },
"caretDown": { "file": "images/icons/caretDown.svg" },
"caretUp": { "file": "images/icons/caretUp.svg" },
+ "collapse": { "file": "images/icons/collapse.svg" },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
+ "expand": { "file": "images/icons/expand.svg" },
"move": { "file": "images/icons/move.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"
+ }
+ },
"upTriangle": { "file": "images/icons/upTriangle.svg" }
}
}
diff --git a/src/themes/apex/icons.json b/src/themes/apex/icons.json
index 54990db..c0ccb36 100644
--- a/src/themes/apex/icons.json
+++ b/src/themes/apex/icons.json
@@ -2,37 +2,42 @@
"prefix": "oo-ui-icon",
"intro": "@import '../../../../src/styles/common';",
"images": {
- "add": { "file": "images/icons/add.svg", "deprecated": "Moved
since v0.19.5, use from the 'interactive' pack instead." },
- "advanced": { "file": "images/icons/advanced.svg" },
- "alert": { "file": "images/icons/alert.svg" },
- "cancel": { "file": "images/icons/cancel.svg" },
- "check": { "file": "images/icons/check.svg" },
- "circle": { "file": "images/icons/circle.svg" },
- "close": { "file": "images/icons/close.svg" },
+ "add": { "file": "images/icons/add.svg", "deprecated": "Moved
since v0.19.5, use from the 'interactions' pack instead." },
+ "advanced": { "file": "images/icons/advanced.svg",
"deprecated": "Moved since v0.20.1, use from the 'interactions' pack instead."
},
+ "alert": { "file": "images/icons/alert.svg", "deprecated":
"Moved since v0.20.1, use from the 'alerts' pack instead." },
+ "cancel": { "file": "images/icons/cancel.svg", "deprecated":
"Moved since v0.20.1, use from the 'interactions' pack instead." },
+ "check": { "file": "images/icons/check.svg", "deprecated":
"Moved since v0.20.1, use from the 'interactions' pack instead." },
+ "circle": { "file": "images/icons/circle.svg", "deprecated":
"Deprecated since v0.20.1, do not use." },
+ "close": { "file": "images/icons/close.svg", "deprecated":
"Moved since v0.20.1, use from the 'interactions' pack instead." },
"code": { "file": "images/icons/code.svg", "deprecated": "Moved
since v0.16.2, use from the 'editing-advanced' pack instead." },
- "collapse": { "file": "images/icons/collapse.svg" },
- "comment": { "file": "images/icons/comment.svg" },
- "ellipsis": { "file": "images/icons/ellipsis.svg" },
- "expand": { "file": "images/icons/expand.svg" },
+ "collapse": { "file": "images/icons/collapse.svg",
"deprecated": "Moved since v0.20.1, use from the 'movement' pack instead." },
+ "comment": { "file": "images/icons/comment.svg", "deprecated":
"Moved since v0.20.1, use from the 'alerts' pack instead." },
+ "ellipsis": { "file": "images/icons/ellipsis.svg",
"deprecated": "Moved since v0.20.1, use from the 'interactions' pack instead."
},
+ "expand": { "file": "images/icons/expand.svg", "deprecated":
"Moved since v0.20.1, use from the 'movement' pack instead." },
"help": { "file": {
"ltr": "images/icons/help-ltr.svg",
"rtl": "images/icons/help-rtl.svg",
"lang": {
"he,yi": "images/icons/help-ltr.svg"
- }
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'interactions' pack instead."
} },
- "history": { "file": "images/icons/history.svg" },
- "info": { "file": "images/icons/info.svg" },
- "menu": { "file": "images/icons/menu.svg" },
+ "history": { "file": "images/icons/history.svg", "deprecated":
"Moved since v0.20.1, use from the 'content' pack instead." },
+ "info": { "file": "images/icons/info.svg", "deprecated": "Moved
since v0.20.1, use from the 'content' pack instead." },
+ "menu": { "file": "images/icons/menu.svg", "deprecated": "Moved
since v0.20.1, use from the 'layout' pack instead." },
"next": { "file": {
"ltr": "images/icons/move-ltr.svg",
"rtl": "images/icons/move-rtl.svg"
- } },
- "notice": { "file": "images/icons/notice.svg" },
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'movement' pack instead."
+ },
+ "notice": { "file": "images/icons/notice.svg", "deprecated":
"Moved since v0.20.1, use from the 'alerts' pack instead." },
"previous": { "file": {
"ltr": "images/icons/move-rtl.svg",
"rtl": "images/icons/move-ltr.svg"
- } },
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'movement' pack instead."
+ },
"redo": { "file": {
"ltr": "images/icons/arched-arrow-ltr.svg",
"rtl": "images/icons/arched-arrow-rtl.svg"
@@ -40,15 +45,20 @@
"deprecated": "Moved since v0.16.2, use from the
'editing-core' pack instead."
},
"remove": { "file": "images/icons/trash.svg", "deprecated":
"Replaced since v0.14.0, use 'trash' from the 'moderation' pack instead." },
- "search": { "file": "images/icons/search.svg" },
- "settings": { "file": "images/icons/settings.svg" },
- "tag": { "file": "images/icons/tag.svg" },
+ "search": { "file": {
+ "ltr": "images/icons/search-ltr.svg",
+ "rtl": "images/icons/search-rtl.svg"
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'interactions' pack instead."
+ },
+ "settings": { "file": "images/icons/settings.svg",
"deprecated": "Moved since v0.20.1, use from the 'interactions' pack instead."
},
+ "tag": { "file": "images/icons/tag.svg", "deprecated": "Moved
since v0.20.1, use from the 'content' pack instead." },
"undo": { "file": {
"ltr": "images/icons/arched-arrow-rtl.svg",
"rtl": "images/icons/arched-arrow-ltr.svg"
},
"deprecated": "Moved since v0.16.2, use from the
'editing-core' pack instead."
},
- "window": { "file": "images/icons/window.svg" }
+ "window": { "file": "images/icons/window.svg", "deprecated":
"Moved since v0.20.1, use from the 'content' pack instead." }
}
}
diff --git a/src/themes/apex/images/icons/search-ltr.svg
b/src/themes/apex/images/icons/search-ltr.svg
new file mode 100644
index 0000000..ebc654a
--- /dev/null
+++ b/src/themes/apex/images/icons/search-ltr.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <g id="search">
+ <path id="magnifying-glass" d="M10.5 4a6.5 6.5 0 1 0 2.844 12.344L16
19c1.4 1.4 2.5 1.5 4 0l-4.438-4.438A6.426 6.426 0 0 0 17 10.5 6.5 6.5 0 0 0
10.5 4zm0 2a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9z"/>
+ </g>
+</svg>
diff --git a/src/themes/apex/images/icons/search-rtl.svg
b/src/themes/apex/images/icons/search-rtl.svg
new file mode 100644
index 0000000..c51d4cb
--- /dev/null
+++ b/src/themes/apex/images/icons/search-rtl.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <g id="search">
+ <path id="magnifying-glass" d="M13.5 4a6.5 6.5 0 1 1-2.844 12.344L8
19c-1.4 1.4-2.5 1.5-4 0l4.438-4.438A6.426 6.426 0 0 1 7 10.5 6.5 6.5 0 0 1 13.5
4zm0 2a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9z"/>
+ </g>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeFlow-ltr.svg
b/src/themes/apex/images/icons/stripeFlow-ltr.svg
new file mode 100644
index 0000000..2112bb2
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeFlow-ltr.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M4 9h12v2H4V9zm0 3h8v2H4v-2zm0-7h16v3H4V5zm16 14H4v-3h16v3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeFlow-rtl.svg
b/src/themes/apex/images/icons/stripeFlow-rtl.svg
new file mode 100644
index 0000000..39790a9
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeFlow-rtl.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M20 9H8v2h12V9zm0 3h-8v2h8v-2zm0-7H4v3h16V5zM4 19h16v-3H4v3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeSideMenu.svg
b/src/themes/apex/images/icons/stripeSideMenu.svg
new file mode 100644
index 0000000..e63a7d5
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeSideMenu.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M20 19H4v-2h16v2zM20 15H4v-2h16v2zM20 11H4V9h16v2z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeSummary-ltr.svg
b/src/themes/apex/images/icons/stripeSummary-ltr.svg
new file mode 100644
index 0000000..767d6cd
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeSummary-ltr.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M20 11H4V9h16v2zM4 12h8v2H4v-2z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeSummary-rtl.svg
b/src/themes/apex/images/icons/stripeSummary-rtl.svg
new file mode 100644
index 0000000..4d16337
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeSummary-rtl.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M4 11h16V9H4v2zm16 1h-8v2h8v-2z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeToC-ltr.svg
b/src/themes/apex/images/icons/stripeToC-ltr.svg
new file mode 100644
index 0000000..d7c202e
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeToC-ltr.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M17 13H4v-3h13v3zm-5 6H4v-3h8v3zM4 7V4h16v3H4z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/stripeToC-rtl.svg
b/src/themes/apex/images/icons/stripeToC-rtl.svg
new file mode 100644
index 0000000..0859be6
--- /dev/null
+++ b/src/themes/apex/images/icons/stripeToC-rtl.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M7 13h13v-3H7v3zm5 6h8v-3h-8v3zm8-12V4H4v3h16z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/viewCompact.svg
b/src/themes/apex/images/icons/viewCompact.svg
new file mode 100644
index 0000000..d96a2e3
--- /dev/null
+++ b/src/themes/apex/images/icons/viewCompact.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <g id="viewCompact">
+ <circle cx="6" cy="6" r="2"/>
+ <circle cx="12" cy="6" r="2"/>
+ <circle cx="18" cy="6" r="2"/>
+ <circle cx="6" cy="12" r="2"/>
+ <circle cx="12" cy="12" r="2"/>
+ <circle cx="18" cy="12" r="2"/>
+ <circle cx="6" cy="18" r="2"/>
+ <circle cx="12" cy="18" r="2"/>
+ <circle cx="18" cy="18" r="2"/>
+ </g>
+</svg>
diff --git a/src/themes/apex/images/icons/viewDetails-ltr.svg
b/src/themes/apex/images/icons/viewDetails-ltr.svg
new file mode 100644
index 0000000..1a5092a
--- /dev/null
+++ b/src/themes/apex/images/icons/viewDetails-ltr.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <g id="viewDetails">
+ <circle cx="5.5" cy="8.5" r="2.5"/>
+ <path d="M10 6h12v1H10zm0 2h9v1h-9zm0 2h4v1h-4z"/>
+ <circle cx="5.5" cy="16.5" r="2.5"/>
+ <path d="M10 14h12v1H10zm0 2h9v1h-9zm0 2h4v1h-4z"/>
+ </g>
+</svg>
diff --git a/src/themes/apex/images/icons/viewDetails-rtl.svg
b/src/themes/apex/images/icons/viewDetails-rtl.svg
new file mode 100644
index 0000000..f43b05f
--- /dev/null
+++ b/src/themes/apex/images/icons/viewDetails-rtl.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <g id="viewDetails">
+ <circle cx="18.5" cy="8.5" r="2.5"/>
+ <path d="M14 6H2v1h12zm0 2H5v1h9zm0 2h-4v1h4z"/>
+ <circle cx="18.5" cy="16.5" r="2.5"/>
+ <path d="M14 14H2v1h12zm0 2H5v1h9zm0 2h-4v1h4z"/>
+ </g>
+</svg>
diff --git a/src/themes/mediawiki/icons-alerts.json
b/src/themes/mediawiki/icons-alerts.json
index e6fa863..c169b56 100644
--- a/src/themes/mediawiki/icons-alerts.json
+++ b/src/themes/mediawiki/icons-alerts.json
@@ -22,17 +22,20 @@
}
},
"images": {
+ "alert": { "file": "images/icons/alert.svg", "variants": [
"warning" ] },
"bell": { "file": "images/icons/bell.svg" },
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
} },
+ "comment": { "file": "images/icons/comment.svg" },
"eye": { "file": "images/icons/eye.svg" },
"eyeClosed": { "file": "images/icons/eyeClosed.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
"rtl": "images/icons/message-rtl.svg"
} },
+ "notice": { "file": "images/icons/notice.svg" },
"signature": { "file": {
"ltr": "images/icons/signature-ltr.svg",
"rtl": "images/icons/signature-rtl.svg"
diff --git a/src/themes/mediawiki/icons-content.json
b/src/themes/mediawiki/icons-content.json
index 80bbcaf..e952108 100644
--- a/src/themes/mediawiki/icons-content.json
+++ b/src/themes/mediawiki/icons-content.json
@@ -62,6 +62,8 @@
"ltr": "images/icons/folderPlaceholder-ltr.svg",
"rtl": "images/icons/folderPlaceholder-rtl.svg"
} },
+ "history": { "file": "images/icons/history.svg" },
+ "info": { "file": "images/icons/info.svg" },
"journal": { "file": {
"ltr": "images/icons/journal-ltr.svg",
"rtl": "images/icons/journal-rtl.svg"
@@ -70,9 +72,11 @@
"ltr": "images/icons/newspaper-ltr.svg",
"rtl": "images/icons/newspaper-rtl.svg"
} },
+ "tag": { "file": "images/icons/tag.svg", "variants": [
"destructive", "warning", "constructive" ] },
"upload": { "file": {
"ltr": "images/icons/upload-ltr.svg",
"rtl": "images/icons/upload-rtl.svg"
- } }
+ } },
+ "window": { "file": "images/icons/window.svg" }
}
}
diff --git a/src/themes/mediawiki/icons-interactions.json
b/src/themes/mediawiki/icons-interactions.json
index f693e3f..668173f 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -23,6 +23,7 @@
},
"images": {
"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"
@@ -31,8 +32,12 @@
"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": "images/icons/close.svg" },
+ "ellipsis": { "file": "images/icons/ellipsis.svg" },
"feedback": {
"file": {
"ltr": "images/icons/feedback-ltr.svg",
@@ -45,6 +50,13 @@
"rtl": "images/icons/funnel-rtl.svg"
} },
"heart": { "file": "images/icons/heart.svg" },
+ "help": { "file": {
+ "ltr": "images/icons/help-ltr.svg",
+ "rtl": "images/icons/help-rtl.svg",
+ "lang": {
+ "he,yi": "images/icons/help-ltr.svg"
+ }
+ } },
"key": { "file": {
"ltr": "images/icons/key-ltr.svg",
"rtl": "images/icons/key-rtl.svg"
@@ -65,6 +77,12 @@
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
+ "search": { "file": {
+ "ltr": "images/icons/search-ltr.svg",
+ "rtl": "images/icons/search-rtl.svg"
+ }
+ },
+ "settings": { "file": "images/icons/settings.svg" },
"subtract": { "file": "images/icons/subtract.svg" },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
diff --git a/src/themes/mediawiki/icons-layout.json
b/src/themes/mediawiki/icons-layout.json
index 6ff4a0e..f720a25 100644
--- a/src/themes/mediawiki/icons-layout.json
+++ b/src/themes/mediawiki/icons-layout.json
@@ -22,6 +22,7 @@
}
},
"images": {
+ "menu": { "file": "images/icons/menu.svg" },
"stripeFlow": { "file": {
"ltr": "images/icons/stripeFlow-ltr.svg",
"rtl": "images/icons/stripeFlow-rtl.svg"
diff --git a/src/themes/mediawiki/icons-movement.json
b/src/themes/mediawiki/icons-movement.json
index 059073f..0dc88e3 100644
--- a/src/themes/mediawiki/icons-movement.json
+++ b/src/themes/mediawiki/icons-movement.json
@@ -40,8 +40,20 @@
} },
"caretDown": { "file": "images/icons/caretDown.svg" },
"caretUp": { "file": "images/icons/caretUp.svg" },
+ "collapse": { "file": "images/icons/collapse.svg" },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
+ "expand": { "file": "images/icons/expand.svg" },
"move": { "file": "images/icons/move.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"
+ }
+ },
"upTriangle": { "file": "images/icons/upTriangle.svg" }
}
}
diff --git a/src/themes/mediawiki/icons.json b/src/themes/mediawiki/icons.json
index f4706bb..958e7e3 100644
--- a/src/themes/mediawiki/icons.json
+++ b/src/themes/mediawiki/icons.json
@@ -22,37 +22,42 @@
}
},
"images": {
- "add": { "file": "images/icons/add.svg", "variants": [
"constructive", "progressive" ], "deprecated": "Moved since v0.19.5, use from
the 'interactive' pack instead." },
- "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": "images/icons/close.svg" },
+ "add": { "file": "images/icons/add.svg", "variants": [
"constructive", "progressive" ], "deprecated": "Moved since v0.19.5, use from
the 'interactions' pack instead." },
+ "advanced": { "file": "images/icons/advanced.svg",
"deprecated": "Moved since v0.20.1, use from the 'interactions' pack instead."
},
+ "alert": { "file": "images/icons/alert.svg", "variants": [
"warning" ], "deprecated": "Moved since v0.20.1, use from the 'alerts' pack
instead." },
+ "cancel": { "file": "images/icons/cancel.svg", "variants": [
"destructive" ], "deprecated": "Moved since v0.20.1, use from the
'interactions' pack instead." },
+ "check": { "file": "images/icons/check.svg", "variants": [
"constructive", "progressive", "destructive" ], "deprecated": "Moved since
v0.20.1, use from the 'interactions' pack instead." },
+ "circle": { "file": "images/icons/circle.svg", "variants": [
"constructive", "progressive" ], "deprecated": "Deprecated since v0.20.1, do
not use." },
+ "close": { "file": "images/icons/close.svg", "deprecated":
"Moved since v0.20.1, use from the 'interactions' pack instead." },
"code": { "file": "images/icons/code.svg", "deprecated": "Moved
since v0.16.2, use from the 'editing-advanced' pack instead." },
- "collapse": { "file": "images/icons/collapse.svg" },
- "comment": { "file": "images/icons/comment.svg" },
- "ellipsis": { "file": "images/icons/ellipsis.svg" },
- "expand": { "file": "images/icons/expand.svg" },
+ "collapse": { "file": "images/icons/collapse.svg",
"deprecated": "Moved since v0.20.1, use from the 'movement' pack instead." },
+ "comment": { "file": "images/icons/comment.svg", "deprecated":
"Moved since v0.20.1, use from the 'alerts' pack instead." },
+ "ellipsis": { "file": "images/icons/ellipsis.svg",
"deprecated": "Moved since v0.20.1, use from the 'interactions' pack instead."
},
+ "expand": { "file": "images/icons/expand.svg", "deprecated":
"Moved since v0.20.1, use from the 'movement' pack instead." },
"help": { "file": {
"ltr": "images/icons/help-ltr.svg",
"rtl": "images/icons/help-rtl.svg",
"lang": {
"he,yi": "images/icons/help-ltr.svg"
- }
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'interactions' pack instead."
} },
- "history": { "file": "images/icons/history.svg" },
- "info": { "file": "images/icons/info.svg" },
- "menu": { "file": "images/icons/menu.svg" },
+ "history": { "file": "images/icons/history.svg", "deprecated":
"Moved since v0.20.1, use from the 'content' pack instead." },
+ "info": { "file": "images/icons/info.svg", "deprecated": "Moved
since v0.20.1, use from the 'content' pack instead." },
+ "menu": { "file": "images/icons/menu.svg", "deprecated": "Moved
since v0.20.1, use from the 'layout' pack instead." },
"next": { "file": {
"ltr": "images/icons/move-ltr.svg",
"rtl": "images/icons/move-rtl.svg"
- } },
- "notice": { "file": "images/icons/notice.svg" },
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'movement' pack instead."
+ },
+ "notice": { "file": "images/icons/notice.svg", "deprecated":
"Moved since v0.20.1, use from the 'alerts' pack instead." },
"previous": { "file": {
"ltr": "images/icons/move-rtl.svg",
"rtl": "images/icons/move-ltr.svg"
- } },
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'movement' pack instead."
+ },
"redo": { "file": {
"ltr": "images/icons/arched-arrow-ltr.svg",
"rtl": "images/icons/arched-arrow-rtl.svg"
@@ -63,15 +68,17 @@
"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" ] },
+ },
+ "deprecated": "Moved since v0.20.1, use from the
'interactions' pack instead."
+ },
+ "settings": { "file": "images/icons/settings.svg",
"deprecated": "Moved since v0.20.1, use from the 'interactions' pack instead."
},
+ "tag": { "file": "images/icons/tag.svg", "variants": [
"destructive", "warning", "constructive" ], "deprecated": "Moved since v0.20.1,
use from the 'content' pack instead." },
"undo": { "file": {
"ltr": "images/icons/arched-arrow-rtl.svg",
"rtl": "images/icons/arched-arrow-ltr.svg"
},
"deprecated": "Moved since v0.16.2, use from the
'editing-core' pack instead."
},
- "window": { "file": "images/icons/window.svg" }
+ "window": { "file": "images/icons/window.svg", "deprecated":
"Moved since v0.20.1, use from the 'content' pack instead." }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/342891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1c975c0eca265e675d34d08929acf66e52ad04c
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
