<!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>[26519] trunk/src/wp-admin: Themes: Make the Theme Detail view div use more of the available viewport, Fix the Header and Footer in the viewport and only scroll the theme details, Prefix some more theme CSS classes.</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/26519">26519</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-12-02 07:11:43 +0000 (Mon, 02 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Themes: Make the Theme Detail view div use more of the available viewport, Fix the Header and Footer in the viewport and only scroll the theme details, Prefix some more theme CSS classes. Props shaunandrews for the initial viewport patch. Fixes <a href="http://core.trac.wordpress.org/ticket/25961">#25961</a>, <a href="http://core.trac.wordpress.org/ticket/26192">#26192</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</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 (26518 => 26519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css      2013-12-02 03:52:23 UTC (rev 26518)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-12-02 07:11:43 UTC (rev 26519)
</span><span class="lines">@@ -6678,15 +6678,16 @@
</span><span class="cx">  overflow: hidden;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .theme-utility {
</del><ins>+.theme-overlay .theme-header {
</ins><span class="cx">   position: absolute;
</span><span class="cx">  top: 0;
</span><span class="cx">  left: 0;
</span><span class="cx">  right: 0;
</span><ins>+       height: 48px;
</ins><span class="cx">   border-bottom: 1px solid #eee;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .back {
</del><ins>+.theme-overlay .theme-header .close {
</ins><span class="cx">   cursor: pointer;
</span><span class="cx">  height: 48px;
</span><span class="cx">  width: 50px;
</span><span class="lines">@@ -6695,15 +6696,15 @@
</span><span class="cx">  border-left: 1px solid #eee;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .back:hover {
</del><ins>+.theme-overlay .theme-header .close:hover {
</ins><span class="cx">   background: #333;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .back:hover:before {
</del><ins>+.theme-overlay .theme-header .close:hover:before {
</ins><span class="cx">   color: #fff;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .back:before {
</del><ins>+.theme-overlay .theme-header .close:before {
</ins><span class="cx">   font: normal 30px/48px 'dashicons' !important;
</span><span class="cx">  color: #bbb;
</span><span class="cx">  display: inline-block;
</span><span class="lines">@@ -6712,8 +6713,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* Left and right navigation */
</span><del>-.theme-overlay .right,
-.theme-overlay .left {
</del><ins>+.theme-overlay .theme-header .right,
+.theme-overlay .theme-header .left {
</ins><span class="cx">   cursor: pointer;
</span><span class="cx">  height: 48px;
</span><span class="cx">  width: 54px;
</span><span class="lines">@@ -6726,57 +6727,56 @@
</span><span class="cx">  user-select:         none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .right:hover,
-.theme-overlay .left:hover {
</del><ins>+.theme-overlay .theme-header .right:hover,
+.theme-overlay .theme-header .left:hover {
</ins><span class="cx">   background: #333;
</span><span class="cx">  color: #fff;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .left.disabled,
-.theme-overlay .right.disabled,
-.theme-overlay .left.disabled:hover,
-.theme-overlay .right.disabled:hover {
</del><ins>+.theme-overlay .theme-header .left.disabled,
+.theme-overlay .theme-header .right.disabled,
+.theme-overlay .theme-header .left.disabled:hover,
+.theme-overlay .theme-header .right.disabled:hover {
</ins><span class="cx">   color: #ccc;
</span><span class="cx">  background: inherit;
</span><span class="cx">  cursor: inherit;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .right:before,
-.theme-overlay .left:before {
</del><ins>+.theme-overlay .theme-header .right:before,
+.theme-overlay .theme-header .left:before {
</ins><span class="cx">   font: normal 16px/54px 'dashicons' !important;
</span><span class="cx">  display: inline;
</span><span class="cx">  font-weight: 300;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .left:before {
</del><ins>+.theme-overlay .theme-header .left:before {
</ins><span class="cx">   content: '\f341';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.theme-overlay .right:before {
</del><ins>+.theme-overlay .theme-header .right:before {
</ins><span class="cx">   content: '\f345';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.rtl .theme-overlay .left:before {
</del><ins>+.rtl .theme-overlay .theme-header .left:before {
</ins><span class="cx">   content: '\f345';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.rtl .theme-overlay .right:before {
</del><ins>+.rtl .theme-overlay .theme-header .right:before {
</ins><span class="cx">   content: '\f341';
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .theme-wrap {
</span><span class="cx">  clear: both;
</span><span class="cx">  position: fixed;
</span><del>-       top: 120px;
-       left: 190px;
-       right: 40px;
-       bottom: 80px;
-       overflow: auto;
</del><ins>+        top: 9%;
+       left: 180px;
+       right: 30px;
+       bottom: 3%;
</ins><span class="cx">   background: #fff;
</span><del>-       padding: 88px 40px 110px 40px;
-       -webkit-box-shadow: 0 1px 20px 5px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0,0,0,0.1);
-       box-shadow:         0 1px 20px 5px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0,0,0,0.1);
</del><ins>+        -webkit-box-shadow: 0 1px 20px 5px rgba(0, 0, 0, 0.1);
+       box-shadow:         0 1px 20px 5px rgba(0, 0, 0, 0.1);
</ins><span class="cx">   z-index: 20;
</span><ins>+       box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .theme-wrap:after {
</span><span class="lines">@@ -6787,41 +6787,60 @@
</span><span class="cx">  visibility: hidden;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+body.folded .theme-overlay .theme-wrap {
+       left: 70px;
+}
+
+.theme-overlay .theme-about {
+       position: absolute;
+       top: 49px;
+       bottom: 69px;
+       left: 0;
+       right: 0;
+       overflow: auto;
+       padding: 2% 4%;
+}
+.theme-overlay .theme-about:after {
+       content: ".";
+       display: block;
+       height: 0;
+       clear: both;
+       visibility: hidden;
+}
+
</ins><span class="cx"> .theme-overlay .theme-actions {
</span><del>-       position: fixed;
</del><ins>+        position: absolute;
</ins><span class="cx">   text-align: center;
</span><del>-       bottom: 80px;
-       left: 190px;
-       right: 40px;
</del><ins>+        bottom: 0;
+       left: 0;
+       right: 0;
</ins><span class="cx">   padding: 20px 25px;
</span><del>-       background: rgba(243, 243, 243 ,0.9);
-       border-top: 1px solid rgba(0,0,0,0.1);
</del><ins>+        background: #f3f3f3;
</ins><span class="cx">   z-index: 30;
</span><ins>+       box-sizing: border-box;
+       border-top: 1px solid #eee;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .theme-actions a {
</span><span class="cx">  margin-right: 5px;
</span><span class="cx">  margin-bottom: 0;
</span><del>-       font-size: 16px;
-       line-height: 37px;
-       height: 37px;
-       padding: 0 20px 1px 20px;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .theme-actions .delete-theme {
</span><del>-       border-radius: 2px;
</del><span class="cx">   color: #a00;
</span><del>-       font-size: 14px;
-       padding: 0 10px;
</del><span class="cx">   position: absolute;
</span><span class="cx">  right: 10px;
</span><span class="cx">  bottom: 20px;
</span><span class="cx">  text-decoration: none;
</span><ins>+       border-color: transparent;
+       box-shadow: none;
+       background: transparent;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .theme-actions .delete-theme:hover {
</span><span class="cx">  background: #d54e21;
</span><span class="cx">  color: #fff;
</span><ins>+       border-color: #d54e21;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .theme-actions .active-theme,
</span><span class="lines">@@ -6863,7 +6882,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .screenshot img {
</span><del>-       cursor: pointer;
</del><span class="cx">   height: auto;
</span><span class="cx">  position: absolute;
</span><span class="cx">  left: 0;
</span><span class="lines">@@ -6880,6 +6898,7 @@
</span><span class="cx">  margin: 10px 5px 0;
</span><span class="cx">  width: 140px;
</span><span class="cx">  height: 80px;
</span><ins>+       cursor: pointer;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .theme-overlay .screenshot.thumb:after {
</span><span class="lines">@@ -7043,8 +7062,7 @@
</span><span class="cx">          margin-right: 0;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       .theme-overlay .theme-wrap,
-       .theme-overlay .theme-actions {
</del><ins>+        body.folded .theme-overlay .theme-wrap {
</ins><span class="cx">           right: 15%;
</span><span class="cx">          left: 22%;
</span><span class="cx">  }
</span><span class="lines">@@ -7067,9 +7085,8 @@
</span><span class="cx"> 
</span><span class="cx"> /* Admin menu is folded */
</span><span class="cx"> @media only screen and (max-width: 900px) {
</span><del>-       .theme-overlay .theme-wrap,
-       .theme-overlay .theme-actions {
-               left: 76px;
</del><ins>+        .theme-overlay .theme-wrap {
+               left: 65px;
</ins><span class="cx">   }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -7079,21 +7096,16 @@
</span><span class="cx">          margin-right: -3px
</span><span class="cx">  }
</span><span class="cx"> 
</span><ins>+       body.folded .theme-overlay .theme-wrap,
</ins><span class="cx">   .theme-overlay .theme-wrap {
</span><span class="cx">          top: 45px;
</span><span class="cx">          right: 0;
</span><span class="cx">          bottom: 0;
</span><span class="cx">          left: 0;
</span><del>-               padding: 70px 20px 100px;
</del><ins>+                padding: 70px 20px 20px;
+               border: none;
</ins><span class="cx">   }
</span><span class="cx"> 
</span><del>-       .theme-overlay .theme-actions {
-               right: 0;
-               bottom: 0;
-               left: 0;
-               padding: 10px;
-       }
-
</del><span class="cx">   .theme-overlay .theme-screenshots {
</span><span class="cx">          width: 40%;
</span><span class="cx">  }
</span><span class="lines">@@ -7101,10 +7113,6 @@
</span><span class="cx">  .theme-overlay .theme-info {
</span><span class="cx">          width: 50%;
</span><span class="cx">  }
</span><del>-
-       .theme-overlay .theme-actions .delete-theme {
-               bottom: 10px;
-       }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @media only screen and (max-width: 650px) {
</span><span class="lines">@@ -7141,13 +7149,6 @@
</span><span class="cx">          margin: 5px 0 15px 0;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       .theme-overlay .theme-version {
-               margin-left: 0;
-               position: absolute;
-               top: 18px;
-               left: 130px;
-       }
-
</del><span class="cx">   .theme-overlay .current-label {
</span><span class="cx">          margin-top: 10px;
</span><span class="cx">          font-size: 13px;
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (26518 => 26519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js   2013-12-02 03:52:23 UTC (rev 26518)
+++ trunk/src/wp-admin/js/theme.js      2013-12-02 07:11:43 UTC (rev 26519)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">          // Detect if the click is inside the overlay
</span><span class="cx">          // and don't close it unless the target was
</span><span class="cx">          // the div.back button
</span><del>-               if ( $( event.target ).is( '.theme-backdrop' ) || $( event.target ).is( 'div.back' ) || event.keyCode === 27 ) {
</del><ins>+                if ( $( event.target ).is( '.theme-backdrop' ) || $( event.target ).is( 'div.close' ) || event.keyCode === 27 ) {
</ins><span class="cx"> 
</span><span class="cx">                  // Add a temporary closing class while overlay fades out
</span><span class="cx">                  $( 'body' ).addClass( 'closing-overlay' );
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/themes.php (26518 => 26519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/themes.php    2013-12-02 03:52:23 UTC (rev 26518)
+++ trunk/src/wp-admin/themes.php       2013-12-02 07:11:43 UTC (rev 26519)
</span><span class="lines">@@ -245,12 +245,12 @@
</span><span class="cx"> <script id="tmpl-theme-single" type="text/template">
</span><span class="cx">  <div class="theme-backdrop"></div>
</span><span class="cx">  <div class="theme-wrap">
</span><del>-               <div class="theme-utility">
-                       <div alt="<?php _e( 'Close overlay' ); ?>" class="back dashicons dashicons-no"></div>
</del><ins>+                <div class="theme-header">
+                       <div alt="<?php _e( 'Close overlay' ); ?>" class="close dashicons dashicons-no"></div>
</ins><span class="cx">                   <div alt="<?php _e( 'Show previous theme' ); ?>" class="left dashicons dashicons-no"></div>
</span><span class="cx">                  <div alt="<?php _e( 'Show next theme' ); ?>" class="right dashicons dashicons-no"></div>
</span><span class="cx">          </div>
</span><del>-
</del><ins>+        <div class="theme-about">
</ins><span class="cx">           <div class="theme-screenshots">
</span><span class="cx">          <# if ( data.screenshot[0] ) { #>
</span><span class="cx">                  <div class="screenshot first"><img src="{{ data.screenshot[0] }}" alt="" /></div>
</span><span class="lines">@@ -310,9 +310,10 @@
</span><span class="cx">          </div>
</span><span class="cx"> 
</span><span class="cx">          <# if ( ! data.active && data.actions.delete ) { #>
</span><del>-                       <a href="{{{ data.actions.delete }}}" class="delete-theme"><?php _e( 'Delete' ); ?></a>
</del><ins>+                        <a href="{{{ data.actions.delete }}}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
</ins><span class="cx">           <# } #>
</span><span class="cx">  </div>
</span><ins>+       </div>
</ins><span class="cx"> </script>
</span><span class="cx"> 
</span><span class="cx"> <?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
</span></span></pre>
</div>
</div>

</body>
</html>