<!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>[20445] trunk/wp-admin: CSS improvements for the 'Current Theme' section.</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20445">20445</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-11 21:19:32 +0000 (Wed, 11 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS improvements for the 'Current Theme' section. see <a href="http://core.trac.wordpress.org/ticket/20403">#20403</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (20444 => 20445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-04-11 21:18:40 UTC (rev 20444)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-04-11 21:19:32 UTC (rev 20445)
</span><span class="lines">@@ -4316,35 +4316,57 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #current-theme {
</span><del>- padding: 0 0 .5em;
</del><ins>+ margin: 20px 0 10px;
+ padding: 0 0 20px;
+ border-bottom: 1px solid #dfdfdf;
+ overflow: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#current-theme.has-screenshot {
+ padding-left: 320px;
+}
+
+#current-theme h3 {
+ margin: 0;
+ font-size: 12px;
+ font-weight: normal;
+ color: #999;
+}
+
+#current-theme h4 {
+ margin: 3px 0 16px;
+ font-size: 20px;
+}
+#current-theme h4 span {
+ margin-left: 20px;
+ font-size: 12px;
+ font-weight: normal;
+}
+
</ins><span class="cx"> #current-theme a {
</span><span class="cx"> border-bottom: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #current-theme .theme-description {
</span><span class="cx"> margin-top: 5px;
</span><ins>+ max-width: 600px;
+ line-height: 1.6em;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #current-theme img {
</span><span class="cx"> float: left;
</span><ins>+ width: 300px;
+ margin-left: -320px;
+
</ins><span class="cx"> border-width: 1px;
</span><span class="cx"> border-style: solid;
</span><del>- margin-right: 1em;
- margin-bottom: 1.5em;
- width: 150px;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-options span {
- text-transform: uppercase;
- font-size: 13px;
</del><ins>+.theme-options {
+ font-size: 14px;
+ padding-bottom: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-options a {
- font-size: 15px;
-}
-
</del><span class="cx"> .theme-options .load-customize {
</span><span class="cx"> margin-right: 20px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (20444 => 20445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2012-04-11 21:18:40 UTC (rev 20444)
+++ trunk/wp-admin/themes.php 2012-04-11 21:19:32 UTC (rev 20445)
</span><span class="lines">@@ -95,16 +95,33 @@
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </h2>
</span><del>-<?php $ct = wp_get_theme(); ?>
-<div id="current-theme">
-<h3><?php _e( 'Current Theme' ); ?></h3>
-<?php if ( $screenshot = $ct->get_screenshot() ) : ?>
-<img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
-<?php endif; ?>
-<h4><?php
- /* translators: 1: theme title, 2: theme version, 3: theme author */
- printf( __( '%1$s %2$s by %3$s' ), $ct->display('Name'), $ct->display('Version'), $ct->display('Author') ) ; ?></h4>
-<p class="theme-description"><?php echo $ct->display('Description'); ?></p>
</del><ins>+<?php
+
+$ct = wp_get_theme();
+$screenshot = $ct->get_screenshot();
+$class = $screenshot ? 'has-screenshot' : '';
+
+?>
+<div id="current-theme" class="<?php echo esc_attr( $class ); ?>">
+ <?php if ( $screenshot ) : ?>
+ <img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview' ); ?>" />
+ <?php endif; ?>
+
+ <h3><?php _e('Current Theme'); ?></h3>
+ <h4>
+ <?php echo $ct->display('Name'); ?>
+ </h4>
+
+ <div>
+ <p>
+ <span><?php printf( __('By %s'), $ct->display('Author') ); ?></span>
+ |
+ <span><?php printf( __('Version %s'), $ct->display('Version') ); ?></span>
+ </p>
+ <p class="theme-description"><?php echo $ct->display('Description'); ?></p>
+ <?php theme_update_available( $ct ); ?>
+ </div>
+
</ins><span class="cx"> <div class="theme-options">
</span><span class="cx"> <a href="#" class="load-customize hide-if-no-js" data-customize-template="<?php echo esc_attr( $ct->get_template() ); ?>" data-customize-stylesheet="<?php echo esc_attr( $ct->get_stylesheet() ); ?>" title="<?php echo esc_attr( sprintf( __( 'Customize &#8220;%s&#8221;' ), $ct->get('Name') ) ); ?>"><?php _e( 'Customize' )?></a>
</span><span class="cx"> <span><?php _e( 'Options:' )?></span>
</span><span class="lines">@@ -137,7 +154,6 @@
</span><span class="cx"> }
</span><span class="cx"> echo implode ( ' | ', $options );
</span><span class="cx"> ?></div>
</span><del>-<?php theme_update_available( $ct ); ?>
</del><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>