Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291674
Change subject: [PULL THROUGH] Fix debug bar encapsulation
......................................................................
[PULL THROUGH] Fix debug bar encapsulation
Pull through for Id9b4f0e6bb5b954013ac27efc744cc892d1b6ae8
Change-Id: I2c5d722278c5f71b59ee2f8849d9babb5aff6af2
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
M modules/ve-mw/init/ve.init.mw.Target.js
4 files changed, 18 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/74/291674/1
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
index 3fb1da0..6430f0b 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
@@ -22,12 +22,17 @@
padding-top: 0.9921875em;
}
-/* Main document debug bar */
-.ve-init-mw-desktopArticleTarget > .ve-ui-debugBar {
+.ve-ui-debugBar {
border-top: 1px solid #ccc;
+}
+
+/* Main document debug bar */
+.ve-init-mw-target-surface > .ve-ui-debugBar {
/* 0.8/0.8 */
padding: 1em;
- margin: 1em -1em -1em -1em;
+ padding-bottom: 0;
+ margin: 1em -1em 0 -1em;
+ font-size: 1.007874em;
}
.ve-init-mw-target-surface {
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
index 63452e8..cc5a705 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
@@ -20,8 +20,7 @@
of content editable.
*/
/* 1/0.875 */
- margin: 0 -1.14286em -1.14286em -1.14286em;
- padding-bottom: 1.14286em;
+ margin: 0 -1.14286em;
}
.ve-deactivating .ve-init-mw-desktopArticleTarget-originalContent,
@@ -67,10 +66,11 @@
}
/* Main document debug bar */
-.ve-init-mw-desktopArticleTarget > .ve-ui-debugBar {
+.ve-init-mw-target-surface > .ve-ui-debugBar {
/* 1/0.8 */
padding: 1.25em;
- margin: 1.25em -1.25em -1.25em -1.25em;
+ padding-bottom: 0;
+ margin-top: 1.25em;
}
/* ve.ce.TableCellnode.css's margin replaced by more specific rule in Vector
(div#content p) */
@@ -82,8 +82,7 @@
@media screen and ( min-width: 982px ) {
.ve-init-mw-target-surface {
/* 1.5/0.875 */
- margin: 0 -1.71429em -1.71429em -1.71429em;
- padding-bottom: 1.71429em;
+ margin: 0 -1.71429em;
}
.ve-deactivating .ve-init-mw-desktopArticleTarget-originalContent,
@@ -102,10 +101,11 @@
}
/* Main document debug bar */
- .ve-init-mw-desktopArticleTarget > .ve-ui-debugBar {
+ .ve-init-mw-target-surface > .ve-ui-debugBar {
/* 1/0.8, 1.5/0.8 */
padding: 1.875em;
- margin: 1.875em -1.875em -1.875em -1.875em;
+ padding-bottom: 0;
+ margin-top: 1.875em;
}
}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
index b1d3584..8a2fe63 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
@@ -13,7 +13,8 @@
}
/* Fix font styles for overlays inside mw-body-content */
-.mw-body-content .ve-ui-overlay {
+.mw-body-content .ve-ui-overlay,
+.mw-body-content .ve-ui-debugBar {
font-size: 0.914286em; /* 0.8/0.875 */
line-height: normal;
}
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index b4a61f6..0f9b174 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -315,10 +315,6 @@
// Now that the surface is attached to the
document and ready,
// let it initialize itself
surface.initialize();
- if ( surface.debugBar ) {
- // Move debug bar to end of target if
the surface is nested
- target.$element.append(
surface.debugBar.$element );
- }
target.track( 'trace.initializeSurface.exit' );
setTimeout( callback );
--
To view, visit https://gerrit.wikimedia.org/r/291674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c5d722278c5f71b59ee2f8849d9babb5aff6af2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
