diff --git src/wp-admin/css/common.css src/wp-admin/css/common.css index 6a1e9d7..6bd5482 100644 --- src/wp-admin/css/common.css +++ src/wp-admin/css/common.css @@ -562,6 +562,18 @@ code { color: #00a0d2; } +.wrap > header { + display: block; + padding: 9px 0 4px 0; + position: relative; +} + +.wrap > header:after { + content: ''; + display: table; + clear: both; +} + .wrap h2, .subtitle { font-weight: normal; @@ -572,7 +584,12 @@ code { font-size: 23px; font-weight: 400; padding: 9px 15px 4px 0; - line-height: 29px; + line-height: 1.261; +} + +.wrap > header h2 { + float: left; + padding: 0 6px 0 0; } .subtitle { @@ -597,6 +614,14 @@ code { font-size: 13px; } +.wrap > header .add-new-h2, +.wrap > header .add-new-h2:active { + display: block; + float: left; + margin: 0 4px; + top: 2px; +} + .wrap .add-new-h2:hover { background: #00a0d2; color: #fff; @@ -971,6 +996,14 @@ th.action-links { margin-right: 20px; } +header .title-count { + display: block; + float: left; + padding: 5px 10px; + padding: 4px 10px 6px 10px\9; /* Target IE */ + top: 1px; +} + .filter-items { float: left; } @@ -3105,11 +3138,20 @@ img { display: none !important; } + .wrap > header { + padding: 10px 0 0 0; + } + .wrap .add-new-h2, .wrap .add-new-h2:active { padding: 10px 15px; font-size: 14px; } + .wrap > header .add-new-h2, .wrap > header .add-new-h2:active { + padding: 11px 15px 10px 15px; + top: -4px; + } + .wp-color-result { height: auto; padding-left: 45px; diff --git src/wp-admin/css/themes.css src/wp-admin/css/themes.css index c2cab3f..00b9b76 100644 --- src/wp-admin/css/themes.css +++ src/wp-admin/css/themes.css @@ -37,6 +37,11 @@ line-height: 1.5; } +.themes-php header .wp-filter-search { + float: left; + top: -1px; +} + /* Position admin messages */ .themes-php div.updated, .themes-php div.error, @@ -983,6 +988,31 @@ body.folded .theme-overlay .theme-wrap { } } +@media screen and ( max-width: 782px ) { + body.themes-php .wrap > header { + padding-bottom: 4px; + } + + .themes-php .wrap > header h2 { + margin-bottom: 15px; + } + + .themes-php .wrap > header .add-new-h2, .themes-php .wrap > header .add-new-h2:active { + margin-bottom: 9px; + } + + body.theme-install-php .wrap > header .add-new-h2, body.theme-install-php .wrap > header .add-new-h2:active { + top: -4px; + } + + .themes-php header .wp-filter-search { + clear: both; + display: inline; + float: none; + top: -3px; + } +} + @media only screen and (max-width: 650px) { .theme-overlay .theme-update, .theme-overlay .theme-description { @@ -1021,6 +1051,10 @@ body.folded .theme-overlay .theme-wrap { width: 100%; } + .themes-php .wrap > header h2 { + width: auto; + } + .themes-php .wp-filter-search { float: none; clear: both; @@ -1032,6 +1066,11 @@ body.folded .theme-overlay .theme-wrap { max-width: 280px; } + .themes-php header .wp-filter-search { + display: inline; + margin: 0 0 8px 0; + } + .theme-browser .theme.add-new-theme span:after { font: normal 60px/90px 'dashicons'; width: 80px; @@ -1156,6 +1195,11 @@ body.show-upload-theme p.no-themes { display: none !important; } +.theme-install-php .wrap > header .add-new-h2, +.theme-install-php .wrap > header .add-new-h2:active { + top: 2px; +} + @media only screen and (max-width: 1120px) { .upload-theme .wp-upload-form { margin: 20px 0; diff --git src/wp-admin/edit-comments.php src/wp-admin/edit-comments.php index 29717d8..88b8a17 100644 --- src/wp-admin/edit-comments.php +++ src/wp-admin/edit-comments.php @@ -140,20 +140,12 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

%s', - get_edit_post_link( $post_id ), - wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) - ) - ); -else - echo __('Comments'); - -if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) - echo '' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . ''; ?> -

+
+

%s', get_edit_post_link( $post_id ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) ) ); + else echo __( 'Comments' );?>

+ ' . 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 ) . ''; -?>

- -

- - -

- - +
+

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

+ + +
+

+
+ + +
+
-

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() ); -?>

