Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206771
Change subject: Polish the entry fields after VE integration Adjustments to the
input element for Flow: - Size of VE and wikitext versions are the same (before
a jump was noticed when switching). - The switch to VE looks pressed in
wikitext. - Wikitext info text is align
......................................................................
Polish the entry fields after VE integration
Adjustments to the input element for Flow:
- Size of VE and wikitext versions are the same (before a jump was noticed when
switching).
- The switch to VE looks pressed in wikitext.
- Wikitext info text is aligned with the text in the text area.
Some changes in the code are required:
- Apply the "focused" class to the flow-editor element
Bug: T96421
Change-Id: I22207ba35e58aced3936bb215ed2e53fd490e6dd
---
M handlebars/flow_editor_switcher.partial.handlebars
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
M modules/styles/board/editor-switcher.less
3 files changed, 18 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/71/206771/1
diff --git a/handlebars/flow_editor_switcher.partial.handlebars
b/handlebars/flow_editor_switcher.partial.handlebars
index 303369c..c651800 100644
--- a/handlebars/flow_editor_switcher.partial.handlebars
+++ b/handlebars/flow_editor_switcher.partial.handlebars
@@ -6,7 +6,7 @@
{{#if enable_switcher}}
<a href="#"
title="{{l10n
"flow-wikitext-switch-editor-tooltip"}}"
- class="mw-ui-button flow-js flow-editor-switcher"
+ class="mw-ui-button flow-js flow-editor-switcher
mw-ui-checked"
data-flow-interactive-handler="switchEditor"
data-flow-target="< form textarea"
>
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 0e3dbc5..f2783d1 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -36,6 +36,7 @@
// shifts the toolbar into this location.
// @todo where did this 40 come from, could it be calculated?
padding-bottom: 40px;
+ min-height: 147px; // (112 + 35) wikitext text area min-height
(inline style) + footer
}
.oo-ui-toolbar {
diff --git a/modules/styles/board/editor-switcher.less
b/modules/styles/board/editor-switcher.less
index 1f0fbec..e3e9c74 100644
--- a/modules/styles/board/editor-switcher.less
+++ b/modules/styles/board/editor-switcher.less
@@ -8,14 +8,25 @@
// it's border and re-apply on the parent node that contains both
&.flow-editor-none {
border: 1px solid @colorFieldBorder;
-
+ padding: 2px;
+ background-color: white;
textarea {
border: 0;
+ background: white;
+ padding: 6px 6px 4px 6px;
+ &:focus {
+ box-shadow: none;
+ }
+ }
+
+ // TODO: When the textarea is focused, this class needs to be
added to flow-editor
+ &.focused {
+ box-shadow: inset 0 0 0 2px @colorProgressive;
}
.flow-switcher-controls {
- background-color: white;
- padding: .25em;
+ padding: 4px 6px 6px 6px;
+ position: relative;
}
}
@@ -28,11 +39,10 @@
// @todo this is basically the terms of use, come up with a shared
// name for all but the float
.flow-wikitext-editor-help {
- float: left;
- vertical-align: middle;
color: @colorTextLight;
font-size: .75em;
- line-height: 1.4;
+ position: absolute;
+ bottom: 0;
}
a.flow-editor-switcher {
--
To view, visit https://gerrit.wikimedia.org/r/206771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22207ba35e58aced3936bb215ed2e53fd490e6dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Pginer <pgi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
