Changeset 42156 for branches/4.9

Timestamp:

11/11/2017 08:43:03 PM (7 years ago)

Author:

westonruter

Message:

Theme Editor: Fix styling of child theme notice.

Props westonruter, melchoyce, ndiego.
See #24048.
Fixes #42491 for 4.9.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/css/common.css (modified) (3 diffs)
• src/wp-admin/theme-editor.php (modified) (1 diff)

branches/4.9/src/wp-admin/css/common.css

@@ -3241 +3241 @@
 }
 
-#templateside li a,
+#templateside li:not(.howto) a,
 .theme-editor-php .highlight {
     display: block;
@@ -3248 +3248 @@
 }
 
-#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;
 }
 
@@ -3776 +3780 @@
     }
 
-    #templateside li a {
+    #templateside li:not(.howto) a {
         display: block;
         padding: 5px;
+    }
+    #templateside li.howto {
+        padding: 12px;
     }
 

branches/4.9/src/wp-admin/theme-editor.php

@@ -230 +230 @@
 <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">