Ticket #42491: 42491.2.diff

src/wp-admin/css/common.css

@@ -3240 +3240 @@
         margin: 4px 0;
 }
 
-#templateside li a,
+#templateside li:not(.howto) a,
 .theme-editor-php .highlight {
         display: block;
         padding: 3px 0 3px 12px;
@@ -3247 +3247 @@
         text-decoration: none;
 }
 
-#templateside li > a:first-of-type {
+#templateside li:not(.howto) > a:first-of-type {
         padding-top: 0;
 }
 
+#templateside li.howto {
+        padding: 6px 12px 12px 12px;
+}
+
 .theme-editor-php .highlight {
         margin: -3px 3px -3px -12px;
 }
@@ -3775 +3779 @@
                 margin: 0;
         }
 
-        #templateside li a {
+        #templateside li:not(.howto) a {
                 display: block;
                 padding: 5px;
         }
+        #templateside li.howto {
+                padding: 12px;
+        }
 
         #templateside .highlight {
                 padding: 5px;

src/wp-admin/theme-editor.php

@@ -229 +229 @@
 ?>
 <div id="templateside">
         <h2 id="theme-files-label"><?php _e( 'Theme Files' ); ?></h2>
-        <?php
-        if ( $has_templates || $theme->parent() ) :
-                if ( $theme->parent() ) {
-                        /* translators: %s: link to edit parent theme */
-                        echo '<p class="howto">' . sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
-                                sprintf( '<a href="%s">%s</a>',
-                                        self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
-                                        $theme->parent()->display( 'Name' )
-                                )
-                        ) . "</p>\n";
-                }
-        endif;
-        ?>
         <ul role="tree" aria-labelledby="theme-files-label">
+                <?php if ( ( $has_templates || $theme->parent() ) && $theme->parent() ) : ?>
+                        <li class="howto">
+                                <?php
+                                /* translators: %s: link to edit parent theme */
+                                echo sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
+                                        sprintf( '<a href="%s">%s</a>',
+                                                self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
+                                                $theme->parent()->display( 'Name' )
+                                        )
+                                );
+                                ?>
+                        </li>
+                <?php endif; ?>
                 <li role="treeitem" tabindex="-1" aria-expanded="true" aria-level="1" aria-posinset="1" aria-setsize="1">
                         <ul role="group">
                                 <?php wp_print_theme_file_tree( wp_make_theme_file_tree( $allowed_files ) ); ?>