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

Change subject: Remove isBorderBox from editor overlay
......................................................................


Remove isBorderBox from editor overlay

Caused problems with the OOUI editor switcher.

Added targeted border-box rule to textarea which
was actually using it.

Change-Id: I120cb757b67405691a1cbe2608595e35d3f82132
---
M resources/mobile.editor.common/editor.less
M resources/mobile.editor.overlay/EditorOverlay.js
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/resources/mobile.editor.common/editor.less 
b/resources/mobile.editor.common/editor.less
index f030e7a..7ec48fb 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -2,11 +2,14 @@
 @import "minerva.mixins";
 
 .editor-overlay {
+       .box-sizing(border-box);
+
        .preview {
                display: none;
        }
 
        .wikitext-editor {
+               .box-sizing(border-box);
                padding: 10px @contentMargin;
        }
 
diff --git a/resources/mobile.editor.overlay/EditorOverlay.js 
b/resources/mobile.editor.overlay/EditorOverlay.js
index 9088169..fb420aa 100644
--- a/resources/mobile.editor.overlay/EditorOverlay.js
+++ b/resources/mobile.editor.overlay/EditorOverlay.js
@@ -20,6 +20,9 @@
         * @extends EditorOverlayBase
         */
        EditorOverlay = EditorOverlayBase.extend( {
+               /** @inheritdoc **/
+               isBorderBox: false,
+               /** @inheritdoc **/
                templatePartials: $.extend( {}, 
EditorOverlayBase.prototype.templatePartials, {
                        content: mw.template.get( 'mobile.editor.overlay', 
'content.hogan' ),
                        messageBox: MessageBox.prototype.template,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I120cb757b67405691a1cbe2608595e35d3f82132
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to