jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373973 )
Change subject: [DEPRECATING CHANGE] icons: Move 'eye'/'eyeClosed' to
'accessibility'
......................................................................
[DEPRECATING CHANGE] icons: Move 'eye'/'eyeClosed' to 'accessibility'
The 'eye'/'eyeClosed' are moved from the
'alerts' icon pack to 'accessibility', which is also added to
Apex theme.
Bug: T145163
Change-Id: Idaeb6831d0c480c67c11d0ff487bb12c74ab262e
---
M demos/demo.js
M demos/demos.php
M demos/pages/icons.js
A src/themes/apex/icons-accessibility.json
M src/themes/apex/icons-alerts.json
A src/themes/apex/images/icons/bright.svg
A src/themes/apex/images/icons/halfBright.svg
A src/themes/apex/images/icons/largerText-ltr.svg
A src/themes/apex/images/icons/largerText-rtl.svg
A src/themes/apex/images/icons/moon.svg
A src/themes/apex/images/icons/notBright.svg
A src/themes/apex/images/icons/smallerText-ltr.svg
A src/themes/apex/images/icons/smallerText-rtl.svg
A src/themes/apex/images/icons/visionSimulator.svg
M src/themes/wikimediaui/icons-accessibility.json
M src/themes/wikimediaui/icons-alerts.json
16 files changed, 89 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/demos/demo.js b/demos/demo.js
index f8905b8..c41e6c0 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -169,7 +169,8 @@
'-icons-editing-advanced',
'-icons-media',
'-icons-user',
- '-icons-layout'
+ '-icons-layout',
+ '-icons-accessibility'
]
};
diff --git a/demos/demos.php b/demos/demos.php
index a401081..00eaca4 100644
--- a/demos/demos.php
+++ b/demos/demos.php
@@ -65,7 +65,8 @@
'-icons-editing-advanced',
'-icons-media',
'-icons-user',
- '-icons-layout'
+ '-icons-layout',
+ '-icons-accessibility'
]
];
// Stylesheets to load
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 876dc35..ae462c8 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -39,8 +39,6 @@
'bell',
'bellOn',
'comment',
- 'eye',
- 'eyeClosed',
'message',
'notice',
'signature',
@@ -185,6 +183,8 @@
'bright',
'halfBright',
'notBright',
+ 'eye',
+ 'eyeClosed',
'moon',
'largerText',
'smallerText',
diff --git a/src/themes/apex/icons-accessibility.json
b/src/themes/apex/icons-accessibility.json
new file mode 100644
index 0000000..656e321
--- /dev/null
+++ b/src/themes/apex/icons-accessibility.json
@@ -0,0 +1,28 @@
+{
+ "selectorWithoutVariant": ".oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
+ "intro": "@import '../../../../src/styles/common';",
+ "variants": {
+ "invert": {
+ "color": "#ffffff",
+ "global": true
+ }
+ },
+ "images": {
+ "bright": { "file": "images/icons/bright.svg" },
+ "halfBright": { "file": "images/icons/halfBright.svg" },
+ "notBright": { "file": "images/icons/notBright.svg" },
+ "eye": { "file": "images/icons/eye.svg" },
+ "eyeClosed": { "file": "images/icons/eyeClosed.svg" },
+ "moon": { "file": "images/icons/moon.svg" },
+ "largerText": { "file": {
+ "ltr": "images/icons/largerText-ltr.svg",
+ "rtl": "images/icons/largerText-rtl.svg"
+ } },
+ "smallerText": { "file": {
+ "ltr": "images/icons/smallerText-ltr.svg",
+ "rtl": "images/icons/smallerText-rtl.svg"
+ } },
+ "visionSimulator": { "file": "images/icons/visionSimulator.svg"
}
+ }
+}
diff --git a/src/themes/apex/icons-alerts.json
b/src/themes/apex/icons-alerts.json
index c3977eb..aa54007 100644
--- a/src/themes/apex/icons-alerts.json
+++ b/src/themes/apex/icons-alerts.json
@@ -9,8 +9,14 @@
"rtl": "images/icons/bellOn-rtl.svg"
} },
"comment": { "file": "images/icons/comment.svg" },
- "eye": { "file": "images/icons/eye.svg" },
- "eyeClosed": { "file": "images/icons/eyeClosed.svg" },
+ "eye": {
+ "file": "images/icons/eye.svg",
+ "deprecated": "Moved since v0.23.0 to the
'accessibility' pack."
+ },
+ "eyeClosed": {
+ "file": "images/icons/eyeClosed.svg",
+ "deprecated": "Moved since v0.23.0 to the
'accessibility' pack."
+ },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
"rtl": "images/icons/message-rtl.svg"
diff --git a/src/themes/apex/images/icons/bright.svg
b/src/themes/apex/images/icons/bright.svg
new file mode 100644
index 0000000..5a399fe
--- /dev/null
+++ b/src/themes/apex/images/icons/bright.svg
@@ -0,0 +1,5 @@
+<?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="M18.1 5.1c0 .3-.1.6-.3.9l-1.4 1.4-.9-.8 2.2-2.2c.3.1.4.4.4.7zm-.5
5.3h3.2c0 .3-.1.6-.4.9-.3.3-.5.4-.8.4h-2v-1.3zm-6.2-5V2.2c.3 0
.6.1.9.4.3.3.4.5.4.8v2h-1.3zm6.4 11.7c-.3 0-.6-.1-.8-.3l-1.4-1.4.8-.8 2.2
2.2c-.2.2-.5.3-.8.3zM6.2 4.9c.3 0 .6.1.8.3l1.4
1.4-.8.9-2.2-2.3c.2-.2.5-.3.8-.3zm5.2 11.7h1.2v3.2c-.3
0-.6-.1-.9-.4-.3-.3-.4-.5-.4-.8l.1-2zm-7-6.2h2v1.2H3.2c0-.3.1-.6.4-.9.3-.3.5-.3.8-.3zM6.2
16l1.4-1.4.8.8-2.2 2.2c-.2-.2-.3-.5-.3-.8 0-.3.1-.6.3-.8zM12 8c1.7 0 3 1.3 3
3s-1.3 3-3 3-3-1.3-3-3 1.3-3 3-3m0-1c-2.2 0-4 1.8-4 4s1.8 4 4 4 4-1.8
4-4-1.8-4-4-4z"/>
+ <path d="M12 8c1.7 0 3 1.3 3 3s-1.3 3-3 3-3-1.3-3-3 1.3-3 3-3m0-1c-2.2 0-4
1.8-4 4s1.8 4 4 4 4-1.8 4-4-1.8-4-4-4z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/halfBright.svg
b/src/themes/apex/images/icons/halfBright.svg
new file mode 100644
index 0000000..2745ec7
--- /dev/null
+++ b/src/themes/apex/images/icons/halfBright.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="M11.4 5.4V2.2c.3 0 .6.1.9.4.3.3.4.5.4.8v2h-1.3zm-5.2-.5c.3 0
.6.1.8.3l1.4 1.4-.8.9-2.2-2.3c.2-.2.5-.3.8-.3zm5.2 11.7h1.2v3.2c-.3
0-.6-.1-.9-.4-.3-.3-.4-.5-.4-.8l.1-2zm-7-6.2h2v1.2H3.2c0-.3.1-.6.4-.9.3-.3.5-.3.8-.3zM6.2
16l1.4-1.4.8.8-2.2 2.2c-.2-.2-.3-.5-.3-.8 0-.3.1-.6.3-.8zM12 7c-2.2 0-4 1.8-4
4s1.8 4 4 4 4-1.8 4-4-1.8-4-4-4zm-3 4c0-1.7 1.3-3 3-3v6c-1.7 0-3-1.3-3-3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/largerText-ltr.svg
b/src/themes/apex/images/icons/largerText-ltr.svg
new file mode 100644
index 0000000..4b01d74
--- /dev/null
+++ b/src/themes/apex/images/icons/largerText-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.8 20h-8.1v-.8c.4 0 .8-.1 1.3-.2s.8-.2.8-.4v-.2c0-.1
0-.2-.1-.3L13.4 15H8.3c-.1.3-.2.6-.4 1-.1.4-.3.7-.4 1-.1.4-.2.7-.2.8v.4c0
.2.2.4.5.6.3.2.9.3 1.7.3v.9H3.4v-.8c.2 0
.5-.1.8-.1.3-.1.5-.1.7-.2.3-.2.5-.4.7-.6.2-.3.4-.6.5-.9.8-2 1.6-3.9 2.4-5.9.8-2
1.7-4.1 2.7-6.5h2.1c1.4 3.3 2.4 6 3.2 7.9.8 1.9 1.4 3.6 2
4.8l.3.6c.1.2.3.3.6.5.2.1.4.2.7.3.3.1.5.1.7.1v.8zM13 14l-2.1-5.3L8.8 14H13z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/largerText-rtl.svg
b/src/themes/apex/images/icons/largerText-rtl.svg
new file mode 100644
index 0000000..6ac62dc
--- /dev/null
+++ b/src/themes/apex/images/icons/largerText-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="M3.4 20h8.1v-.8c-.4 0-.8-.1-1.3-.2s-.8-.2-.8-.4v-.2c0-.1
0-.2.1-.3l1.3-3.1h5.1c.1.3.2.6.4 1 .1.4.3.7.4 1 .1.4.2.7.2.8v.4c0
.2-.2.4-.5.6-.3.2-.9.3-1.7.3v.9h6.1v-.8c-.2
0-.5-.1-.8-.1-.3-.1-.5-.1-.7-.2-.3-.2-.5-.4-.7-.6-.2-.3-.4-.6-.5-.9-.8-2-1.6-3.9-2.4-5.9-.8-2-1.7-4.1-2.7-6.5h-2.1c-1.4
3.3-2.4 6-3.2 7.9-.8 1.9-1.4 3.6-2
4.8l-.3.6c-.1.2-.3.3-.6.5-.2.1-.4.2-.7.3-.3.1-.5.1-.7.1v.8zm7.8-6l2.1-5.3 2.1
5.3h-4.2z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/moon.svg
b/src/themes/apex/images/icons/moon.svg
new file mode 100644
index 0000000..bdbf234
--- /dev/null
+++ b/src/themes/apex/images/icons/moon.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="M19.1 17.5c-3.3 1.4-7.1-.2-8.5-3.5-1.4-3.3.2-7.1
3.5-8.5.2-.1.5-.2.7-.3-1.6-.4-3.2-.3-4.8.4C6 7.3 4 12 5.7 16c1.7 4.1 6.4 6 10.5
4.3 1.7-.7 3-1.9 3.8-3.4-.3.3-.6.4-.9.6z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/notBright.svg
b/src/themes/apex/images/icons/notBright.svg
new file mode 100644
index 0000000..af87ff9
--- /dev/null
+++ b/src/themes/apex/images/icons/notBright.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="M12 5c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/smallerText-ltr.svg
b/src/themes/apex/images/icons/smallerText-ltr.svg
new file mode 100644
index 0000000..446d10a
--- /dev/null
+++ b/src/themes/apex/images/icons/smallerText-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.6 20h-5.4v-.5c.2 0
.5-.1.9-.1.3-.1.5-.2.5-.3V19s0-.1-.1-.2l-.8-2H9.3c-.1.2-.2.4-.3.7-.1.3-.2.5-.2.7-.1.3-.1.4-.2.6v.2c0
.1.1.3.3.4.2.1.6.2 1.1.2v.4H6v-.5c.2 0 .3 0 .5-.1.2 0
.3-.1.5-.2s.4-.2.5-.4l.3-.6c.5-1.3 1.1-2.6 1.6-3.9.5-1.3 1.1-2.7 1.8-4.3h1.4c.9
2.2 1.6 4 2.1 5.3.5 1.3 1 2.4 1.3
3.2.1.1.1.3.2.4.1.1.2.2.4.3.1.1.3.1.5.2s.3.1.5.1v.5zm-5.2-4L11 12.4 9.6
16h2.8z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/smallerText-rtl.svg
b/src/themes/apex/images/icons/smallerText-rtl.svg
new file mode 100644
index 0000000..ebcea4d
--- /dev/null
+++ b/src/themes/apex/images/icons/smallerText-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="M6 19.5c.1 0 .3 0
.5-.1s.3-.1.5-.2.3-.2.4-.3c.1-.1.2-.2.2-.4.4-.9.8-1.9 1.3-3.2.5-1.3 1.2-3.1
2.1-5.3h1.4c.7 1.6 1.2 3 1.8 4.3.5 1.3 1.1 2.6 1.6
3.9l.3.6c.1.2.3.3.5.4.1.1.3.1.5.2.2 0 .4.1.5.1v.5h-4v-.5c.5 0 .9-.1
1.1-.2.2-.1.3-.2.3-.4v-.2c0-.1-.1-.3-.2-.6-.1-.2-.2-.4-.2-.7-.1-.3-.2-.5-.3-.7h-3.4l-.8
2c0 .1-.1.1-.1.2v.1c0 .1.2.2.5.3.3.1.6.1.9.1v.6H6v-.5zm8-3.5l-1.4-3.6-1.4
3.6H14z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/visionSimulator.svg
b/src/themes/apex/images/icons/visionSimulator.svg
new file mode 100644
index 0000000..ae6ba27
--- /dev/null
+++ b/src/themes/apex/images/icons/visionSimulator.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="M0 10v8h2.3c.3.6 1 1 1.7 1h4c1.5 0 2.7-.8 3-2h2c.3 1.2 1.5 2 3
2h4c.7 0 1.4 0 1.7-1H24v-8zm10 6c0 1-.4 2-2 2H4c-.6 0-1-.4-1-1v-3c0-.6.4-1
1-1h5c.6 0 1 .4 1 1zm11 1c0 .6-.4 1-1 1h-4c-1.6 0-2-1-2-2v-2c0-.6.4-1 1-1h5c.6
0 1 .4 1 1z"/>
+</svg>
diff --git a/src/themes/wikimediaui/icons-accessibility.json
b/src/themes/wikimediaui/icons-accessibility.json
index 4db45f4..656e321 100644
--- a/src/themes/wikimediaui/icons-accessibility.json
+++ b/src/themes/wikimediaui/icons-accessibility.json
@@ -12,6 +12,8 @@
"bright": { "file": "images/icons/bright.svg" },
"halfBright": { "file": "images/icons/halfBright.svg" },
"notBright": { "file": "images/icons/notBright.svg" },
+ "eye": { "file": "images/icons/eye.svg" },
+ "eyeClosed": { "file": "images/icons/eyeClosed.svg" },
"moon": { "file": "images/icons/moon.svg" },
"largerText": { "file": {
"ltr": "images/icons/largerText-ltr.svg",
diff --git a/src/themes/wikimediaui/icons-alerts.json
b/src/themes/wikimediaui/icons-alerts.json
index c169b56..02594a3 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -29,8 +29,14 @@
"rtl": "images/icons/bellOn-rtl.svg"
} },
"comment": { "file": "images/icons/comment.svg" },
- "eye": { "file": "images/icons/eye.svg" },
- "eyeClosed": { "file": "images/icons/eyeClosed.svg" },
+ "eye": {
+ "file": "images/icons/eye.svg",
+ "deprecated": "Moved since v0.23.0 to the
'accessibility' pack."
+ },
+ "eyeClosed": {
+ "file": "images/icons/eyeClosed.svg",
+ "deprecated": "Moved since v0.23.0 to the
'accessibility' pack."
+ },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
"rtl": "images/icons/message-rtl.svg"
--
To view, visit https://gerrit.wikimedia.org/r/373973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idaeb6831d0c480c67c11d0ff487bb12c74ab262e
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
