From 3a9259a4c46221cc564f904e0f058e6837fa6bf1 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <afercia@git.wordpress.org>
Date: Tue, 5 Jan 2016 13:37:56 +0000
Subject: [PATCH] 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@36171 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/about.php                 |  2 +-
 src/wp-admin/credits.php               |  2 +-
 src/wp-admin/css/common.css            | 30 ++++++++++++++++++--------
 src/wp-admin/freedoms.php              |  2 +-
 src/wp-admin/nav-menus.php             |  2 +-
 src/wp-admin/network/site-info.php     |  2 +-
 src/wp-admin/network/site-settings.php |  2 +-
 src/wp-admin/network/site-themes.php   |  2 +-
 src/wp-admin/network/site-users.php    |  2 +-
 9 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
index 04a8556691..eb2b2656dd 100644
--- a/src/wp-admin/about.php
+++ b/src/wp-admin/about.php
@@ -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>
diff --git a/src/wp-admin/credits.php b/src/wp-admin/credits.php
index 9f6e026499..4ce86412db 100644
--- a/src/wp-admin/credits.php
+++ b/src/wp-admin/credits.php
@@ -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>
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 27a053b6cc..f83d3e5830 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -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;
 	}
 }
diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php
index ce9f9e235d..81b02d8785 100644
--- a/src/wp-admin/freedoms.php
+++ b/src/wp-admin/freedoms.php
@@ -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>
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index 6507f0dc56..132bc9b3b6 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -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>
diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
index 634e032379..50f287de20 100644
--- a/src/wp-admin/network/site-info.php
+++ b/src/wp-admin/network/site-info.php
@@ -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'     ),
diff --git a/src/wp-admin/network/site-settings.php b/src/wp-admin/network/site-settings.php
index f03803e1b3..b945ea74a6 100644
--- a/src/wp-admin/network/site-settings.php
+++ b/src/wp-admin/network/site-settings.php
@@ -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'     ),
diff --git a/src/wp-admin/network/site-themes.php b/src/wp-admin/network/site-themes.php
index f2e6f584fa..d48e2ca8d2 100644
--- a/src/wp-admin/network/site-themes.php
+++ b/src/wp-admin/network/site-themes.php
@@ -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'     ),
diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index 54ba6b68f1..77122e82c2 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/wp-admin/network/site-users.php
@@ -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'     ),