Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/167335
Change subject: Apply mw-body-content styles to SurfaceWidget ...................................................................... Apply mw-body-content styles to SurfaceWidget Changes: * Override ve.ui.SurfaceWidget for use in MW * Add mw-body-content class to surface view container * Assert 1em sizing for surface view container to prevent mw-body-content from applying its own sizing * Add new scripts and styles to RL config Bug: 71652 Change-Id: Iac86facdc0c7a0e48c0f3617e2f6c2e7f001525e (cherry picked from commit 77eae16b88730553370cbffcdc9a31505913a634) --- M VisualEditor.php M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js A modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css A modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js 5 files changed, 44 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/35/167335/1 diff --git a/VisualEditor.php b/VisualEditor.php index fc6617a..631ba9e 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -704,6 +704,7 @@ // ui 'modules/ve-mw/ui/ve.ui.MWCommandRegistry.js', + 'modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js', 'modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js', 'modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js', 'modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js', @@ -724,6 +725,7 @@ // ui 'modules/ve-mw/ui/styles/inspectors/ve.ui.MWExtensionInspector.css', 'modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css', + 'modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css', 'modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css', 'modules/ve-mw/ui/styles/widgets/ve.ui.MWTocWidget.css', ), diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js index bb6dee0..fb23237 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js @@ -869,7 +869,7 @@ this.store = doc.getStore(); // Set up the caption surface - this.captionSurface = new ve.ui.SurfaceWidget( + this.captionSurface = new ve.ui.MWSurfaceWidget( captionDocument, { $: this.$, diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js index 3ffb405..fe3c0ac 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js @@ -248,7 +248,7 @@ } // Properties - this.referenceSurface = new ve.ui.SurfaceWidget( + this.referenceSurface = new ve.ui.MWSurfaceWidget( this.referenceModel.getDocument(), { $: this.$, diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css new file mode 100644 index 0000000..fc1228d --- /dev/null +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css @@ -0,0 +1,10 @@ +/*! + * VisualEditor MediaWiki UserInterface MWSurfaceWidget styles. + * + * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +.ve-ui-mwSurfaceWidget .ve-ce-surface { + font-size: 1em; +} diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js new file mode 100644 index 0000000..b6d4571 --- /dev/null +++ b/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js @@ -0,0 +1,30 @@ +/*! + * VisualEditor UserInterface MWSurfaceWidget class. + * + * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +/** + * Creates an ve.ui.MWSurfaceWidget object. + * + * @class + * @abstract + * @extends ve.ui.SurfaceWidget + * + * @constructor + * @param {ve.dm.Document} doc Document model + * @param {Object} [config] Configuration options + */ +ve.ui.MWSurfaceWidget = function VeUiMWSurfaceWidget( doc, config ) { + // Parent constructor + ve.ui.MWSurfaceWidget.super.call( this, doc, config ); + + // Initialization + this.$element.addClass( 've-ui-mwSurfaceWidget' ); + this.surface.getView().$element.addClass( 'mw-body-content' ); +}; + +/* Inheritance */ + +OO.inheritClass( ve.ui.MWSurfaceWidget, ve.ui.SurfaceWidget ); -- To view, visit https://gerrit.wikimedia.org/r/167335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac86facdc0c7a0e48c0f3617e2f6c2e7f001525e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.25wmf3 Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits