jenkins-bot has submitted this change and it was merged.

Change subject: Update VE core submodule to master (4408c13)
......................................................................


Update VE core submodule to master (4408c13)

New changes:
e7cb202 Mark context wrappers as wrappers
20b75af Localisation updates from https://translatewiki.net.
a4dde9f Annotate pasted external text
8148301 Always preserve leading whitespace when converting for clipboard
82a35b7 TransactionProcessor: Apply annotations to ranges at the highest 
uniform offset
21fc1eb Restore previous selection when annotation inspector is dismissed
358181c Preserve prior valid DOM selections in showModelSelection
a0f7dba build: Bump various devDependencies to latest
0ae0f7e Follow-up Iabec6a6: Fix typo in mousemove selection update code
d69a4df Provide tools to make text bigger or smaller

Local changes for big/small tools

Change-Id: If418a1a47276cc1e1530c4a3ad6784136d8d14f8
---
M extension.json
M lib/ve
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index a3916d2..a7e1617 100644
--- a/extension.json
+++ b/extension.json
@@ -894,10 +894,12 @@
                                "visualeditor-align-widget-left",
                                "visualeditor-align-widget-right",
                                "visualeditor-alignablecontextitem-title",
+                               "visualeditor-annotationbutton-big-tooltip",
                                "visualeditor-annotationbutton-bold-tooltip",
                                "visualeditor-annotationbutton-code-tooltip",
                                "visualeditor-annotationbutton-italic-tooltip",
                                "visualeditor-annotationbutton-link-tooltip",
+                               "visualeditor-annotationbutton-small-tooltip",
                                
"visualeditor-annotationbutton-strikethrough-tooltip",
                                
"visualeditor-annotationbutton-subscript-tooltip",
                                
"visualeditor-annotationbutton-superscript-tooltip",
diff --git a/lib/ve b/lib/ve
index 2567ca9..4408c13 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 2567ca9296b358a67aa1a002622cd38876a9e98d
+Subproject commit 4408c13850e3ee9583f51d0b3c306721b988103f
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 55d2bfd..c9cb11f 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -66,7 +66,7 @@
                include: [ { group: 'textStyle' }, 'language', 'clear' ],
                forceExpand: [ 'bold', 'italic', 'clear' ],
                promote: [ 'bold', 'italic' ],
-               demote: [ 'strikethrough', 'code', 'underline', 'language', 
'clear' ]
+               demote: [ 'strikethrough', 'code', 'underline', 'language', 
'big', 'small', 'clear' ]
        },
        // Link
        { include: [ 'link' ] },

-- 
To view, visit https://gerrit.wikimedia.org/r/303222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If418a1a47276cc1e1530c4a3ad6784136d8d14f8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to