Index: /trunk/src/wp-admin/css/common.css =================================================================== --- /trunk/src/wp-admin/css/common.css (revision 34990) +++ /trunk/src/wp-admin/css/common.css (revision 34991) @@ -1571,8 +1571,15 @@ } -#screen-options-wrap h5, +#screen-options-wrap h5, /* Back-compat for old plugins */ +#screen-options-wrap legend, #contextual-help-wrap h5 { - margin: 8px 0; - font-size: 13px; + margin: 0; + padding: 8px 0; + font-size: 13px; + font-weight: 600; +} + +.ie8 #screen-options-wrap legend { + color: inherit; } @@ -1583,23 +1590,26 @@ } +#number-of-columns { + display: inline-block; + vertical-align: middle; + line-height: 30px; +} + +.metabox-prefs input[type=checkbox] { + margin-top: 0; + margin-right: 6px; +} + +.metabox-prefs label input, .metabox-prefs label input[type=checkbox] { - margin-top: -4px; - margin-right: 6px; -} - -.metabox-prefs label input { - margin: 0 5px 0 2px; + margin: -4px 5px 0 0; } .metabox-prefs .columns-prefs label input { - margin: 0 2px; + margin: -1px 2px 0 0; } .metabox-prefs label a { display: none; -} - -.metabox-prefs .screen-options { - padding-top: 10px; } @@ -1618,4 +1628,8 @@ line-height: 28px; padding-right: 0; +} + +.screen-options + .screen-options { + margin-top: 10px; } @@ -1901,5 +1915,5 @@ .columns-prefs label { - padding: 0 5px; + padding: 0 10px 0 0; } Index: /trunk/src/wp-admin/css/customize-nav-menus.css =================================================================== --- /trunk/src/wp-admin/css/customize-nav-menus.css (revision 34990) +++ /trunk/src/wp-admin/css/customize-nav-menus.css (revision 34991) @@ -350,5 +350,5 @@ background: #fff; border-top: 1px solid #ddd; - padding: 4px 15px 0; + padding: 4px 15px 15px; } Index: /trunk/src/wp-admin/includes/class-wp-screen.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-screen.php (revision 34990) +++ /trunk/src/wp-admin/includes/class-wp-screen.php (revision 34991) @@ -919,7 +919,7 @@ break; case 'post' : - $expand = '
'; + $expand .= __( 'Enable full-height editor and distraction-free functionality.' ) . ''; $this->_screen_settings = $expand; break; @@ -970,83 +970,110 @@ public function render_screen_options( $options = array() ) { global $wp_meta_boxes; + $options = wp_parse_args( $options, array( 'wrap' => true, ) ); - $columns = get_column_headers( $this ); - $hidden = get_hidden_columns( $this ); - - ?> - -