Index: wp-admin/comment.php =================================================================== --- wp-admin/comment.php (revision 32755) +++ wp-admin/comment.php (working copy) @@ -117,7 +117,7 @@ ?>
-

+

h1, h2 { color: #23282d; font-size: 1.5em; margin: .83em 0; @@ -564,6 +564,11 @@ color: #00a0d2; } +.wrap header { + margin-bottom: 15px; +} + +.wrap h1, .wrap h2, .subtitle { font-weight: normal; @@ -570,7 +575,9 @@ margin: 0; } +.wrap h1, .wrap h2 { + display: inline-block; font-size: 23px; font-weight: 400; padding: 9px 15px 4px 0; @@ -583,7 +590,9 @@ padding-left: 25px; } +.wrap .add-new-h1, .wrap .add-new-h2, +.wrap .add-new-h1:active, .wrap .add-new-h2:active { margin-left: 4px; padding: 4px 8px; @@ -599,11 +608,13 @@ font-size: 13px; } +.wrap .add-new-h1:hover, .wrap .add-new-h2:hover { background: #00a0d2; color: #fff; } +.wrap h1.long-header, .wrap h2.long-header { padding-right: 0; } Index: wp-admin/custom-background.php =================================================================== --- wp-admin/custom-background.php (revision 32755) +++ wp-admin/custom-background.php (working copy) @@ -176,7 +176,7 @@ public function admin_page() { ?>
-

+

Index: wp-admin/custom-header.php =================================================================== --- wp-admin/custom-header.php (revision 32755) +++ wp-admin/custom-header.php (working copy) @@ -446,7 +446,7 @@ ?>
-

+

@@ -754,7 +754,7 @@ ?>
-

+

Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 32755) +++ wp-admin/edit-comments.php (working copy) @@ -140,7 +140,7 @@ ?>
-

%s', @@ -153,7 +153,7 @@ if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) echo '' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . ''; ?> -

+
-

cap->create_posts ) ) echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -?>

+?>

Index: wp-admin/edit-form-comment.php =================================================================== --- wp-admin/edit-form-comment.php (revision 32755) +++ wp-admin/edit-form-comment.php (working copy) @@ -13,7 +13,7 @@ comment_ID) ?>
-

+

Index: wp-admin/edit-link-form.php =================================================================== --- wp-admin/edit-link-form.php (revision 32755) +++ wp-admin/edit-link-form.php (working copy) @@ -70,7 +70,7 @@ ?>
-

+

Index: wp-admin/edit-tag-form.php =================================================================== --- wp-admin/edit-tag-form.php (revision 32755) +++ wp-admin/edit-tag-form.php (working copy) @@ -62,7 +62,7 @@ do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
-

labels->edit_item; ?>

+

labels->edit_item; ?>

-

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> -

+

Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 32755) +++ wp-admin/edit.php (working copy) @@ -283,13 +283,13 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

labels->name ); if ( current_user_can( $post_type_object->cap->create_posts ) ) echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; if ( ! empty( $_REQUEST['s'] ) ) printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); -?>

+?>
-

+

Index: wp-admin/import.php =================================================================== --- wp-admin/import.php (revision 32755) +++ wp-admin/import.php (working copy) @@ -52,7 +52,7 @@ ?>
-

+

%s importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?>

Index: wp-admin/index.php =================================================================== --- wp-admin/index.php (revision 32755) +++ wp-admin/index.php (working copy) @@ -93,7 +93,7 @@ ?>
-

+

h1' ); + if ( $firstH1.length == 1 ) { + $firstHeading = $( 'div.wrap h1:first' ); + } else { + $firstHeading = $( 'div.wrap h2:first' ); + } $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' ); $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading ); Index: wp-admin/js/theme.js =================================================================== --- wp-admin/js/theme.js (revision 32755) +++ wp-admin/js/theme.js (working copy) @@ -84,7 +84,7 @@ }, // Defines search element container - searchContainer: $( '#wpbody h2:first' ), + searchContainer: $( '#wpbody header' ), // Search input and view // for current theme collection Index: wp-admin/link-manager.php =================================================================== --- wp-admin/link-manager.php (revision 32755) +++ wp-admin/link-manager.php (working copy) @@ -69,10 +69,10 @@ ?>
-

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> -

+
-

+

Index: wp-admin/media.php =================================================================== --- wp-admin/media.php (revision 32755) +++ wp-admin/media.php (working copy) @@ -103,13 +103,13 @@ ?>
-

+

-

+

Index: wp-admin/ms-delete-site.php =================================================================== --- wp-admin/ms-delete-site.php (revision 32755) +++ wp-admin/ms-delete-site.php (working copy) @@ -32,7 +32,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); echo '

'; -echo '

' . esc_html( $title ) . '

