jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (34acc70) ......................................................................
Update VE core submodule to master (34acc70) New changes: 9dfe7eb Localisation updates from https://translatewiki.net. baa6dff Break out theme-specific CSS f68fcd9 dist: Put cssUrlEmbed after cssjanus now this is possible so it works for dist Change-Id: I2af22ab241397c8c84eb8e5e5b4e51f37f8971ac --- M .docs/eg-iframe.html M VisualEditor.php M lib/ve 3 files changed, 7 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html index 19b27c3..0feae94 100644 --- a/.docs/eg-iframe.html +++ b/.docs/eg-iframe.html @@ -48,6 +48,10 @@ <!-- visualEditor.desktop.build --> <link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.DesktopContext.css"> + <!-- visualEditor.theme.apex --> + <link rel=stylesheet href="lib/ve/src/themes/apex/dialogs.css"> + <link rel=stylesheet href="lib/ve/src/themes/apex/widgets.css"> + <!-- example styles --> <style> body { diff --git a/VisualEditor.php b/VisualEditor.php index 732a2c9..0117e89 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -645,6 +645,9 @@ // TODO: add debugStyles to ResourceLoader 'lib/ve/src/ui/styles/ve.ui.DebugBar.css', + + 'lib/ve/src/themes/mediawiki/dialogs.css', + 'lib/ve/src/themes/mediawiki/widgets.css', ), 'dependencies' => array( 'unicodejs', diff --git a/lib/ve b/lib/ve index 63a2178..34acc70 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 63a21781dae318c50424557709dc1df5a2b092a0 +Subproject commit 34acc702054d0d1a30d4be7fb14a0d6b948d265c -- To view, visit https://gerrit.wikimedia.org/r/183152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2af22ab241397c8c84eb8e5e5b4e51f37f8971ac Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <[email protected]> Gerrit-Reviewer: Esanders <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Trevor Parscal <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
