<!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>[26838] trunk/src/wp-admin: Themes: fix overlays and buttons in responsive mode, props matveb, fixes #26481.</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/26838">26838</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-12-09 19:37:36 +0000 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Themes: fix overlays and buttons in responsive mode, props matveb, fixes <a href="http://core.trac.wordpress.org/ticket/26481">#26481</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>
</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 (26837 => 26838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-12-09 19:27:19 UTC (rev 26837)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-12-09 19:37:36 UTC (rev 26838)
</span><span class="lines">@@ -7194,15 +7194,26 @@
</span><span class="cx"> .theme-browser .theme .theme-actions {
</span><span class="cx"> padding: 5px 10px 4px 10px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .theme-overlay.small-screenshot .theme-screenshots {
</span><span class="cx"> position: static;
</span><span class="cx"> float: none;
</span><span class="cx"> max-width: 302px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .theme-overlay.small-screenshot .theme-info {
</span><span class="cx"> margin-left: 0;
</span><span class="cx"> width: auto;
</span><span class="cx"> }
</span><ins>+
+ .theme:not(.active):hover .theme-actions,
+ .theme:hover .more-details {
+ display: none;
+ }
+
+ .theme-browser.rendered .theme:hover .theme-screenshot img {
+ opacity: 1.0;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media only screen and (max-width: 480px) {
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (26837 => 26838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js 2013-12-09 19:27:19 UTC (rev 26837)
+++ trunk/src/wp-admin/js/theme.js 2013-12-09 19:37:36 UTC (rev 26838)
</span><span class="lines">@@ -187,9 +187,13 @@
</span><span class="cx"> html: themes.template( 'theme' ),
</span><span class="cx">
</span><span class="cx"> events: {
</span><del>- 'click': 'expand'
</del><ins>+ 'click': 'expand',
+ 'touchend': 'expand',
+ 'touchmove': 'preventExpand'
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ touchDrag: false,
+
</ins><span class="cx"> render: function() {
</span><span class="cx"> var data = this.model.toJSON();
</span><span class="cx"> // Render themes using the html template
</span><span class="lines">@@ -215,6 +219,11 @@
</span><span class="cx"> expand: function( event ) {
</span><span class="cx"> var self = this;
</span><span class="cx">
</span><ins>+ // Bail if the user scrolled on a touch device
+ if ( this.touchDrag === true ) {
+ return this.touchDrag = false;
+ }
+
</ins><span class="cx"> event = event || window.event;
</span><span class="cx">
</span><span class="cx"> // Prevent the modal from showing when the user clicks
</span><span class="lines">@@ -224,6 +233,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.trigger( 'theme:expand', self.model.cid );
</span><ins>+ },
+
+ preventExpand: function() {
+ this.touchDrag = true;
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>