jenkins-bot has submitted this change and it was merged.
Change subject: [DEPRECATING CHANGE] MediaWiki, Apex themes: Unify add/insert
icons
......................................................................
[DEPRECATING CHANGE] MediaWiki, Apex themes: Unify add/insert icons
'Add' had 3px arms, 'insert' had 6px arms. Unify these
with 5px arms. Deprecate 'insert'.
Bug: T105552
Change-Id: I29976be9e204676908041d34c6e8f4c2a20f5a4c
---
M demos/pages/icons.js
M src/themes/apex/icons-editing-advanced.json
M src/themes/apex/images/icons/add.svg
D src/themes/apex/images/icons/insert.svg
M src/themes/mediawiki/icons-editing-advanced.json
M src/themes/mediawiki/images/icons/add.svg
D src/themes/mediawiki/images/icons/insert.svg
7 files changed, 4 insertions(+), 17 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index ffc5112..a645431 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -130,7 +130,6 @@
'alignRight',
'calendar',
'find',
- 'insert',
'layout',
'newline',
'noWikiText',
diff --git a/src/themes/apex/icons-editing-advanced.json
b/src/themes/apex/icons-editing-advanced.json
index f7b3862..a6abce5 100644
--- a/src/themes/apex/icons-editing-advanced.json
+++ b/src/themes/apex/icons-editing-advanced.json
@@ -13,7 +13,7 @@
"ltr": "images/icons/find-ltr.svg",
"rtl": "images/icons/find-rtl.svg"
} },
- "insert": { "file": "images/icons/insert.svg" },
+ "insert": { "file": "images/icons/add.svg" },
"layout": { "file": {
"ltr": "images/icons/layout-ltr.svg",
"rtl": "images/icons/layout-rtl.svg"
diff --git a/src/themes/apex/images/icons/add.svg
b/src/themes/apex/images/icons/add.svg
index 85e39fe..62e5496 100644
--- a/src/themes/apex/images/icons/add.svg
+++ b/src/themes/apex/images/icons/add.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="add">
- <path id="plus" d="M13 8h-2v3H8v2h3v3h2v-3h3v-2h-3z"/>
+ <path id="plus" d="M13 6h-2v5H6v2h5v5h2v-5h5v-2h-5z"/>
</g>
</svg>
diff --git a/src/themes/apex/images/icons/insert.svg
b/src/themes/apex/images/icons/insert.svg
deleted file mode 100644
index d1e9ba3..0000000
--- a/src/themes/apex/images/icons/insert.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="insert">
- <path d="M13 5h-2v6H5v2h6v6h2v-6h6v-2h-6z" id="plus"/>
- </g>
-</svg>
diff --git a/src/themes/mediawiki/icons-editing-advanced.json
b/src/themes/mediawiki/icons-editing-advanced.json
index ef368c2..d981728 100644
--- a/src/themes/mediawiki/icons-editing-advanced.json
+++ b/src/themes/mediawiki/icons-editing-advanced.json
@@ -19,7 +19,7 @@
"ltr": "images/icons/find-ltr.svg",
"rtl": "images/icons/find-rtl.svg"
} },
- "insert": { "file": "images/icons/insert.svg" },
+ "insert": { "file": "images/icons/add.svg" },
"layout": { "file": {
"ltr": "images/icons/layout-ltr.svg",
"rtl": "images/icons/layout-rtl.svg"
diff --git a/src/themes/mediawiki/images/icons/add.svg
b/src/themes/mediawiki/images/icons/add.svg
index 85e39fe..62e5496 100644
--- a/src/themes/mediawiki/images/icons/add.svg
+++ b/src/themes/mediawiki/images/icons/add.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="add">
- <path id="plus" d="M13 8h-2v3H8v2h3v3h2v-3h3v-2h-3z"/>
+ <path id="plus" d="M13 6h-2v5H6v2h5v5h2v-5h5v-2h-5z"/>
</g>
</svg>
diff --git a/src/themes/mediawiki/images/icons/insert.svg
b/src/themes/mediawiki/images/icons/insert.svg
deleted file mode 100644
index d1e9ba3..0000000
--- a/src/themes/mediawiki/images/icons/insert.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="insert">
- <path d="M13 5h-2v6H5v2h6v6h2v-6h6v-2h-6z" id="plus"/>
- </g>
-</svg>
--
To view, visit https://gerrit.wikimedia.org/r/250949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29976be9e204676908041d34c6e8f4c2a20f5a4c
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders <[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