'; +echo '

' . esc_html( $title ) . '

'; if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) { check_admin_referer( 'delete-blog' ); Index: wp-admin/my-sites.php =================================================================== --- wp-admin/my-sites.php (revision 32755) +++ wp-admin/my-sites.php (working copy) @@ -56,7 +56,7 @@
-

+

'; Index: wp-admin/nav-menus.php =================================================================== --- wp-admin/nav-menus.php (revision 32755) +++ wp-admin/nav-menus.php (working copy) @@ -558,12 +558,12 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

+

-

+
-

+

-

+

Index: wp-admin/options-media.php =================================================================== --- wp-admin/options-media.php (revision 32755) +++ wp-admin/options-media.php (working copy) @@ -40,7 +40,7 @@ ?>
-

+

Index: wp-admin/options-permalink.php =================================================================== --- wp-admin/options-permalink.php (revision 32755) +++ wp-admin/options-permalink.php (working copy) @@ -175,7 +175,7 @@
-

+

Index: wp-admin/options-reading.php =================================================================== --- wp-admin/options-reading.php (revision 32755) +++ wp-admin/options-reading.php (working copy) @@ -74,7 +74,7 @@ ?>
-

+

-

+

Index: wp-admin/options.php =================================================================== --- wp-admin/options.php (revision 32755) +++ wp-admin/options.php (working copy) @@ -226,7 +226,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

+

Index: wp-admin/plugin-editor.php =================================================================== --- wp-admin/plugin-editor.php (revision 32755) +++ wp-admin/plugin-editor.php (working copy) @@ -28,7 +28,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

+

-

+

Index: wp-admin/plugin-install.php =================================================================== --- wp-admin/plugin-install.php (revision 32755) +++ wp-admin/plugin-install.php (working copy) @@ -94,7 +94,7 @@ include(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

+

' . $text . ''; } ?> -

+ '; - echo '

' . esc_html( $title ) . '

'; + echo '

' . esc_html( $title ) . '

'; $url = self_admin_url('update.php?action=update-selected&plugins=' . urlencode( join(',', $plugins) )); $url = wp_nonce_url($url, 'bulk-update-plugins'); @@ -288,13 +288,13 @@ $plugins_to_delete = count( $plugin_info ); ?> -

+

-

+

@@ -446,13 +446,13 @@
-

' . __('Search results for “%s”') . '', esc_html( $s ) ); ?> -

+ ' . _draft_or_post_title() . ''; - $h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); + $h1 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); $return_to_post = '' . __( '← Return to post editor' ) . ''; $title = __( 'Revisions' ); @@ -126,7 +126,7 @@ ?>
-

+

(' . $file_show . ')'; ?>
-

+
+

+
+
+

display('Name'); if ( $description ) echo ': ' . $description; ?>

+
+
+ + + + $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : ''; + echo "\n\t" . ''; + } + ?> + + + +
+
+
+
null ) ) as $a_stylesheet => $a_theme ) { - if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) - continue; - - $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : ''; - echo "\n\t" . ''; -} -?> - - - -
-
-
-errors() ) echo '

' . __( 'This theme is broken.' ) . ' ' . $theme->errors()->get_error_message() . '

'; ?> Index: wp-admin/theme-install.php =================================================================== --- wp-admin/theme-install.php (revision 32755) +++ wp-admin/theme-install.php (working copy) @@ -102,73 +102,74 @@ ?>
-

+

+ __( 'Upload Theme' ) ) ); + if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { + echo ' ' . __( 'Upload Theme' ) . ''; + echo ' ' . _x( 'Browse', 'themes' ) . ''; + } + ?> - /** - * Filter the tabs shown on the Add Themes screen. - * - * This filter is for backwards compatibility only, for the suppression - * of the upload tab. - * - * @since 2.8.0 - * - * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'. - */ - $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) ); - if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { - echo ' ' . __( 'Upload Theme' ) . ''; - echo ' ' . _x( 'Browse', 'themes' ) . ''; - } - ?> +
+ +
-
- -
+
+
+ +
-
-
- -
+
    +
    • +
    • +
    • +
-
    -
    • -
    • -
    • -
