jenkins-bot has submitted this change and it was merged.
Change subject: Toolbar should appear to be within text area
......................................................................
Toolbar should appear to be within text area
Note that this completely fails when the debugBar is also present, havn't
thought of how to fix that yet.
Bug: T94112
Change-Id: I63613e96f3116745726326a254f5ac3f220f5f61
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
1 file changed, 18 insertions(+), 2 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 736fafe..6076edf 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -23,11 +23,27 @@
// this border comes from .mw-ui-input on the same div, but i
dont think
// we want to remove this for all inputs just the documentNode
border: none;
+ // 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-bottom: 40px;
}
- // The default border is only appropriate in the default ve, with
- // the toolbar above the editing surface.
+ .oo-ui-toolbar {
+ // The -40 matches the padding-bottom on .ve-ce-documentNode to
put the toolbar inside
+ // the editing area. The 2px of positive margin gives room for
the blue border of the
+ // documentNode (via .mw-ui-input)
+ margin: -40px 2px 0 2px;
+ }
+
+ // Due to this being floated, it needs a matching top margin to still
display inside the bar
+ .oo-ui-toolbar-actions {
+ margin-top: 38px;
+ }
+
.oo-ui-toolbar-bar {
+ // The default border is only appropriate in the default ve,
with
+ // the toolbar above the editing surface.
border: none;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63613e96f3116745726326a254f5ac3f220f5f61
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
