jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356322 )
Change subject: Follow-up 8c94697f: Actually commit the icon changes I had
locally
......................................................................
Follow-up 8c94697f: Actually commit the icon changes I had locally
Change-Id: I64e9953803690f54891cca8be4963128aa4b75c5
---
M .jsduck/eg-iframe.html
M build/modules.json
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/minimal-rtl.html
M demos/ve/minimal.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M demos/ve/ve.demo.SurfaceContainer.js
M src/ui/contextitems/ve.ui.LinearContextItem.js
M src/ui/contextitems/ve.ui.TableLineContextItem.js
M src/ui/tools/ve.ui.AuthorListPopupTool.js
12 files changed, 56 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 37b7208..21fde0b 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -6,6 +6,10 @@
<!-- oojs-ui-apex -->
<link rel=stylesheet href="../lib/oojs-ui/oojs-ui-apex.css">
+ <link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-alerts.css">
+ <link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-interactions.css">
+ <link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-moderation.css">
+ <link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-user.css">
<link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-editing-core.css">
<link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css">
<link rel=stylesheet
href="../lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css">
diff --git a/build/modules.json b/build/modules.json
index 2ea4c8d..cc13c8f 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -64,6 +64,10 @@
],
"styles": [
"lib/oojs-ui/oojs-ui-apex.css",
+ "lib/oojs-ui/oojs-ui-apex-icons-alerts.css",
+ "lib/oojs-ui/oojs-ui-apex-icons-interactions.css",
+ "lib/oojs-ui/oojs-ui-apex-icons-moderation.css",
+ "lib/oojs-ui/oojs-ui-apex-icons-user.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-core.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css",
@@ -79,6 +83,10 @@
],
"styles": [
"lib/oojs-ui/oojs-ui-wikimediaui.css",
+ "lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css",
+
"lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css",
+ "lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css",
+ "lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css",
"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css",
"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css",
"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css",
diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html
index 4ab2d96..f48a7d1 100644
--- a/demos/ve/desktop-dist.html
+++ b/demos/ve/desktop-dist.html
@@ -15,6 +15,14 @@
<!-- oojs-ui-apex -->
<link rel=stylesheet href="../../lib/oojs-ui/oojs-ui-apex.css"
class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex.rtl.css" class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-alerts.css" class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-interactions.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-moderation.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-user.css" class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css" class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.css"
class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css"
class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css"
class="stylesheet-ltr">
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index da8e2d8..1a01671 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -18,6 +18,14 @@
<!-- oojs-ui-apex -->
<link rel=stylesheet href="../../lib/oojs-ui/oojs-ui-apex.css"
class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex.rtl.css" class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-alerts.css" class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-interactions.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-moderation.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-user.css" class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css" class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.css"
class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css"
class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css"
class="stylesheet-ltr">
diff --git a/demos/ve/minimal-rtl.html b/demos/ve/minimal-rtl.html
index 2bc64ce..3d2b6a0 100644
--- a/demos/ve/minimal-rtl.html
+++ b/demos/ve/minimal-rtl.html
@@ -14,6 +14,10 @@
<!-- oojs-ui-apex -->
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css">
diff --git a/demos/ve/minimal.html b/demos/ve/minimal.html
index b195623..e91f2b0 100644
--- a/demos/ve/minimal.html
+++ b/demos/ve/minimal.html
@@ -14,6 +14,10 @@
<!-- oojs-ui-apex -->
<link rel=stylesheet href="../../lib/oojs-ui/oojs-ui-apex.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-alerts.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-interactions.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-moderation.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-user.css">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.css">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css">
diff --git a/demos/ve/mobile-dist.html b/demos/ve/mobile-dist.html
index 7556448..39ea874 100644
--- a/demos/ve/mobile-dist.html
+++ b/demos/ve/mobile-dist.html
@@ -15,6 +15,14 @@
<!-- oojs-ui-wikimediaui -->
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui.css" class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui.rtl.css" class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css"
class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css"
class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css"
class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css"
class="stylesheet-ltr">
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index d524e0b..c12f345 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -18,6 +18,14 @@
<!-- oojs-ui-wikimediaui -->
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui.css" class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui.rtl.css" class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css"
class="stylesheet-rtl">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css"
class="stylesheet-ltr">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css"
class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css"
class="stylesheet-ltr">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css"
class="stylesheet-rtl">
<link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css"
class="stylesheet-ltr">
diff --git a/demos/ve/ve.demo.SurfaceContainer.js
b/demos/ve/ve.demo.SurfaceContainer.js
index 0eb0486..33c95d8 100644
--- a/demos/ve/ve.demo.SurfaceContainer.js
+++ b/demos/ve/ve.demo.SurfaceContainer.js
@@ -33,7 +33,7 @@
input: pageDropdown
} );
removeButton = new OO.ui.ButtonWidget( {
- icon: 'remove',
+ icon: 'trash',
label: 'Remove surface'
} );
saveButton = new OO.ui.ButtonWidget( {
diff --git a/src/ui/contextitems/ve.ui.LinearContextItem.js
b/src/ui/contextitems/ve.ui.LinearContextItem.js
index 8b52444..43e9c0d 100644
--- a/src/ui/contextitems/ve.ui.LinearContextItem.js
+++ b/src/ui/contextitems/ve.ui.LinearContextItem.js
@@ -47,7 +47,7 @@
} );
this.deleteButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
flags: [ 'destructive' ]
} );
}
diff --git a/src/ui/contextitems/ve.ui.TableLineContextItem.js
b/src/ui/contextitems/ve.ui.TableLineContextItem.js
index 085041f..55e56f0 100644
--- a/src/ui/contextitems/ve.ui.TableLineContextItem.js
+++ b/src/ui/contextitems/ve.ui.TableLineContextItem.js
@@ -188,7 +188,7 @@
OO.inheritClass( ve.ui[ className ], ve.ui.TableLineContextItem
);
ve.ui[ className ].static.name = 'delete' + modeName;
ve.ui[ className ].static.group = 'table-' + mode;
- ve.ui[ className ].static.icon = 'remove';
+ ve.ui[ className ].static.icon = 'trash';
ve.ui[ className ].static.commandName = 'delete' + modeName;
ve.ui[ className ].prototype.getTitle = function () {
var count,
diff --git a/src/ui/tools/ve.ui.AuthorListPopupTool.js
b/src/ui/tools/ve.ui.AuthorListPopupTool.js
index 6e5bf51..2bfe932 100644
--- a/src/ui/tools/ve.ui.AuthorListPopupTool.js
+++ b/src/ui/tools/ve.ui.AuthorListPopupTool.js
@@ -114,7 +114,7 @@
ve.ui.AuthorListPopupTool.static.name = 'authorList';
ve.ui.AuthorListPopupTool.static.group = 'utility';
-ve.ui.AuthorListPopupTool.static.icon = 'speechBubbles'; // TODO: Change to
userAvatar once it is available in Apex
+ve.ui.AuthorListPopupTool.static.icon = 'userAvatar';
ve.ui.AuthorListPopupTool.static.title = '1';
ve.ui.AuthorListPopupTool.static.autoAddToCatchall = false;
ve.ui.AuthorListPopupTool.static.autoAddToGroup = false;
--
To view, visit https://gerrit.wikimedia.org/r/356322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64e9953803690f54891cca8be4963128aa4b75c5
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
