jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359809 )
Change subject: [DEPRECATING CHANGE] icons: Move and rename 'stripeSideMenu' to
'draggable'
......................................................................
[DEPRECATING CHANGE] icons: Move and rename 'stripeSideMenu' to 'draggable'
The 'stripeSideMenu' icon is now called 'draggable', and is moved from the
'layout' icon pack to 'movement'.
Bug: T111216
Change-Id: Ifcc86a2430efbaea99b656020197d3c4247b74aa
---
M demos/pages/icons.js
M demos/pages/widgets.js
M src/themes/apex/icons-layout.json
M src/themes/apex/icons-movement.json
R src/themes/apex/images/icons/draggable.svg
M src/themes/wikimediaui/icons-layout.json
M src/themes/wikimediaui/icons-movement.json
R src/themes/wikimediaui/images/icons/draggable.svg
8 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 3ce0269..876dc35 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -12,7 +12,8 @@
'last',
'expand',
'collapse',
- 'move'
+ 'move',
+ 'draggable'
],
content: [
'article',
@@ -175,7 +176,6 @@
layout: [
'menu',
'stripeFlow',
- 'stripeSideMenu',
'stripeSummary',
'stripeToC',
'viewCompact',
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 2735559..ce58b62 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -28,7 +28,7 @@
verticalHandledDragItems.push(
new Demo.DraggableHandledItemWidget( {
data: 'item' + i,
- icon: 'menu',
+ icon: 'draggable',
label: 'Item ' + i
} )
);
diff --git a/src/themes/apex/icons-layout.json
b/src/themes/apex/icons-layout.json
index 173b284..c274c5f 100644
--- a/src/themes/apex/icons-layout.json
+++ b/src/themes/apex/icons-layout.json
@@ -7,7 +7,10 @@
"ltr": "images/icons/stripeFlow-ltr.svg",
"rtl": "images/icons/stripeFlow-rtl.svg"
} },
- "stripeSideMenu": { "file": "images/icons/stripeSideMenu.svg" },
+ "stripeSideMenu": {
+ "file": "images/icons/draggable.svg",
+ "deprecated": "Replaced since v0.22.2, use 'draggable'
from the 'movement' pack instead."
+ },
"stripeSummary": { "file": {
"ltr": "images/icons/stripeSummary-ltr.svg",
"rtl": "images/icons/stripeSummary-rtl.svg"
diff --git a/src/themes/apex/icons-movement.json
b/src/themes/apex/icons-movement.json
index ca49d20..8110a36 100644
--- a/src/themes/apex/icons-movement.json
+++ b/src/themes/apex/icons-movement.json
@@ -28,6 +28,7 @@
"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" },
+ "draggable": { "file": "images/icons/draggable.svg" },
"expand": { "file": "images/icons/expand.svg" },
"move": { "file": "images/icons/move.svg" },
"next": { "file": {
diff --git a/src/themes/apex/images/icons/stripeSideMenu.svg
b/src/themes/apex/images/icons/draggable.svg
similarity index 100%
rename from src/themes/apex/images/icons/stripeSideMenu.svg
rename to src/themes/apex/images/icons/draggable.svg
diff --git a/src/themes/wikimediaui/icons-layout.json
b/src/themes/wikimediaui/icons-layout.json
index f720a25..21b57cc 100644
--- a/src/themes/wikimediaui/icons-layout.json
+++ b/src/themes/wikimediaui/icons-layout.json
@@ -27,7 +27,10 @@
"ltr": "images/icons/stripeFlow-ltr.svg",
"rtl": "images/icons/stripeFlow-rtl.svg"
} },
- "stripeSideMenu": { "file": "images/icons/stripeSideMenu.svg" },
+ "stripeSideMenu": {
+ "file": "images/icons/draggable.svg",
+ "deprecated": "Replaced since v0.22.2, use 'draggable'
from the 'movement' pack instead."
+ },
"stripeSummary": { "file": {
"ltr": "images/icons/stripeSummary-ltr.svg",
"rtl": "images/icons/stripeSummary-rtl.svg"
diff --git a/src/themes/wikimediaui/icons-movement.json
b/src/themes/wikimediaui/icons-movement.json
index 9eafbe3..baa79e5 100644
--- a/src/themes/wikimediaui/icons-movement.json
+++ b/src/themes/wikimediaui/icons-movement.json
@@ -48,6 +48,7 @@
"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" },
+ "draggable": { "file": "images/icons/draggable.svg" },
"expand": { "file": "images/icons/expand.svg" },
"move": { "file": "images/icons/move.svg" },
"next": { "file": {
diff --git a/src/themes/wikimediaui/images/icons/stripeSideMenu.svg
b/src/themes/wikimediaui/images/icons/draggable.svg
similarity index 100%
rename from src/themes/wikimediaui/images/icons/stripeSideMenu.svg
rename to src/themes/wikimediaui/images/icons/draggable.svg
--
To view, visit https://gerrit.wikimedia.org/r/359809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcc86a2430efbaea99b656020197d3c4247b74aa
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Prtksxna <[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
