Remove unused layout stylesheet

Also adjust the bottom block offset at which the toolbar unsticks.
WordPress · May 9, 2017 · e9ea947 · e9ea947
1 parent 8751c59
commit e9ea947
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/editor/layout/index.js b/editor/layout/index.js
@@ -7,11 +7,10 @@ import classnames from 'classnames';
 /**
  * Internal dependencies
  */
-import './style.scss';
-import Header from '../header';
-import Sidebar from '../sidebar';
-import TextEditor from '../modes/text-editor';
-import VisualEditor from '../modes/visual-editor';
+import Header from 'header';
+import Sidebar from 'sidebar';
+import TextEditor from 'modes/text-editor';
+import VisualEditor from 'modes/visual-editor';
 
 function Layout( { mode, isSidebarOpened } ) {
 	const className = classnames( 'editor-layout', {

diff --git a/editor/layout/style.scss b/editor/layout/style.scss
diff --git a/editor/modes/visual-editor/style.scss b/editor/modes/visual-editor/style.scss
@@ -76,8 +76,8 @@
 	display: flex;
 	position: sticky;
 	z-index: 1;
-	margin-top: -46px - $item-spacing;	// 46 is toolbar height
-	margin-bottom: $item-spacing + 100px;
+	margin-top: -46px - $item-spacing;		// 46 is toolbar height
+	margin-bottom: $item-spacing + 50px;	// 50px is the offset from the bottom of the selected block where it stops sticking
 
 	top: $header-height + $admin-bar-height-big + $item-spacing;
 
@@ -87,7 +87,7 @@
 }
 
 .editor-visual-editor__block-controls + div {
-	margin-top: -100px;
+	margin-top: -50px;
 
 	// prevent collapsing margins between the block and the toolbar
 	&:before {