jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362242 )
Change subject: icons: Replace the puzzle icon, using the one from VisualEditor
......................................................................
icons: Replace the puzzle icon, using the one from VisualEditor
Also abandon having the LTR/RTL variance; the additional cost isn't worth
it for a relatively rare usage.
Bug: T111041
Change-Id: I3c6447e1280abf3db5a60e96eb581d8d3fea618c
---
M src/themes/apex/icons-editing-advanced.json
D src/themes/apex/images/icons/puzzle-ltr.svg
D src/themes/apex/images/icons/puzzle-rtl.svg
A src/themes/apex/images/icons/puzzle.svg
M src/themes/wikimediaui/icons-editing-advanced.json
D src/themes/wikimediaui/images/icons/puzzle-ltr.svg
D src/themes/wikimediaui/images/icons/puzzle-rtl.svg
A src/themes/wikimediaui/images/icons/puzzle.svg
8 files changed, 10 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/src/themes/apex/icons-editing-advanced.json
b/src/themes/apex/icons-editing-advanced.json
index ea2e2ec..5f227fd 100644
--- a/src/themes/apex/icons-editing-advanced.json
+++ b/src/themes/apex/icons-editing-advanced.json
@@ -39,10 +39,7 @@
"ltr": "images/icons/outline-ltr.svg",
"rtl": "images/icons/outline-rtl.svg"
} },
- "puzzle": { "file": {
- "ltr": "images/icons/puzzle-ltr.svg",
- "rtl": "images/icons/puzzle-rtl.svg"
- } },
+ "puzzle": { "file": "images/icons/puzzle.svg" },
"quotes": { "file": {
"ltr": "images/icons/quotes-ltr.svg",
"rtl": "images/icons/quotes-rtl.svg"
diff --git a/src/themes/apex/images/icons/puzzle-ltr.svg
b/src/themes/apex/images/icons/puzzle-ltr.svg
deleted file mode 100644
index fb9d338..0000000
--- a/src/themes/apex/images/icons/puzzle-ltr.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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 9.9c-.7 0-1.4.3-1.8.9V6h-4c.2-.4.4-.8.4-1.2
0-1.2-1-2.2-2.2-2.2-1.3-.1-2.3.9-2.3 2.2 0 .4.2.8.4 1.2H4.1v3.6l.6-.1c1.4 0 2.5
1.1 2.5 2.5s-1.1 2.5-2.5 2.5c-.2 0-.4 0-.6-.1V18H9c-.5.4-.9 1-.9 1.8 0 1.2 1
2.2 2.3 2.2 1.2 0 2.2-1 2.2-2.2 0-.7-.3-1.4-.9-1.8h4.5v-4.5c.4.5 1 .9 1.8.9 1.2
0 2.2-1 2.2-2.2 0-1.3-1-2.3-2.2-2.3z"/>
-</svg>
diff --git a/src/themes/apex/images/icons/puzzle-rtl.svg
b/src/themes/apex/images/icons/puzzle-rtl.svg
deleted file mode 100644
index 1d48308..0000000
--- a/src/themes/apex/images/icons/puzzle-rtl.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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.3 9.9c.7 0 1.4.3 1.8.9V6h4c-.2-.4-.4-.8-.4-1.2 0-1.2 1-2.2
2.2-2.2 1.3-.1 2.3.9 2.3 2.2 0 .4-.2.8-.4 1.2h4.4v3.6l-.6-.1c-1.4 0-2.5 1.1-2.5
2.5s1.1 2.5 2.5 2.5c.2 0 .4 0 .6-.1V18h-4.9c.5.4.9 1 .9 1.8 0 1.2-1 2.2-2.3
2.2-1.2 0-2.2-1-2.2-2.2 0-.7.3-1.4.9-1.8H8.1v-4.5c-.4.5-1 .9-1.8.9-1.2
0-2.2-1-2.2-2.2 0-1.3 1-2.3 2.2-2.3z"/>
-</svg>
diff --git a/src/themes/apex/images/icons/puzzle.svg
b/src/themes/apex/images/icons/puzzle.svg
new file mode 100644
index 0000000..cfcbbcc
--- /dev/null
+++ b/src/themes/apex/images/icons/puzzle.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 id="puzzle-piece" d="M19.46
10.417c-.351-.404-1.641-.501-1.983-.162-.769.758-1.926
1.308-1.952.162.088-2.081.818-3.743.818-3.743a.46.46 0 0
0-.463-.456s-1.586-.111-3.59-.164l-1.25-.001c-.127.406.274 1.09.782
1.604.339.344.242 1.633-.162 1.984-.393.34-1.197.539-1.662.539-.445
0-1.222-.158-1.612-.479-.438-.356-.332-1.686.02-2.044.47-.476.838-1.185.721-1.606h-.483c-2.074.05-3.514.167-3.514.167a.46.46
0 0 0-.463.456s-.558 2.58-.558 5.348c0 2.762.558 5.331.558 5.331a.46.46 0 0 0
.463.457s2.615.19 5.493.19c2.723 0 5.258-.19 5.258-.19a.46.46 0 0 0
.463-.457s-.739-1.73-.824-3.869c.031-1.004 1.255-.506 1.958.188.356.353
1.688.458 2.045.021.318-.392.477-1.169.477-1.614 0-.465-.199-1.269-.54-1.662z"/>
+</svg>
diff --git a/src/themes/wikimediaui/icons-editing-advanced.json
b/src/themes/wikimediaui/icons-editing-advanced.json
index 7cbbced..b384422 100644
--- a/src/themes/wikimediaui/icons-editing-advanced.json
+++ b/src/themes/wikimediaui/icons-editing-advanced.json
@@ -59,10 +59,7 @@
"ltr": "images/icons/outline-ltr.svg",
"rtl": "images/icons/outline-rtl.svg"
} },
- "puzzle": { "file": {
- "ltr": "images/icons/puzzle-ltr.svg",
- "rtl": "images/icons/puzzle-rtl.svg"
- } },
+ "puzzle": { "file": "images/icons/puzzle.svg" },
"quotes": { "file": {
"ltr": "images/icons/quotes-ltr.svg",
"rtl": "images/icons/quotes-rtl.svg"
diff --git a/src/themes/wikimediaui/images/icons/puzzle-ltr.svg
b/src/themes/wikimediaui/images/icons/puzzle-ltr.svg
deleted file mode 100644
index fb9d338..0000000
--- a/src/themes/wikimediaui/images/icons/puzzle-ltr.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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 9.9c-.7 0-1.4.3-1.8.9V6h-4c.2-.4.4-.8.4-1.2
0-1.2-1-2.2-2.2-2.2-1.3-.1-2.3.9-2.3 2.2 0 .4.2.8.4 1.2H4.1v3.6l.6-.1c1.4 0 2.5
1.1 2.5 2.5s-1.1 2.5-2.5 2.5c-.2 0-.4 0-.6-.1V18H9c-.5.4-.9 1-.9 1.8 0 1.2 1
2.2 2.3 2.2 1.2 0 2.2-1 2.2-2.2 0-.7-.3-1.4-.9-1.8h4.5v-4.5c.4.5 1 .9 1.8.9 1.2
0 2.2-1 2.2-2.2 0-1.3-1-2.3-2.2-2.3z"/>
-</svg>
diff --git a/src/themes/wikimediaui/images/icons/puzzle-rtl.svg
b/src/themes/wikimediaui/images/icons/puzzle-rtl.svg
deleted file mode 100644
index 1d48308..0000000
--- a/src/themes/wikimediaui/images/icons/puzzle-rtl.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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.3 9.9c.7 0 1.4.3 1.8.9V6h4c-.2-.4-.4-.8-.4-1.2 0-1.2 1-2.2
2.2-2.2 1.3-.1 2.3.9 2.3 2.2 0 .4-.2.8-.4 1.2h4.4v3.6l-.6-.1c-1.4 0-2.5 1.1-2.5
2.5s1.1 2.5 2.5 2.5c.2 0 .4 0 .6-.1V18h-4.9c.5.4.9 1 .9 1.8 0 1.2-1 2.2-2.3
2.2-1.2 0-2.2-1-2.2-2.2 0-.7.3-1.4.9-1.8H8.1v-4.5c-.4.5-1 .9-1.8.9-1.2
0-2.2-1-2.2-2.2 0-1.3 1-2.3 2.2-2.3z"/>
-</svg>
diff --git a/src/themes/wikimediaui/images/icons/puzzle.svg
b/src/themes/wikimediaui/images/icons/puzzle.svg
new file mode 100644
index 0000000..cfcbbcc
--- /dev/null
+++ b/src/themes/wikimediaui/images/icons/puzzle.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 id="puzzle-piece" d="M19.46
10.417c-.351-.404-1.641-.501-1.983-.162-.769.758-1.926
1.308-1.952.162.088-2.081.818-3.743.818-3.743a.46.46 0 0
0-.463-.456s-1.586-.111-3.59-.164l-1.25-.001c-.127.406.274 1.09.782
1.604.339.344.242 1.633-.162 1.984-.393.34-1.197.539-1.662.539-.445
0-1.222-.158-1.612-.479-.438-.356-.332-1.686.02-2.044.47-.476.838-1.185.721-1.606h-.483c-2.074.05-3.514.167-3.514.167a.46.46
0 0 0-.463.456s-.558 2.58-.558 5.348c0 2.762.558 5.331.558 5.331a.46.46 0 0 0
.463.457s2.615.19 5.493.19c2.723 0 5.258-.19 5.258-.19a.46.46 0 0 0
.463-.457s-.739-1.73-.824-3.869c.031-1.004 1.255-.506 1.958.188.356.353
1.688.458 2.045.021.318-.392.477-1.169.477-1.614 0-.465-.199-1.269-.54-1.662z"/>
+</svg>
--
To view, visit https://gerrit.wikimedia.org/r/362242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c6447e1280abf3db5a60e96eb581d8d3fea618c
Gerrit-PatchSet: 4
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
