jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Fix debug bar encapsulation
......................................................................
[BREAKING CHANGE] Fix debug bar encapsulation
Debug bar lives inside the surface so it should
be inside it in the DOM.
Bug: T106927
Change-Id: Id9b4f0e6bb5b954013ac27efc744cc892d1b6ae8
---
M demos/ve/demo.css
M demos/ve/demo.desktop.css
M demos/ve/demo.mobile.css
M src/ui/styles/ve.ui.DebugBar.css
M src/ui/ve.ui.Surface.js
5 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index b5b64af..b6b909a 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -104,6 +104,7 @@
.ve-ui-debugBar {
padding: 1.5em;
+ border-top: 1px solid #ccc;
}
.ve-ui-debugBar-filibuster {
diff --git a/demos/ve/demo.desktop.css b/demos/ve/demo.desktop.css
index 6c3de88..61584f2 100644
--- a/demos/ve/demo.desktop.css
+++ b/demos/ve/demo.desktop.css
@@ -36,7 +36,3 @@
border-radius: 0.25em;
box-shadow: 0 0.25em 1.5em 0 #ddd;
}
-
-.ve-init-sa-target-surfaceWrapper > .ve-ui-debugBar {
- border-top: 1px solid #ccc;
-}
diff --git a/demos/ve/demo.mobile.css b/demos/ve/demo.mobile.css
index d104102..fce3b57 100644
--- a/demos/ve/demo.mobile.css
+++ b/demos/ve/demo.mobile.css
@@ -32,7 +32,3 @@
.ve-init-sa-target-toolbar.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
border-top: 0;
}
-
-.ve-ui-debugBar {
- border-bottom: 1px solid #ccc;
-}
diff --git a/src/ui/styles/ve.ui.DebugBar.css b/src/ui/styles/ve.ui.DebugBar.css
index 148060a..ebbe0ec 100644
--- a/src/ui/styles/ve.ui.DebugBar.css
+++ b/src/ui/styles/ve.ui.DebugBar.css
@@ -4,6 +4,10 @@
* @copyright 2011-2016 VisualEditor Team and others; see
http://ve.mit-license.org
*/
+.ve-ui-debugBar {
+ clear: both;
+}
+
.ve-ui-debugBar-commands {
margin-bottom: -0.5em;
}
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index f9728ac..128e8a5 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -246,7 +246,7 @@
*/
ve.ui.Surface.prototype.setupDebugBar = function () {
this.debugBar = new ve.ui.DebugBar( this );
- this.debugBar.$element.insertAfter( this.$element );
+ this.$element.append( this.debugBar.$element );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/291669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b4f0e6bb5b954013ac27efc744cc892d1b6ae8
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
