Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232476
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 i18n/en.json
M i18n/qqq.json
M includes/Resources.php
M resources/mobile.editor.common/editor.less
M resources/mobile.editor.overlay/EditorOverlay.js
M resources/mobile.overlays/Overlay.less
6 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/76/232476/1
diff --git a/i18n/en.json b/i18n/en.json
index dae527d..914481a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -121,7 +121,6 @@
"mobile-frontend-editor-previewing-page":
"<span><strong>Previewing</strong> $1</span>",
"mobile-frontend-editor-redirect-title": "Redirecting to editor...",
"mobile-frontend-editor-save": "Save",
- "mobile-frontend-editor-source-editor": "Edit source",
"mobile-frontend-editor-success": "Success! Your edit was saved.",
"mobile-frontend-editor-success-landmark-1": "Congratulations, you are
now a {{SITENAME}} editor!",
"mobile-frontend-editor-success-new-page": "Congratulations on creating
a new page!",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8a07ff6..b9ba690 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -117,7 +117,6 @@
"mobile-frontend-editor-previewing-page": "A heading saying what page
is being previewed after editing. All text should be wrapped in a STRONG tag
except the page title itself.\n\nParameters:\n* $1 - page
title\n{{Related|Mobile-frontend-editor-page}}",
"mobile-frontend-editor-redirect-title": "Shown as a user is redirected
to the JavaScript editor after browsing to a URL with action=edit.\n\nUsed as
page title.",
"mobile-frontend-editor-save": "Caption for save button on edit
form.\n\nShould be consistent with the following message:\n*
{{msg-mw|mobile-frontend-editor-license}}\n{{Identical|Save}}",
- "mobile-frontend-editor-source-editor": "Label for button that switches
to the 'source editor' (a WikiText editing interface). Appears near
{{msg-mw|mobile-frontend-editor-visual-editor}}.\n{{Identical|Edit source}}",
"mobile-frontend-editor-success": "Text that displays when a page edit
has been successfully saved.\n\nUsed as \"toast\" message.\n\nSee also:\n*
{{msg-mw|Mobile-frontend-editor-success-landmark-1}}",
"mobile-frontend-editor-success-landmark-1": "Special save success
message shown to users on their 1st edit.\n\nSee also:\n*
{{msg-mw|Mobile-frontend-editor-success}}",
"mobile-frontend-editor-success-new-page": "Text that displays when a
new page has been successfully saved.\n\nUsed as \"toast\" message.",
diff --git a/includes/Resources.php b/includes/Resources.php
index 3b404ad..cf14c51 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -635,7 +635,6 @@
'mobile-frontend-editor-previewing-page',
'mobile-frontend-editor-switch-confirm',
'mobile-frontend-editor-visual-editor',
- 'mobile-frontend-editor-source-editor',
'mobile-frontend-editor-switch-editor',
'mobile-frontend-editor-anonwarning',
),
diff --git a/resources/mobile.editor.common/editor.less
b/resources/mobile.editor.common/editor.less
index f030e7a..64d590b 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -7,6 +7,7 @@
}
.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,
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index 1ed4781..1fb6d5f 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -98,6 +98,7 @@
background: #fff;
z-index: @z-indexOverlay;
padding-top: @headerHeight;
+ .box-sizing(border-box);
display: none;
&.visible {
--
To view, visit https://gerrit.wikimedia.org/r/232476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I120cb757b67405691a1cbe2608595e35d3f82132
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
