Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298031
Change subject: icons: Provide the alerts pack for Apex theme too
......................................................................
icons: Provide the alerts pack for Apex theme too
Change-Id: I6dce9c535c6371bf061543cb24ba682a5eb6b69a
---
M build/modules.yaml
A src/themes/apex/icons-alerts.json
A src/themes/apex/images/icons/bell.svg
A src/themes/apex/images/icons/bellOn-ltr.svg
A src/themes/apex/images/icons/bellOn-rtl.svg
A src/themes/apex/images/icons/eye.svg
A src/themes/apex/images/icons/eyeClosed.svg
A src/themes/apex/images/icons/message-ltr.svg
A src/themes/apex/images/icons/message-rtl.svg
A src/themes/apex/images/icons/signature-ltr.svg
A src/themes/apex/images/icons/signature-rtl.svg
A src/themes/apex/images/icons/speechBubble-ltr.svg
A src/themes/apex/images/icons/speechBubble-rtl.svg
A src/themes/apex/images/icons/speechBubbleAdd-ltr.svg
A src/themes/apex/images/icons/speechBubbleAdd-rtl.svg
A src/themes/apex/images/icons/speechBubbles-ltr.svg
A src/themes/apex/images/icons/speechBubbles-rtl.svg
A src/themes/apex/images/icons/tray.svg
18 files changed, 108 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/31/298031/1
diff --git a/build/modules.yaml b/build/modules.yaml
index 795c62c..41bf19e 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -208,9 +208,9 @@
"src/themes/{theme}/icons-content.json"
]
},
- "oojs-ui-mediawiki-icons-alerts": {
+ "oojs-ui-{theme}-icons-alerts": {
"styles": [
- "src/themes/mediawiki/icons-alerts.json"
+ "src/themes/{theme}/icons-alerts.json"
],
"theme": "mediawiki"
},
diff --git a/src/themes/apex/icons-alerts.json
b/src/themes/apex/icons-alerts.json
new file mode 100644
index 0000000..6894d6e
--- /dev/null
+++ b/src/themes/apex/icons-alerts.json
@@ -0,0 +1,41 @@
+{
+ "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": {
+ "bell": { "file": "images/icons/bell.svg" },
+ "bellOn": { "file": {
+ "ltr": "images/icons/bellOn-ltr.svg",
+ "rtl": "images/icons/bellOn-rtl.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"
+ } },
+ "signature": { "file": {
+ "ltr": "images/icons/signature-ltr.svg",
+ "rtl": "images/icons/signature-rtl.svg"
+ } },
+ "speechBubble": { "file": {
+ "ltr": "images/icons/speechBubble-ltr.svg",
+ "rtl": "images/icons/speechBubble-rtl.svg"
+ } },
+ "speechBubbleAdd": { "file": {
+ "ltr": "images/icons/speechBubbleAdd-ltr.svg",
+ "rtl": "images/icons/speechBubbleAdd-rtl.svg"
+ } },
+ "speechBubbles": { "file": {
+ "ltr": "images/icons/speechBubbles-ltr.svg",
+ "rtl": "images/icons/speechBubbles-rtl.svg"
+ } },
+ "tray": { "file": "images/icons/tray.svg" }
+ }
+}
diff --git a/src/themes/apex/images/icons/bell.svg
b/src/themes/apex/images/icons/bell.svg
new file mode 100644
index 0000000..787ed14
--- /dev/null
+++ b/src/themes/apex/images/icons/bell.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.5 14V9c0-3-2.3-5-5.5-5S6.5 6 6.5 9v5c0 2 0 3-2 3v1h15v-1c-2
0-2-1-2-3zM12 20H9c0 1 1.6 2 3 2s3-1 3-2h-3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/bellOn-ltr.svg
b/src/themes/apex/images/icons/bellOn-ltr.svg
new file mode 100644
index 0000000..f68a8e0
--- /dev/null
+++ b/src/themes/apex/images/icons/bellOn-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.8 14.7l1.7-4.7c1-2.8-.5-5.5-3.5-6.6s-5.9 0-6.9 2.8l-1.7
4.7c-.7 1.9-1 2.8-2.9 2.1l-.3 1 14.1 5.1.3-.9c-1.9-.7-1.5-1.6-.8-3.5zM12
19.8l-2.8-1c-.3.9.8 2.4 2.1 2.9s3.2.1 3.5-.9l-2.8-1z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/bellOn-rtl.svg
b/src/themes/apex/images/icons/bellOn-rtl.svg
new file mode 100644
index 0000000..92bcef5
--- /dev/null
+++ b/src/themes/apex/images/icons/bellOn-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.21 14.7L4.51 10c-1-2.8.5-5.5 3.5-6.6 3-1.1 5.9 0 6.9 2.8l1.7
4.7c.7 1.9 1 2.8 2.9 2.1l.3 1-14.1 5.1-.3-.9c1.9-.7 1.5-1.6.8-3.5zm5.8
5.1l2.8-1c.3.9-.8 2.4-2.1 2.9s-3.2.1-3.5-.9l2.8-1z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/eye.svg
b/src/themes/apex/images/icons/eye.svg
new file mode 100644
index 0000000..343e9cf
--- /dev/null
+++ b/src/themes/apex/images/icons/eye.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="M12 8c-5 0-11 6-11 6s6 6 11 6 11-6 11-6-6-6-11-6zm0 10c-2.2
0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"/>
+ <circle cx="12" cy="14" r="2"/>
+</svg>
diff --git a/src/themes/apex/images/icons/eyeClosed.svg
b/src/themes/apex/images/icons/eyeClosed.svg
new file mode 100644
index 0000000..d17f2c8
--- /dev/null
+++ b/src/themes/apex/images/icons/eyeClosed.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.4 12.7c.7-.8 1.2-1.7 1.4-2.7h-1.6c-.9 2.5-3.9 4.4-7.7
4.6h-.1c-3.7-.2-6.8-2.1-7.7-4.6H2.2c.2 1 .8 1.9 1.4 2.7l-2 2 .7.7 2-2c.8.6 1.7
1.2 2.7 1.7l-1 2.8.9.3 1-2.8c1 .3 2 .6 3.1.6v3h1v-3c1.1-.1 2.2-.3 3.1-.6l1
2.8.9-.3-1-2.8c1-.4 1.9-1 2.6-1.7l2 2 .7-.7-1.9-2z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/message-ltr.svg
b/src/themes/apex/images/icons/message-ltr.svg
new file mode 100644
index 0000000..842d312
--- /dev/null
+++ b/src/themes/apex/images/icons/message-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="M21 9c0-1.7-1.3-3-3-3H3v3l9 4 9-4zM3 11v6c0 1.7 1.3 3 3
3h15v-9l-9 4-9-4z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/message-rtl.svg
b/src/themes/apex/images/icons/message-rtl.svg
new file mode 100644
index 0000000..0a22c75
--- /dev/null
+++ b/src/themes/apex/images/icons/message-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 9c0-1.7 1.3-3 3-3h15v3l-9 4-9-4zm18 2v6c0 1.7-1.3 3-3 3H3v-9l9
4 9-4z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/signature-ltr.svg
b/src/themes/apex/images/icons/signature-ltr.svg
new file mode 100644
index 0000000..03b34cf
--- /dev/null
+++ b/src/themes/apex/images/icons/signature-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="M0 20h24v1H0v-1zm6-8l-1-1-2 2-2-2-1 1 2 2-2 2 1 1 2-2 2 2
1-1-2-2zm15.6 3.7c-.9-.5-1.9-.5-2.7 0-1.5.9-3.1.4-3.1.4-.4-.2-.8-.4-1.1-.6
2.2-.6 4.4-1.8 6-3.9 1.1-1.2 2.5-3.9.4-6-.7-.7-1.6-1.1-2.7-1-1.4.1-2.8.9-3.9
2.1-.9 1.1-3.1 4.5-2.3 7.5 0 .1 0 .2.1.3-2.3.3-4.2.2-4.4.1v1.5c.7.1 2.7.2
5.1-.2.5.7 1.3 1.2 2.3 1.6.1 0 2.4.8 4.5-.6.5-.3.9-.1 1.1 0 .4.2.7.6.7
1H23c0-.8-.6-1.7-1.4-2.2zm-8-1.7c-.5-2.2 1.1-5.1 2-6.2.8-.9 1.8-1.5
2.8-1.6h.1c.6 0 1.1.2 1.5.6 1.6 1.6-.4 3.9-.5 4-1.5 2-3.7 3-5.8 3.5l-.1-.3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/signature-rtl.svg
b/src/themes/apex/images/icons/signature-rtl.svg
new file mode 100644
index 0000000..326281a
--- /dev/null
+++ b/src/themes/apex/images/icons/signature-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="M24 20H0v1h24v-1zm-6-8l1-1 2 2 2-2 1 1-2 2 2 2-1 1-2-2-2 2-1-1
2-2zM2.4 15.7c.9-.5 1.9-.5 2.7 0 1.5.9 3.1.4 3.1.4.4-.2.8-.4
1.1-.6-2.2-.6-4.4-1.8-6-3.9-1.1-1.2-2.5-3.9-.4-6 .7-.7 1.6-1.1 2.7-1 1.4.1
2.8.9 3.9 2.1.9 1.1 3.1 4.5 2.3 7.5 0 .1 0 .2-.1.3 2.3.3 4.2.2
4.4.1v1.5c-.7.1-2.7.2-5.1-.2-.5.7-1.3 1.2-2.3 1.6-.1
0-2.4.8-4.5-.6-.5-.3-.9-.1-1.1 0-.4.2-.7.6-.7 1H1c0-.8.6-1.7
1.4-2.2zm8-1.7c.5-2.2-1.1-5.1-2-6.2-.8-.9-1.8-1.5-2.8-1.6h-.1c-.6
0-1.1.2-1.5.6-1.6 1.6.4 3.9.5 4 1.5 2 3.7 3 5.8 3.5l.1-.3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/speechBubble-ltr.svg
b/src/themes/apex/images/icons/speechBubble-ltr.svg
new file mode 100644
index 0000000..83d47c1
--- /dev/null
+++ b/src/themes/apex/images/icons/speechBubble-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="M19 20H2l3-3V6h17v11c0 1.7-1.3 3-3 3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/speechBubble-rtl.svg
b/src/themes/apex/images/icons/speechBubble-rtl.svg
new file mode 100644
index 0000000..e7dd668
--- /dev/null
+++ b/src/themes/apex/images/icons/speechBubble-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="M5 20h17l-3-3V6H2v11c0 1.7 1.3 3 3 3z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/speechBubbleAdd-ltr.svg
b/src/themes/apex/images/icons/speechBubbleAdd-ltr.svg
new file mode 100644
index 0000000..c7134c3
--- /dev/null
+++ b/src/themes/apex/images/icons/speechBubbleAdd-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="M5 6v11l-3 3h17c1.7 0 3-1.3 3-3V6H5zm8
3h1v3h3v1h-3v3h-1v-3h-3v-1h3V9z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/speechBubbleAdd-rtl.svg
b/src/themes/apex/images/icons/speechBubbleAdd-rtl.svg
new file mode 100644
index 0000000..08462e0
--- /dev/null
+++ b/src/themes/apex/images/icons/speechBubbleAdd-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="M2 6v11c0 1.7 1.3 3 3 3h17l-3-3V6H2zm8
3h1v3h3v1h-3v3h-1v-3H7v-1h3V9z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/speechBubbles-ltr.svg
b/src/themes/apex/images/icons/speechBubbles-ltr.svg
new file mode 100644
index 0000000..d683218
--- /dev/null
+++ b/src/themes/apex/images/icons/speechBubbles-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 9v9l2 2H8V9h12zM3 4h12v4H7v7H1l2-2V4z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/speechBubbles-rtl.svg
b/src/themes/apex/images/icons/speechBubbles-rtl.svg
new file mode 100644
index 0000000..db548a4
--- /dev/null
+++ b/src/themes/apex/images/icons/speechBubbles-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 9v9l-2 2h14V9H3zm17-5H8v4h8v7h6l-2-2V4z"/>
+</svg>
diff --git a/src/themes/apex/images/icons/tray.svg
b/src/themes/apex/images/icons/tray.svg
new file mode 100644
index 0000000..f512720
--- /dev/null
+++ b/src/themes/apex/images/icons/tray.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 13.35l1.8-7.2c0-.99.81-1.8 1.8-1.8h10.8c.99 0 1.8.81 1.8
1.8l1.8 7.2v4.5c0 .99-.81 1.8-1.8 1.8H4.8c-.99 0-1.8-.81-1.8-1.8v-4.5zm6.96
1.8h4.08c-.49.557-1.212.9-2.04.9a2.68 2.68 0 0
1-2.04-.9h4.08c.414-.472.66-1.098.66-1.8h4.14l-1.44-7.2H6.6l-1.44 7.2H9.3c0
.702.246 1.328.66 1.8z" id="tray"/>
+</svg>
--
To view, visit https://gerrit.wikimedia.org/r/298031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dce9c535c6371bf061543cb24ba682a5eb6b69a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
