jenkins-bot has submitted this change and it was merged.
Change subject: Ensure placeholder styling matches document
......................................................................
Ensure placeholder styling matches document
Bug: T96593
Change-Id: I23bb1393a9a6779b70ed1004496f3ca6ff038e43
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
4 files changed, 12 insertions(+), 3 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
index 425983f..7e612c3 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
@@ -35,10 +35,15 @@
border-top: 1px solid #ccc;
}
-.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
+.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode,
+.ve-init-mw-viewPageTarget-surface .ve-ui-surface-placeholder {
padding: 0;
}
+.ve-init-mw-viewPageTarget-surface .ve-ui-surface-placeholder {
+ margin-top: -0.45em;
+}
+
.ve-init-target > .ve-ui-debugBar {
/* 0.8/0.8 */
padding: 1em;
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
index 5c50eb7..4bf1dda 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
@@ -23,7 +23,8 @@
margin: 1em -1.25em 0 -1.25em;
}
-.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
+.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode
+.ve-init-mw-viewPageTarget-surface .ve-ui-surface-placeholder {
padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content
font-size) 0.875em */
}
@@ -99,7 +100,8 @@
margin: 1em -1.875em 0 -1.875em;
}
- .ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
+ .ve-init-mw-viewPageTarget-surface .ve-ce-documentNode,
+ .ve-init-mw-viewPageTarget-surface .ve-ui-surface-placeholder {
padding: 0 1.714em; /* surface-margin-left (1.5em) /
(mw-body-content font-size) 0.875em */
}
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index f938a10..62bab98 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1287,6 +1287,7 @@
// and the overlay container, and we don't want
inspectors to
// inherit skin typography styles for wikipage content.
surfaceView.$element.addClass( 'mw-body-content' );
+ surface.$placeholder.addClass( 'mw-body-content' );
$documentNode.addClass(
// Add appropriately mw-content-ltr or
mw-content-rtl class
'mw-content-' + mw.config.get( 'wgVisualEditor'
).pageLanguageDir
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
index 43f4b7e..17d5397 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
@@ -23,6 +23,7 @@
// Initialization
this.$element.addClass( 've-ui-mwSurfaceWidget' );
this.surface.getView().$element.addClass( 'mw-body-content' );
+ this.surface.$placeholder.addClass( 'mw-body-content' );
};
/* Inheritance */
--
To view, visit https://gerrit.wikimedia.org/r/221843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23bb1393a9a6779b70ed1004496f3ca6ff038e43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
