Merge pull request #2834 from WordPress/fix/toolbar-positioning

Fix issues with sticky quick toolbar positioning
WordPress · Sep 29, 2017 · e7f1223 · e7f1223
2 parents db507cd + 55129ad
commit e7f1223
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/blocks/library/freeform/editor.scss b/blocks/library/freeform/editor.scss
@@ -92,7 +92,7 @@
 	position: sticky;
 
 	@include break-medium() {
-		top: $header-height + $admin-bar-height + $item-spacing;
+		top: $item-spacing;
 	}
 }
 
@@ -146,6 +146,10 @@
 	display: block;
 }
 
+.freeform-toolbar.has-advanced-toolbar {
+	margin-top: -85px;	/* Pull upwards the classic text toolbar when enabled */
+}
+
 .freeform-toolbar div.mce-btn-group {
 	padding: 0;
 	margin: 0;

diff --git a/editor/modes/visual-editor/style.scss b/editor/modes/visual-editor/style.scss
@@ -340,7 +340,7 @@
 	}
 
 	@include break-medium() {
-		top: $header-height + $admin-bar-height + $item-spacing;
+		top: $item-spacing;
 	}
 
 	&.is-appearing-active {