Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351660 )
Change subject: [DEPRECATING CHANGE] icons: Merge 'caret' into regular movement
icons
......................................................................
[DEPRECATING CHANGE] icons: Merge 'caret' into regular movement icons
The 'caretUp', 'caretDown', 'caretLast', and 'caretNext' icons are replaced
with the almost-identical 'collapse', 'expand', 'previous', and 'next' ones
with backwards-compatibility deprecated links for now.
Change-Id: Id9c4556caecb566208fd288a0c6882b0169dce67
---
M demos/pages/icons.js
M src/themes/apex/icons-movement.json
D src/themes/apex/images/icons/caret-ltr.svg
D src/themes/apex/images/icons/caret-rtl.svg
D src/themes/apex/images/icons/caretDown.svg
D src/themes/apex/images/icons/caretUp.svg
M src/themes/mediawiki/icons-movement.json
D src/themes/mediawiki/images/icons/caret-ltr.svg
D src/themes/mediawiki/images/icons/caret-rtl.svg
D src/themes/mediawiki/images/icons/caretDown.svg
D src/themes/mediawiki/images/icons/caretUp.svg
11 files changed, 32 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/60/351660/1
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 8b0ce20..0361381 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -12,10 +12,6 @@
'last',
'expand',
'collapse',
- 'caretLast',
- 'caretNext',
- 'caretDown',
- 'caretUp',
'move'
],
content: [
diff --git a/src/themes/apex/icons-movement.json
b/src/themes/apex/icons-movement.json
index 5998241..ca49d20 100644
--- a/src/themes/apex/icons-movement.json
+++ b/src/themes/apex/icons-movement.json
@@ -10,16 +10,22 @@
"ltr": "images/icons/arrow-rtl.svg",
"rtl": "images/icons/arrow-ltr.svg"
} },
- "caretNext": { "file": {
- "ltr": "images/icons/caret-rtl.svg",
- "rtl": "images/icons/caret-ltr.svg"
- } },
- "caretLast": { "file": {
- "ltr": "images/icons/caret-ltr.svg",
- "rtl": "images/icons/caret-rtl.svg"
- } },
- "caretDown": { "file": "images/icons/caretDown.svg" },
- "caretUp": { "file": "images/icons/caretUp.svg" },
+ "caretNext": {
+ "file": {
+ "ltr": "images/icons/move-rtl.svg",
+ "rtl": "images/icons/move-ltr.svg"
+ },
+ "deprecated": "Replaced since v0.21.3, use 'next'
instead."
+ },
+ "caretLast": {
+ "file": {
+ "ltr": "images/icons/move-ltr.svg",
+ "rtl": "images/icons/move-rtl.svg"
+ },
+ "deprecated": "Replaced since v0.21.3, use 'previous'
instead."
+ },
+ "caretDown": { "file": "images/icons/expand.svg", "deprecated":
"Replaced since v0.21.3, use 'expand' instead." },
+ "caretUp": { "file": "images/icons/collapse.svg", "deprecated":
"Replaced since v0.21.3, use 'collapse' instead." },
"collapse": { "file": "images/icons/collapse.svg" },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
"expand": { "file": "images/icons/expand.svg" },
diff --git a/src/themes/apex/images/icons/caret-ltr.svg
b/src/themes/apex/images/icons/caret-ltr.svg
deleted file mode 100644
index 44d2d1a..0000000
--- a/src/themes/apex/images/icons/caret-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="M7 13.1l8.9 8.9c.8-.8.8-2 0-2.8l-6.1-6.1 6-6.1c.8-.8.8-2 0-2.8L7
13.1z"/>
-</svg>
diff --git a/src/themes/apex/images/icons/caret-rtl.svg
b/src/themes/apex/images/icons/caret-rtl.svg
deleted file mode 100644
index 1f90f5c..0000000
--- a/src/themes/apex/images/icons/caret-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="M16.5 13.1L7.6 22c-.8-.8-.8-2 0-2.8l6.1-6.1-6-6.1c-.8-.8-.8-2
0-2.8l8.8 8.9z"/>
-</svg>
diff --git a/src/themes/apex/images/icons/caretDown.svg
b/src/themes/apex/images/icons/caretDown.svg
deleted file mode 100644
index 89e0612..0000000
--- a/src/themes/apex/images/icons/caretDown.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="M12 16l8.9-8.9c-.8-.8-2-.8-2.8 0L12 13.2l-6.1-6c-.8-.8-2-.8-2.8
0L12 16z"/>
-</svg>
diff --git a/src/themes/apex/images/icons/caretUp.svg
b/src/themes/apex/images/icons/caretUp.svg
deleted file mode 100644
index fcf4e13..0000000
--- a/src/themes/apex/images/icons/caretUp.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="M12 6.5l8.9 8.9c-.8.8-2 .8-2.8 0L12 9.3l-6.1 6c-.8.8-2 .8-2.8
0L12 6.5z"/>
-</svg>
diff --git a/src/themes/mediawiki/icons-movement.json
b/src/themes/mediawiki/icons-movement.json
index 37b4f8a..9eafbe3 100644
--- a/src/themes/mediawiki/icons-movement.json
+++ b/src/themes/mediawiki/icons-movement.json
@@ -30,16 +30,22 @@
"ltr": "images/icons/arrow-rtl.svg",
"rtl": "images/icons/arrow-ltr.svg"
} },
- "caretNext": { "file": {
- "ltr": "images/icons/caret-rtl.svg",
- "rtl": "images/icons/caret-ltr.svg"
- } },
- "caretLast": { "file": {
- "ltr": "images/icons/caret-ltr.svg",
- "rtl": "images/icons/caret-rtl.svg"
- } },
- "caretDown": { "file": "images/icons/caretDown.svg" },
- "caretUp": { "file": "images/icons/caretUp.svg" },
+ "caretNext": {
+ "file": {
+ "ltr": "images/icons/move-rtl.svg",
+ "rtl": "images/icons/move-ltr.svg"
+ },
+ "deprecated": "Replaced since v0.21.3, use 'next'
instead."
+ },
+ "caretLast": {
+ "file": {
+ "ltr": "images/icons/move-ltr.svg",
+ "rtl": "images/icons/move-rtl.svg"
+ },
+ "deprecated": "Replaced since v0.21.3, use 'previous'
instead."
+ },
+ "caretDown": { "file": "images/icons/expand.svg", "deprecated":
"Replaced since v0.21.3, use 'expand' instead." },
+ "caretUp": { "file": "images/icons/collapse.svg", "deprecated":
"Replaced since v0.21.3, use 'collapse' instead." },
"collapse": { "file": "images/icons/collapse.svg" },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
"expand": { "file": "images/icons/expand.svg" },
diff --git a/src/themes/mediawiki/images/icons/caret-ltr.svg
b/src/themes/mediawiki/images/icons/caret-ltr.svg
deleted file mode 100644
index 44d2d1a..0000000
--- a/src/themes/mediawiki/images/icons/caret-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="M7 13.1l8.9 8.9c.8-.8.8-2 0-2.8l-6.1-6.1 6-6.1c.8-.8.8-2 0-2.8L7
13.1z"/>
-</svg>
diff --git a/src/themes/mediawiki/images/icons/caret-rtl.svg
b/src/themes/mediawiki/images/icons/caret-rtl.svg
deleted file mode 100644
index 1f90f5c..0000000
--- a/src/themes/mediawiki/images/icons/caret-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="M16.5 13.1L7.6 22c-.8-.8-.8-2 0-2.8l6.1-6.1-6-6.1c-.8-.8-.8-2
0-2.8l8.8 8.9z"/>
-</svg>
diff --git a/src/themes/mediawiki/images/icons/caretDown.svg
b/src/themes/mediawiki/images/icons/caretDown.svg
deleted file mode 100644
index 89e0612..0000000
--- a/src/themes/mediawiki/images/icons/caretDown.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="M12 16l8.9-8.9c-.8-.8-2-.8-2.8 0L12 13.2l-6.1-6c-.8-.8-2-.8-2.8
0L12 16z"/>
-</svg>
diff --git a/src/themes/mediawiki/images/icons/caretUp.svg
b/src/themes/mediawiki/images/icons/caretUp.svg
deleted file mode 100644
index fcf4e13..0000000
--- a/src/themes/mediawiki/images/icons/caretUp.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="M12 6.5l8.9 8.9c-.8.8-2 .8-2.8 0L12 9.3l-6.1 6c-.8.8-2 .8-2.8
0L12 6.5z"/>
-</svg>
--
To view, visit https://gerrit.wikimedia.org/r/351660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9c4556caecb566208fd288a0c6882b0169dce67
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