+ - +
-
- -
-
- - +
+
+ + +
+ $features ) { + echo '
'; + $feature_name = esc_html( $feature_name ); + echo '

' . $feature_name . '

'; + echo '
    '; + foreach ( $features as $feature => $feature_name ) { + $feature = esc_attr( $feature ); + echo '
  1. '; + echo '
    2. '; + } + echo '
'; + echo '
'; + } + ?> +
+ +
+ +
- $features ) { - echo '
'; - $feature_name = esc_html( $feature_name ); - echo '

' . $feature_name . '

'; - echo '
    '; - foreach ( $features as $feature => $feature_name ) { - $feature = esc_attr( $feature ); - echo '
  1. '; - echo '
    2. '; - } - echo '
'; - echo '
'; - } - ?> -
- -
- -
-
+
Index: wp-admin/themes.php =================================================================== --- wp-admin/themes.php (revision 32755) +++ wp-admin/themes.php (working copy) @@ -124,83 +124,83 @@ ?>
-

- - - - -

- -

- -

Visit site' ), home_url( '/' ) ); ?>

- -

Visit site' ), home_url( '/' ) ); ?>

-

- -

- +

+ + + + + +

+ +

Visit site' ), home_url( '/' ) ); ?>

+ +

Visit site' ), home_url( '/' ) ); ?>

+

+ +

+ errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { - echo '

' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '

'; -} + if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { + echo '

' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '

'; + } -/* -// Certain error codes are less fatal than others. We can still display theme information in most cases. -if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) - && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?> -*/ + /* + // Certain error codes are less fatal than others. We can still display theme information in most cases. + if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) + && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?> + */ - // Pretend you didn't see this. - $current_theme_actions = array(); - if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) { - foreach ( (array) $submenu['themes.php'] as $item) { - $class = ''; - if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) - continue; - // 0 = name, 1 = capability, 2 = file - if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) - $class = ' current'; - if ( !empty($submenu[$item[2]]) ) { - $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. - $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); - if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) - $current_theme_actions[] = "{$item[0]}"; - else - $current_theme_actions[] = "{$item[0]}"; - } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { - $menu_file = $item[2]; + // Pretend you didn't see this. + $current_theme_actions = array(); + if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) { + foreach ( (array) $submenu['themes.php'] as $item) { + $class = ''; + if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) + continue; + // 0 = name, 1 = capability, 2 = file + if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) + $class = ' current'; + if ( !empty($submenu[$item[2]]) ) { + $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. + $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); + if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) + $current_theme_actions[] = "{$item[0]}"; + else + $current_theme_actions[] = "{$item[0]}"; + } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { + $menu_file = $item[2]; - if ( current_user_can( 'customize' ) ) { - if ( 'custom-header' === $menu_file ) { - $current_theme_actions[] = "{$item[0]}"; - } elseif ( 'custom-background' === $menu_file ) { - $current_theme_actions[] = "{$item[0]}"; + if ( current_user_can( 'customize' ) ) { + if ( 'custom-header' === $menu_file ) { + $current_theme_actions[] = "{$item[0]}"; + } elseif ( 'custom-background' === $menu_file ) { + $current_theme_actions[] = "{$item[0]}"; + } } - } - if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) { - $menu_file = substr( $menu_file, 0, $pos ); - } + if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) { + $menu_file = substr( $menu_file, 0, $pos ); + } - if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) { - $current_theme_actions[] = "{$item[0]}"; - } else { - $current_theme_actions[] = "{$item[0]}"; + if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) { + $current_theme_actions[] = "{$item[0]}"; + } else { + $current_theme_actions[] = "{$item[0]}"; + } } } } - } -?> - + ?> +
Index: wp-admin/tools.php =================================================================== --- wp-admin/tools.php (revision 32755) +++ wp-admin/tools.php (working copy) @@ -33,7 +33,7 @@ ?>
-

+

Index: wp-admin/update-core.php =================================================================== --- wp-admin/update-core.php (revision 32755) +++ wp-admin/update-core.php (working copy) @@ -415,7 +415,7 @@ ?>
-

+

-

+

'; @@ -624,7 +624,7 @@ require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '

'; - echo '

' . esc_html__('Update Plugins') . '

'; + echo '

' . esc_html__('Update Plugins') . '

'; echo ''; echo '
'; include(ABSPATH . 'wp-admin/admin-footer.php'); @@ -653,7 +653,7 @@ require_once(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

+

-

+

@@ -78,7 +78,7 @@ -

+

Switch to the list view.' ); ?>

@@ -206,7 +206,7 @@ ?>
-

+

@@ -214,7 +214,7 @@ } if ( ! empty( $_REQUEST['s'] ) ) printf( '' . __('Search results for “%s”') . '', get_search_query() ); ?> -

+
-

+

-

+
-

-

+
Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 32755) +++ wp-admin/users.php (working copy) @@ -214,7 +214,7 @@
-

+

@@ -336,7 +336,7 @@
-

+

    -

    +

    @@ -454,7 +454,7 @@ if ( $usersearch ) printf( '' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> -

    + views(); ?> Index: wp-admin/widgets.php =================================================================== --- wp-admin/widgets.php (revision 32755) +++ wp-admin/widgets.php (working copy) @@ -235,7 +235,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
    -

    +

    >

    @@ -315,7 +315,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
    -

    +

    -

    +