+
+

labels->name );?>

+ cap->create_posts ) ) + echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + if ( ! empty( $_REQUEST['s'] ) ) + printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); + ?> +
header' ); + if ( $firstHeading.length === 0 ) { + $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 ); diff --git src/wp-admin/js/theme.js src/wp-admin/js/theme.js index fbd3789..f6cd873 100644 --- src/wp-admin/js/theme.js +++ src/wp-admin/js/theme.js @@ -85,7 +85,7 @@ themes.view.Appearance = wp.Backbone.View.extend({ }, // Defines search element container - searchContainer: $( '#wpbody h2:first' ), + searchContainer: $( '#wpbody .wrap > header' ), // Search input and view // for current theme collection diff --git src/wp-admin/plugin-install.php src/wp-admin/plugin-install.php index 653113a..3d9d9fe 100644 --- src/wp-admin/plugin-install.php +++ src/wp-admin/plugin-install.php @@ -94,21 +94,19 @@ get_current_screen()->set_help_sidebar( include(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

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

+
+

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

- +
+

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

-

__( 'Upload Theme' ) ) ); - if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { - echo ' ' . __( 'Upload Theme' ) . ''; - echo ' ' . _x( 'Browse', 'themes' ) . ''; - } - ?>

+
+

+ __( 'Upload Theme' ) ) ); + if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { + echo ' ' . __( 'Upload Theme' ) . ''; + echo ' ' . _x( 'Browse', 'themes' ) . ''; + } ?> +
diff --git src/wp-admin/themes.php src/wp-admin/themes.php index 52e3531..3c3bde0 100644 --- src/wp-admin/themes.php +++ src/wp-admin/themes.php @@ -121,12 +121,13 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

+
+

- - - -

+ + + +

diff --git src/wp-admin/upload.php src/wp-admin/upload.php index c62c219..dc4df21 100644 --- src/wp-admin/upload.php +++ src/wp-admin/upload.php @@ -71,14 +71,13 @@ if ( 'grid' === $mode ) { require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

- - -

+
+

+

+ + + +

Switch to the list view.' ); ?>

diff --git src/wp-admin/users.php src/wp-admin/users.php index 39d3ae4..0226f28 100644 --- src/wp-admin/users.php +++ src/wp-admin/users.php @@ -428,18 +428,18 @@ if ( ! empty($messages) ) { } ?>
-

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

+
+

+ + + + + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> +
+ views(); ?> diff --git src/wp-admin/widgets.php src/wp-admin/widgets.php index 42ebc1b..5d7c731 100644 --- src/wp-admin/widgets.php +++ src/wp-admin/widgets.php @@ -310,24 +310,24 @@ $errors = array( require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-%2$s', - esc_url( add_query_arg( - array( - array( 'autofocus' => array( 'panel' => 'widgets' ) ), - 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) - ), - admin_url( 'customize.php' ) - ) ), - __( 'Manage in Customizer' ) - ); - } -?> -

+
+

+ %2$s', + esc_url( add_query_arg( + array( + array( 'autofocus' => array( 'panel' => 'widgets' ) ), + 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) + ), + admin_url( 'customize.php' ) + ) ), + __( 'Manage in Customizer' ) + ); + } + ?> +