<!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>[26681] trunk/src/wp-admin: Themes: Refine how we display the current theme.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26681">26681</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-12-05 18:41:44 +0000 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Themes: Refine how we display the current theme.
props shaunandrews, kwight, matveb.
see <a href="http://core.trac.wordpress.org/ticket/26003">#26003</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26680 => 26681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-12-05 18:37:43 UTC (rev 26680)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-12-05 18:41:44 UTC (rev 26681)
</span><span class="lines">@@ -6510,39 +6510,28 @@
</span><span class="cx"> * The currently active theme
</span><span class="cx"> */
</span><span class="cx"> .theme-browser .theme.active .theme-name {
</span><del>- background: #0074a2;
</del><ins>+ background: #2f2f2f;
</ins><span class="cx"> color: #fff;
</span><ins>+ padding-right: 110px;
+ font-weight: 300;
</ins><span class="cx"> -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.5);
</span><span class="cx"> box-shadow: inset 0 1px 1px rgba(0,0,0,0.5);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.theme-browser .theme.active .theme-name span {
+ font-weight: 600;
+}
+
</ins><span class="cx"> .theme-browser .theme.active .theme-actions {
</span><del>- top: 0;
- left: 0;
- background: #2f2f2f;
- height: 48px;
</del><ins>+ background: rgba(49,49,49,0.7);
+ border-left: none;
</ins><span class="cx"> opacity: 1;
</span><del>- line-height: 48px;
- padding: 0 10px;
- z-index: 1;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-browser .theme.active .theme-actions .button {
- float: right;
- margin-top: 10px;
</del><ins>+.theme-browser .theme.active .theme-actions .button-primary {
+ margin-right: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-browser .theme.active .current-label {
- font-size: 13px;
- font-weight: 400;
- color: #ccc;
- margin-left: 5px;
-}
-
-.theme-browser .theme.active .theme-update {
- top: 48px;
-}
-
</del><span class="cx"> .theme-browser .theme .theme-author {
</span><span class="cx"> background: #222;
</span><span class="cx"> color: #eee;
</span><span class="lines">@@ -7133,11 +7122,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media only screen and (max-width: 780px) {
</span><del>- .theme-browser .theme.active .theme-actions .button {
- margin-top: 6px;
- margin-right: -3px
- }
-
</del><span class="cx"> body.folded .theme-overlay .theme-wrap,
</span><span class="cx"> .theme-overlay .theme-wrap {
</span><span class="cx"> top: 0; /* The adminmenu isn't fixed on mobile, so this can use the full viewport height */
</span><span class="lines">@@ -7150,6 +7134,11 @@
</span><span class="cx"> position: fixed;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .theme-browser .theme.active .theme-name span {
+ /* Hide the "Active: " label on smaller screens. */
+ display: none;
+ }
+
</ins><span class="cx"> .theme-overlay .theme-screenshots {
</span><span class="cx"> width: 40%;
</span><span class="cx"> }
</span><span class="lines">@@ -7160,6 +7149,10 @@
</span><span class="cx"> .single-theme .theme-wrap {
</span><span class="cx"> padding: 10px;
</span><span class="cx"> }
</span><ins>+
+ .theme-browser .theme .theme-actions {
+ padding: 5px 10px 4px 10px;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media only screen and (max-width: 480px) {
</span><span class="lines">@@ -7180,14 +7173,6 @@
</span><span class="cx"> margin-left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .theme .theme-actions .button {
- margin-top: -4px;
- }
- .theme.active .theme-actions .button {
- margin-top: 6px;
- margin-right: 0;
- }
-
</del><span class="cx"> .theme-overlay .theme-actions .delete-theme {
</span><span class="cx"> position: relative;
</span><span class="cx"> right: auto;
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/themes.php (26680 => 26681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/themes.php 2013-12-05 18:37:43 UTC (rev 26680)
+++ trunk/src/wp-admin/themes.php 2013-12-05 18:41:44 UTC (rev 26681)
</span><span class="lines">@@ -221,12 +221,16 @@
</span><span class="cx"> <div class="theme-screenshot blank"></div>
</span><span class="cx"> <# } #>
</span><span class="cx"> <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
</span><del>- <h3 class="theme-name">{{{ data.name }}}</h3>
</del><ins>+
+ <# if ( data.active ) { #>
+ <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
+ <# } else { #>
+ <h3 class="theme-name">{{{ data.name }}}</h3>
+ <# } #>
</ins><span class="cx">
</span><span class="cx"> <div class="theme-actions">
</span><span class="cx">
</span><span class="cx"> <# if ( data.active ) { #>
</span><del>- <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
</del><span class="cx"> <# if ( data.actions.customize ) { #>
</span><span class="cx"> <a class="button button-primary hide-if-no-customize" href="{{ data.actions.customize }}"><?php _e( 'Customize' ); ?></a>
</span><span class="cx"> <# } #>
</span></span></pre>
</div>
</div>
</body>
</html>