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

Theme Editor: Fix styling of child theme notice. 

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

Built from https://develop.svn.wordpress.org/trunk@42155


git-svn-id: http://core.svn.wordpress.org/trunk@41986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-11-11 20:43:53 +00:00
parent 826c589f11
commit 2aa2c686d4
6 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3240,17 +3240,21 @@ img {
margin: 4px 0;
}
#templateside li a,
#templateside li:not(.howto) a,
.theme-editor-php .highlight {
display: block;
padding: 3px 12px 3px 0;
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 -12px -3px 3px;
}
@ -3775,10 +3779,13 @@ img {
margin: 0;
}
#templateside li a {
#templateside li:not(.howto) a {
display: block;
padding: 5px;
}
#templateside li.howto {
padding: 12px;
}
#templateside .highlight {
padding: 5px;

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

File diff suppressed because one or more lines are too long

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

@ -3240,17 +3240,21 @@ img {
margin: 4px 0;
}
#templateside li a,
#templateside li:not(.howto) a,
.theme-editor-php .highlight {
display: block;
padding: 3px 0 3px 12px;
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,10 +3779,13 @@ img {
margin: 0;
}
#templateside li a {
#templateside li:not(.howto) a {
display: block;
padding: 5px;
}
#templateside li.howto {
padding: 12px;
}
#templateside .highlight {
padding: 5px;

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

File diff suppressed because one or more lines are too long

26
wp-admin/theme-editor.php
View File

@ -229,20 +229,20 @@ if ( $theme->errors() )
?>
<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 ) ); ?>

2
wp-includes/version.php
View File

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