Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275597
Change subject: [DEPRECATING CHANGE] Move some editing icons from core to
editing-*
......................................................................
[DEPRECATING CHANGE] Move some editing icons from core to editing-*
Change-Id: Ie3f6975102e5f806fd9c24a41989ebfe5daf1729
---
M demos/pages/icons.js
M src/themes/apex/icons-editing-core.json
M src/themes/apex/icons-editing-styling.json
M src/themes/mediawiki/icons-editing-core.json
M src/themes/mediawiki/icons-editing-styling.json
5 files changed, 24 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/97/275597/1
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index b4a17e3..030b77d 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -9,7 +9,6 @@
'check',
'circle',
'close',
- 'code',
'collapse',
'comment',
'ellipsis',
@@ -21,11 +20,9 @@
'next',
'notice',
'previous',
- 'redo',
'search',
'settings',
'tag',
- 'undo',
'window'
],
movement: [
@@ -101,7 +98,9 @@
'editUndo',
'link',
'linkExternal',
- 'linkSecure'
+ 'linkSecure',
+ 'redo',
+ 'undo'
],
'editing-styling': [
'bigger',
@@ -112,6 +111,7 @@
'italic',
'strikethrough',
'underline',
+ 'code',
'textDirLTR',
'textDirRTL',
'textStyle'
diff --git a/src/themes/apex/icons-editing-core.json
b/src/themes/apex/icons-editing-core.json
index ceb3199..b303071 100644
--- a/src/themes/apex/icons-editing-core.json
+++ b/src/themes/apex/icons-editing-core.json
@@ -19,6 +19,14 @@
"ltr": "images/icons/external-link-ltr.svg",
"rtl": "images/icons/external-link-rtl.svg"
} },
- "linkSecure": { "file": "images/icons/secure-link.svg" }
+ "linkSecure": { "file": "images/icons/secure-link.svg" },
+ "redo": { "file": {
+ "ltr": "images/icons/arched-arrow-ltr.svg",
+ "rtl": "images/icons/arched-arrow-rtl.svg"
+ } },
+ "undo": { "file": {
+ "ltr": "images/icons/arched-arrow-rtl.svg",
+ "rtl": "images/icons/arched-arrow-ltr.svg"
+ } }
}
}
diff --git a/src/themes/apex/icons-editing-styling.json
b/src/themes/apex/icons-editing-styling.json
index bd26399..7860ecc 100644
--- a/src/themes/apex/icons-editing-styling.json
+++ b/src/themes/apex/icons-editing-styling.json
@@ -64,6 +64,7 @@
"en": "images/icons/underline-u.svg"
}
} },
+ "code": { "file": "images/icons/code.svg" },
"textLanguage": { "file": {
"ltr": "images/icons/language-ltr.svg",
"rtl": "images/icons/language-rtl.svg"
diff --git a/src/themes/mediawiki/icons-editing-core.json
b/src/themes/mediawiki/icons-editing-core.json
index 67a68c3..d70f60e 100644
--- a/src/themes/mediawiki/icons-editing-core.json
+++ b/src/themes/mediawiki/icons-editing-core.json
@@ -41,6 +41,14 @@
"ltr": "images/icons/external-link-ltr.svg",
"rtl": "images/icons/external-link-rtl.svg"
} },
- "linkSecure": { "file": "images/icons/secure-link.svg" }
+ "linkSecure": { "file": "images/icons/secure-link.svg" },
+ "redo": { "file": {
+ "ltr": "images/icons/arched-arrow-ltr.svg",
+ "rtl": "images/icons/arched-arrow-rtl.svg"
+ } },
+ "undo": { "file": {
+ "ltr": "images/icons/arched-arrow-rtl.svg",
+ "rtl": "images/icons/arched-arrow-ltr.svg"
+ } }
}
}
diff --git a/src/themes/mediawiki/icons-editing-styling.json
b/src/themes/mediawiki/icons-editing-styling.json
index 45c6a64..2c25e30 100644
--- a/src/themes/mediawiki/icons-editing-styling.json
+++ b/src/themes/mediawiki/icons-editing-styling.json
@@ -71,6 +71,7 @@
"en": "images/icons/underline-u.svg"
}
} },
+ "code": { "file": "images/icons/code.svg" },
"textLanguage": { "file": {
"ltr": "images/icons/language-ltr.svg",
"rtl": "images/icons/language-rtl.svg"
--
To view, visit https://gerrit.wikimedia.org/r/275597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3f6975102e5f806fd9c24a41989ebfe5daf1729
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
