Ticket #28328: 28328.12.patch

src/wp-admin/css/common.css

@@ -2642 +2642 @@
                 -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
         }
 
-        #wpwrap {
-                background: #f0f0f0;
-        }
-
         #wpcontent {
                 position: relative;
                 margin-left: 0;

src/wp-admin/js/editor-expand.js

@@ -285 +285 @@
                         $top.css( {
                                 position: 'fixed',
                                 top: adminBarHeight + toolsHeight,
-                                width: editorWidth - ( visual ? 0 : 38 ),
+                                width: $editor.parent().width() - ( $top.outerWidth() - $top.width() ),
                                 borderTop: '1px solid #e5e5e5'
                         } );
 
@@ -310 +310 @@
                                 $tools.css( {
                                         position: 'absolute',
                                         top: 0,
-                                        borderTop: 'none',
                                         width: $contentWrap.width()
                                 } );
                         // Handle scrolling down.
@@ -319 +318 @@
 
                                 $top.css( {
                                         position: 'absolute',
-                                        top: window.pageYOffset - $editor.offset().top + adminBarHeight + $tools.outerHeight(),
-                                        borderTop: 'none'
+                                        top: editorHeight - buffer,
                                 } );
 
                                 $tools.css( {
                                         position: 'absolute',
-                                        top: window.pageYOffset - $contentWrap.offset().top + adminBarHeight,
-                                        borderTop: 'none',
+                                        top: editorHeight - buffer + 1, // border
                                         width: $contentWrap.width()
                                 } );
                         }

src/wp-includes/css/editor.css

@@ -756 +756 @@
         position: relative;
 }
 
-.wp-editor-tools {
+#wp-content-editor-tools {
         background-color: #f1f1f1;
         padding-top: 20px;
         position: relative;