<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56639] trunk/src: Administration: Improve control proximity in theme details modal.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56639">56639</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56639","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-09-20 21:01:02 +0000 (Wed, 20 Sep 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Administration: Improve control proximity in theme details modal.
Make the theme details modals in the Customizer and at Appearance > Themes consistent. Change the order of controls so both modals are in the same sequence, center all controls in both desktop and mobile views, and change delete link color to meet color contrast requirements.
Props trishasalas, afercia, melchoyce, karmatosed, cathibosco1, michaelarestad, joedolson, petitphp, mikinc860.
Fixes <a href="https://core.trac.wordpress.org/ticket/59372">#59372</a>. See <a href="https://core.trac.wordpress.org/ticket/59371">#59371</a>, <a href="https://core.trac.wordpress.org/ticket/40822">#40822</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpincludescssbuttonscss">trunk/src/wp-includes/css/buttons.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2023-09-20 20:49:12 UTC (rev 56638)
+++ trunk/src/wp-admin/css/customize-controls.css 2023-09-20 21:01:02 UTC (rev 56639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2317,7 +2317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-customizer .theme-overlay .theme-actions {
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: right; /* Because there're only one or two actions, match the UI pattern of media modals and right-align the action. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 10px 25px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 10px 25px 5px;
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #f0f0f1;
</span><span class="cx" style="display: block; padding: 0 10px"> border-top: 1px solid #dcdcde;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2326,13 +2326,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.control-panel-themes .theme-actions .delete-theme {
- left: 15px; /* these override themes.css on mobile */
- right: auto;
- bottom: auto;
- position: absolute;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .modal-open .in-themes-panel #customize-controls .wp-full-overlay-sidebar-content {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: visible; /* Prevent the top-level Customizer controls from becoming visible when elements on the right of the details modal are focused. */
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/themes.css 2023-09-20 20:49:12 UTC (rev 56638)
+++ trunk/src/wp-admin/css/themes.css 2023-09-20 21:01:02 UTC (rev 56639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,10 +506,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 30;
</span><span class="cx" style="display: block; padding: 0 10px"> box-sizing: border-box;
</span><span class="cx" style="display: block; padding: 0 10px"> border-top: 1px solid #f0f0f1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: flex;
+ justify-content: center;
+ gap: 5px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.theme-overlay .theme-actions a {
- margin-right: 5px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.theme-overlay .theme-actions .button {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 5px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .broken-themes a.delete-theme,
</span><span class="cx" style="display: block; padding: 0 10px"> .theme-overlay .theme-actions .delete-theme {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #d63638;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #b32d2e;
</ins><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: transparent;
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,19 +530,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.theme-overlay .theme-actions .delete-theme {
- position: absolute;
- right: 10px;
- bottom: 5px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .broken-themes a.delete-theme:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .broken-themes a.delete-theme:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .theme-overlay .theme-actions .delete-theme:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .theme-overlay .theme-actions .delete-theme:focus {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background: #d63638;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background: #b32d2e;
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-color: #d63638;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border-color: #b32d2e;
+ box-shadow: 0 0 0 1px #b32d2e;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .theme-overlay .theme-actions .active-theme,
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2023-09-20 20:49:12 UTC (rev 56638)
+++ trunk/src/wp-admin/includes/theme.php 2023-09-20 21:01:02 UTC (rev 56639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1058,12 +1058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.active ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( 'installed' === data.type ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( current_user_can( 'delete_themes' ) ) { ?>
- <# if ( data.actions && data.actions['delete'] ) { #>
- <a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
- <# } #>
- <?php } ?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="theme-inactive-actions">
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.blockTheme ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,6 +1074,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button class="button button-primary disabled"><?php _e( 'Live Preview' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
+ <?php if ( current_user_can( 'delete_themes' ) ) { ?>
+ <# if ( data.actions && data.actions['delete'] ) { #>
+ <a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
+ <# } #>
+ <?php } ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.compatibleWP && data.compatiblePHP ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2023-09-20 20:49:12 UTC (rev 56638)
+++ trunk/src/wp-admin/themes.php 2023-09-20 21:01:02 UTC (rev 56639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1221,23 +1221,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( ! data.blockTheme ) { #>
+ <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.actions.activate ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( ! data.blockTheme ) { #>
- <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
- <# } #>
</del><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( ! data.blockTheme ) { #>
+ <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.actions.activate ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( ! data.blockTheme ) { #>
- <a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a>
- <# } #>
</del><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescssbuttonscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/buttons.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/buttons.css 2023-09-20 20:49:12 UTC (rev 56638)
+++ trunk/src/wp-includes/css/buttons.css 2023-09-20 21:01:02 UTC (rev 56639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,6 +385,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .wp-customizer .theme-overlay .theme-actions .button {
+ margin-bottom: 5px;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .media-modal-content .media-toolbar-primary .media-button {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 5px;
</span></span></pre>
</div>
</div>
</body>
</html>