jenkins-bot has submitted this change and it was merged.
Change subject: Switch over 'magnifyingGlass' icon to be 'search'
......................................................................
Switch over 'magnifyingGlass' icon to be 'search'
The 'search' icon was meant mostly as an indicator – it was tiny
and did not match other icons well. For historical reasons we had
both 'search' and 'magnifyingGlass' icons; replaced the latter with
the former for MediaWiki theme, and for both Apex and MediaWiki
themes made 'search' available as a proper indicator.
Bug: T97654
Change-Id: I6a001f388028d6041a7ab59d2f39daf9c15ea9c7
---
M demos/pages/icons.js
M src/themes/apex/images/icons/search.svg
A src/themes/apex/images/indicators/search-ltr.svg
A src/themes/apex/images/indicators/search-rtl.svg
M src/themes/apex/indicators.json
M src/themes/mediawiki/icons-interactions.json
M src/themes/mediawiki/icons.json
R src/themes/mediawiki/images/icons/search-ltr.svg
R src/themes/mediawiki/images/icons/search-rtl.svg
D src/themes/mediawiki/images/icons/search.svg
A src/themes/mediawiki/images/indicators/search-ltr.svg
A src/themes/mediawiki/images/indicators/search-rtl.svg
M src/themes/mediawiki/indicators.json
13 files changed, 40 insertions(+), 15 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 315e567..286feb9 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -76,7 +76,6 @@
'key',
'keyboard',
'logOut',
- 'magnifyingGlass',
'newWindow',
'printer',
'ribbonPrize',
@@ -192,6 +191,7 @@
'next',
'previous',
'required',
+ 'search',
'up'
],
iconsFieldsets = [],
diff --git a/src/themes/apex/images/icons/search.svg
b/src/themes/apex/images/icons/search.svg
index e4db4f0..208d44b 100644
--- a/src/themes/apex/images/icons/search.svg
+++ b/src/themes/apex/images/icons/search.svg
@@ -1,6 +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="M16.021
15.96l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921
0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239
2.01-.643l.098.169 2.375
2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221
0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213
2.213-.001 1.222-.992 2.213-2.213 2.213z"/>
+ <path id="search" d="M16.021
15.96l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921
0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239
2.01-.643l.098.169 2.375
2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221
0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213
2.213-.001 1.222-.992 2.213-2.213 2.213z"/>
</g>
</svg>
diff --git a/src/themes/apex/images/indicators/search-ltr.svg
b/src/themes/apex/images/indicators/search-ltr.svg
new file mode 100644
index 0000000..266349e
--- /dev/null
+++ b/src/themes/apex/images/indicators/search-ltr.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12
12">
+ <g id="search">
+ <path id="path3051" d="M10.369
9.474l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921
0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239
2.01-.643l.098.169 2.375
2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221
0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213
2.213-.001 1.222-.992 2.213-2.213 2.213z"/>
+ </g>
+</svg>
diff --git a/src/themes/apex/images/indicators/search-rtl.svg
b/src/themes/apex/images/indicators/search-rtl.svg
new file mode 100644
index 0000000..5368fd7
--- /dev/null
+++ b/src/themes/apex/images/indicators/search-rtl.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12
12">
+ <g id="search">
+ <path id="path3051" d="M1.631
9.474l2.374-2.375.169-.099c-.403-.566-.643-1.26-.643-2.009.001-1.92 1.558-3.477
3.477-3.477 1.921 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.749
0-1.442-.239-2.01-.643l-.098.169-2.375
2.374c-.19.189-.543.143-.79-.104s-.293-.601-.104-.791zm5.377-2.27c1.221 0
2.213-.991 2.213-2.213 0-1.221-.992-2.213-2.213-2.213-1.222 0-2.213.992-2.213
2.213.001 1.222.992 2.213 2.213 2.213z"/>
+ </g>
+</svg>
diff --git a/src/themes/apex/indicators.json b/src/themes/apex/indicators.json
index 18ed929..0a9d1d2 100644
--- a/src/themes/apex/indicators.json
+++ b/src/themes/apex/indicators.json
@@ -13,6 +13,10 @@
"ltr": "images/indicators/arrow-rtl.svg",
"rtl": "images/indicators/arrow-ltr.svg"
} },
- "required": { "file": "images/indicators/required.svg" }
+ "required": { "file": "images/indicators/required.svg" },
+ "search": { "file": {
+ "ltr": "images/indicators/search-ltr.svg",
+ "rtl": "images/indicators/search-rtl.svg"
+ } }
}
}
diff --git a/src/themes/mediawiki/icons-interactions.json
b/src/themes/mediawiki/icons-interactions.json
index 3c8376b..09397e3 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -31,10 +31,6 @@
"ltr": "images/icons/logOut-ltr.svg",
"rtl": "images/icons/logOut-rtl.svg"
} },
- "magnifyingGlass": { "file": {
- "ltr": "images/icons/magnifyingGlass-ltr.svg",
- "rtl": "images/icons/magnifyingGlass-rtl.svg"
- } },
"newWindow": { "file": {
"ltr": "images/icons/newWindow-ltr.svg",
"rtl": "images/icons/newWindow-rtl.svg"
diff --git a/src/themes/mediawiki/icons.json b/src/themes/mediawiki/icons.json
index 6d8e4ad..cc6c503 100644
--- a/src/themes/mediawiki/icons.json
+++ b/src/themes/mediawiki/icons.json
@@ -60,7 +60,10 @@
"rtl": "images/icons/arched-arrow-rtl.svg"
} },
"remove": { "file": "images/icons/remove.svg", "variants": [
"destructive" ] },
- "search": { "file": "images/icons/search.svg" },
+ "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" },
"undo": { "file": {
diff --git a/src/themes/mediawiki/images/icons/magnifyingGlass-ltr.svg
b/src/themes/mediawiki/images/icons/search-ltr.svg
similarity index 100%
rename from src/themes/mediawiki/images/icons/magnifyingGlass-ltr.svg
rename to src/themes/mediawiki/images/icons/search-ltr.svg
diff --git a/src/themes/mediawiki/images/icons/magnifyingGlass-rtl.svg
b/src/themes/mediawiki/images/icons/search-rtl.svg
similarity index 100%
rename from src/themes/mediawiki/images/icons/magnifyingGlass-rtl.svg
rename to src/themes/mediawiki/images/icons/search-rtl.svg
diff --git a/src/themes/mediawiki/images/icons/search.svg
b/src/themes/mediawiki/images/icons/search.svg
deleted file mode 100644
index e4db4f0..0000000
--- a/src/themes/mediawiki/images/icons/search.svg
+++ /dev/null
@@ -1,6 +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">
- <g id="search">
- <path id="magnifying-glass" d="M16.021
15.96l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921
0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239
2.01-.643l.098.169 2.375
2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221
0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213
2.213-.001 1.222-.992 2.213-2.213 2.213z"/>
- </g>
-</svg>
diff --git a/src/themes/mediawiki/images/indicators/search-ltr.svg
b/src/themes/mediawiki/images/indicators/search-ltr.svg
new file mode 100644
index 0000000..266349e
--- /dev/null
+++ b/src/themes/mediawiki/images/indicators/search-ltr.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12
12">
+ <g id="search">
+ <path id="path3051" d="M10.369
9.474l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921
0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239
2.01-.643l.098.169 2.375
2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221
0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213
2.213-.001 1.222-.992 2.213-2.213 2.213z"/>
+ </g>
+</svg>
diff --git a/src/themes/mediawiki/images/indicators/search-rtl.svg
b/src/themes/mediawiki/images/indicators/search-rtl.svg
new file mode 100644
index 0000000..5368fd7
--- /dev/null
+++ b/src/themes/mediawiki/images/indicators/search-rtl.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12
12">
+ <g id="search">
+ <path id="path3051" d="M1.631
9.474l2.374-2.375.169-.099c-.403-.566-.643-1.26-.643-2.009.001-1.92 1.558-3.477
3.477-3.477 1.921 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.749
0-1.442-.239-2.01-.643l-.098.169-2.375
2.374c-.19.189-.543.143-.79-.104s-.293-.601-.104-.791zm5.377-2.27c1.221 0
2.213-.991 2.213-2.213 0-1.221-.992-2.213-2.213-2.213-1.222 0-2.213.992-2.213
2.213.001 1.222.992 2.213 2.213 2.213z"/>
+ </g>
+</svg>
diff --git a/src/themes/mediawiki/indicators.json
b/src/themes/mediawiki/indicators.json
index ced5e79..d83e57e 100644
--- a/src/themes/mediawiki/indicators.json
+++ b/src/themes/mediawiki/indicators.json
@@ -20,6 +20,10 @@
"ltr": "images/indicators/arrow-rtl.svg",
"rtl": "images/indicators/arrow-ltr.svg"
} },
- "required": { "file": "images/indicators/required.svg" }
+ "required": { "file": "images/indicators/required.svg" },
+ "search": { "file": {
+ "ltr": "images/indicators/search-ltr.svg",
+ "rtl": "images/indicators/search-rtl.svg"
+ } }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/208062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a001f388028d6041a7ab59d2f39daf9c15ea9c7
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
