Ticket #33557: 33557.2.diff

src/wp-admin/css/common.css

@@ -2028 +2028 @@
         margin-right: 190px;
 }
 
-.metabox-holder h3 {
+.metabox-holder h3.hndle, /* Back-compat for pre-4.4 */
+.metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */
+.metabox-holder h2 {
         font-size: 14px;
         padding: 8px 12px;
         margin: 0;
@@ -2035 +2037 @@
         line-height: 1.4;
 }
 
+/* Back-compat for nav-menus screen */
+.nav-menus-php .metabox-holder h3 {
+        padding: 10px 10px 11px 14px;
+        line-height: 21px;
+}
+
 #templateside ul li a {
         text-decoration: none;
 }
@@ -3400 +3408 @@
                 font-size: 14px;
         }
 
-        .metabox-holder h3 {
+        .metabox-holder h3.hndle, /* Back-compat for pre-4.4 */
+        .metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */
+        .metabox-holder h2 {
                 padding: 12px;
         }
 

src/wp-admin/css/dashboard.css

@@ -947 +947 @@
         box-shadow: none;
 }
 
-#dashboard_browser_nag.postbox.browser-insecure h3 {
+#dashboard_browser_nag.postbox.browser-insecure h2 {
         border-bottom-color: #cd5a5a;
         color: #fff;
 }
 
-#dashboard_browser_nag.postbox h3 {
+#dashboard_browser_nag.postbox h2 {
         border-bottom-color: #f6e2ac;
         background: transparent none;
         color: #fff;
@@ -966 +966 @@
 
 /* Make the browser nags easier to read with Open Sans */
 
-#dashboard_browser_nag h3.hndle {
+#dashboard_browser_nag h2.hndle {
         border: none;
         font-weight: 600;
         font-size: 20px;

src/wp-admin/css/edit.css

@@ -239 +239 @@
         margin: 8px 0 5px;
 }
 
+/* Back-compat for pre-4.4 */
 #category-adder h4 {
+    margin: 0;
+}
+
+.taxonomy-add-new {
+        display: inline-block;
         margin: 10px 0;
+        font-weight: 600;
 }
 
 #side-sortables .add-menu-item-tabs,
@@ -627 +634 @@
         position: absolute;
 }
 
+#poststuff h3.hndle, /* Back-compat for pre-4.4 */
+#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
 #poststuff h2 {
-        margin-top: 20px;
-        font-size: 1.5em;
-        margin-bottom: 15px;
-        padding: 0 0 3px;
-        clear: left;
-}
-
-#poststuff h3 {
         font-size: 14px;
         padding: 8px 12px;
         margin: 0;
@@ -1358 +1359 @@
                 padding: 10px 10px;
         }
 
-        #poststuff h3 {
+        #poststuff h3.hndle, /* Back-compat for pre-4.4 */
+        #poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
+        #poststuff h2 {
                 padding: 12px;
         }
 

src/wp-admin/includes/meta-boxes.php

@@ -497 +497 @@
                 </div>
         <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
                         <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
-                                <h4>
-                                        <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
-                                                <?php
-                                                        /* translators: %s: add new taxonomy label */
-                                                        printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
-                                                ?>
-                                        </a>
-                                </h4>
+                                <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js taxonomy-add-new">
+                                        <?php
+                                                /* translators: %s: add new taxonomy label */
+                                                printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+                                        ?>
+                                </a>
                                 <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
                                         <label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
                                         <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
@@ -933 +931 @@
         </div>
 
         <div id="category-adder" class="wp-hidden-children">
-                <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+                <a id="category-add-toggle" href="#category-add" class="taxonomy-add-new"><?php _e( '+ Add New Category' ); ?></a>
                 <p id="link-category-add" class="wp-hidden-child">
                         <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
                         <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />

src/wp-admin/includes/template-functions.php

@@ -994 +994 @@
                                                 echo '<span class="toggle-indicator" aria-hidden="true"></span>';
                                                 echo '</button>';
                                         }
-                                        echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
+                                        echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
                                         echo '<div class="inside">' . "\n";
                                         call_user_func($box['callback'], $object, $box);
                                         echo "</div>\n";