Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Introduce a new generic CSS clearfix utility class. 

`.wp-clearfix` is now the recommended way to clear and contain floated elements.
Adds back compatibility for the `.nav-tab-wrapper` navigation tabs.

See #26396.
Built from https://develop.svn.wordpress.org/trunk@36171


git-svn-id: http://core.svn.wordpress.org/trunk@36138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2016-01-05 13:38:30 +00:00
parent ecb01fb009
commit 52920b8511
13 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/about.php
View File

@ -42,7 +42,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
<h2 class="nav-tab-wrapper">
<h2 class="nav-tab-wrapper wp-clearfix">
<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>

2
wp-admin/credits.php
View File

@ -24,7 +24,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
<h2 class="nav-tab-wrapper">
<h2 class="nav-tab-wrapper wp-clearfix">
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>

30
wp-admin/css/common-rtl.css
View File

@ -114,6 +114,13 @@
clear: both;
}
/* modern clearfix */
.wp-clearfix:after {
content: "";
display: table;
clear: both;
}
/* Hide visually but not from screen readers */
.screen-reader-text,
.screen-reader-text span,
@ -2060,15 +2067,22 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
h3.nav-tab-wrapper {
border-bottom: 1px solid #ccc;
margin: 0;
padding: 9px 0 0 15px;
padding-top: 9px;
line-height: inherit;
}
/* contain floats */
.nav-tab-wrapper:after {
content: "";
display: table;
clear: both;
/* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */
.nav-tab-wrapper:not(.wp-clearfix):after {
content: "";
display: table;
clear: both;
}
.ie8 .nav-tab-wrapper {
/* contain floats establishing a new block formatting context */
display: inline-block;
width: 100%;
vertical-align: top;
}
/*------------------------------------------------------------------------------
@ -3635,15 +3649,13 @@ img {
h1.nav-tab-wrapper,
.wrap h2.nav-tab-wrapper,
h3.nav-tab-wrapper {
padding-right: 0;
border-bottom: 0;
}
h1 .nav-tab,
h2 .nav-tab,
h3 .nav-tab {
margin-top: 10px;
margin-left: 10px;
margin: 10px 0 0 10px;
border-bottom: 1px solid #ccc;
}
}

30
wp-admin/css/common.css
View File

@ -114,6 +114,13 @@
clear: both;
}
/* modern clearfix */
.wp-clearfix:after {
content: "";
display: table;
clear: both;
}
/* Hide visually but not from screen readers */
.screen-reader-text,
.screen-reader-text span,
@ -2060,15 +2067,22 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
h3.nav-tab-wrapper {
border-bottom: 1px solid #ccc;
margin: 0;
padding: 9px 15px 0 0;
padding-top: 9px;
line-height: inherit;
}
/* contain floats */
.nav-tab-wrapper:after {
content: "";
display: table;
clear: both;
/* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */
.nav-tab-wrapper:not(.wp-clearfix):after {
content: "";
display: table;
clear: both;
}
.ie8 .nav-tab-wrapper {
/* contain floats establishing a new block formatting context */
display: inline-block;
width: 100%;
vertical-align: top;
}
/*------------------------------------------------------------------------------
@ -3635,15 +3649,13 @@ img {
h1.nav-tab-wrapper,
.wrap h2.nav-tab-wrapper,
h3.nav-tab-wrapper {
padding-left: 0;
border-bottom: 0;
}
h1 .nav-tab,
h2 .nav-tab,
h3 .nav-tab {
margin-top: 10px;
margin-right: 10px;
margin: 10px 10px 0 0;
border-bottom: 1px solid #ccc;
}
}

4
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/freedoms.php
View File

@ -23,7 +23,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
<h2 class="nav-tab-wrapper">
<h2 class="nav-tab-wrapper wp-clearfix">
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab nav-tab-active"><?php _e( 'Freedoms' ); ?></a>

2
wp-admin/nav-menus.php
View File

@ -584,7 +584,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
endif;
?>
</h1>
<h2 class="nav-tab-wrapper">
<h2 class="nav-tab-wrapper wp-clearfix">
<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
<?php if ( $num_locations && $menu_count ) : ?>
<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>

2
wp-admin/network/site-info.php
View File

@ -138,7 +138,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h2 class="nav-tab-wrapper nav-tab-small">
<h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
<?php
$tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),

2
wp-admin/network/site-settings.php
View File

@ -95,7 +95,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h2 class="nav-tab-wrapper nav-tab-small">
<h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
<?php
$tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),

2
wp-admin/network/site-themes.php
View File

@ -149,7 +149,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
<div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h2 class="nav-tab-wrapper nav-tab-small">
<h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
<?php
$tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),

2
wp-admin/network/site-users.php
View File

@ -204,7 +204,7 @@ var current_site_id = <?php echo $id; ?>;
<div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h2 class="nav-tab-wrapper nav-tab-small">
<h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
<?php
$tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36168';
$wp_version = '4.5-alpha-36171';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.