Changeset 26838

Timestamp:

12/09/2013 07:37:36 PM (13 years ago)

Author:

azaozz

Message:

Themes: fix overlays and buttons in responsive mode, props matveb, fixes #26481.

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (2 diffs)
• js/theme.js (modified) (3 diffs)

trunk/src/wp-admin/css/wp-admin.css

@@ -7195 +7195 @@
                 padding: 5px 10px 4px 10px;
         }
+
         .theme-overlay.small-screenshot .theme-screenshots {
                 position: static;
@@ -7200 +7201 @@
                 max-width: 302px;
         }
+
         .theme-overlay.small-screenshot .theme-info {
                 margin-left: 0;
                 width: auto;
+        }
+
+        .theme:not(.active):hover .theme-actions,
+        .theme:hover .more-details {
+                display: none;
+        }
+
+        .theme-browser.rendered .theme:hover .theme-screenshot img {
+                opacity: 1.0;
         }
 }

trunk/src/wp-admin/js/theme.js

@@ -188 +188 @@
 
         events: {
-                'click': 'expand'
-        },
+                'click': 'expand',
+                'touchend': 'expand',
+                'touchmove': 'preventExpand'
+        },
+
+        touchDrag: false,
 
         render: function() {
@@ -216 +220 @@
                 var self = this;
 
+                // Bail if the user scrolled on a touch device
+                if ( this.touchDrag === true ) {
+                        return this.touchDrag = false;
+                }
+
                 event = event || window.event;
 
@@ -225 +234 @@
 
                 this.trigger( 'theme:expand', self.model.cid );
+        },
+
+        preventExpand: function() {
+                this.touchDrag = true;
         }
 });