jenkins-bot has submitted this change and it was merged.
Change subject: Polish the entry fields after VE integration
......................................................................
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.
- License text alignment
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
M modules/styles/board/form-actions.less
4 files changed, 23 insertions(+), 8 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
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..834c879 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -35,7 +35,9 @@
// This creates a space for the toolbar, a matching negative
margin-top
// shifts the toolbar into this location.
// @todo where did this 40 come from, could it be calculated?
+ padding: 1px 8px;
padding-bottom: 40px;
+ min-height: 163px; // (112 + 51) wikitext text area min-height
(inline style) + actions
}
.oo-ui-toolbar {
@@ -55,4 +57,8 @@
// the toolbar above the editing surface.
border: none;
}
+
+ .oo-ui-toolGroup {
+ margin-bottom: 2px;
+ }
}
diff --git a/modules/styles/board/editor-switcher.less
b/modules/styles/board/editor-switcher.less
index 1f0fbec..3c4ed9e 100644
--- a/modules/styles/board/editor-switcher.less
+++ b/modules/styles/board/editor-switcher.less
@@ -8,14 +8,24 @@
// 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;
+ }
+ }
+
+ &.flow-ui-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 +38,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 {
diff --git a/modules/styles/board/form-actions.less
b/modules/styles/board/form-actions.less
index 2f27583..6b748bb 100644
--- a/modules/styles/board/form-actions.less
+++ b/modules/styles/board/form-actions.less
@@ -6,7 +6,7 @@
// Form button actions should be right-affixed
.flow-form-actions {
position: relative;
- margin-top: .25em;
+ margin-top: 8px;
button.mw-ui-button, a.mw-ui-button {
float: right;
--
To view, visit https://gerrit.wikimedia.org/r/206771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22207ba35e58aced3936bb215ed2e53fd490e6dd
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Pginer <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Pginer <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
