Index: /trunk/src/wp-admin/css/customize-controls.css =================================================================== --- /trunk/src/wp-admin/css/customize-controls.css (revision 31953) +++ /trunk/src/wp-admin/css/customize-controls.css (revision 31954) @@ -907,8 +907,4 @@ } -.wp-customizer .theme-browser .theme.active .theme-name { - padding-right: 15px; -} - .wp-customizer #themes-filter { font-size: 16px; @@ -916,4 +912,23 @@ line-height: 1.5; width: 100%; +} + + +.wp-customizer .theme-browser .theme.active:hover, +.wp-customizer .theme-browser .theme.active:focus { + cursor: default; +} + +.wp-customizer .theme-browser .theme.active .more-details { + display: none; +} + +.wp-customizer .theme-browser .theme.active .theme-name { + padding-right: 15px; +} + +.wp-customizer .theme-browser.rendered .theme.active:hover .theme-screenshot img, +.wp-customizer .theme-browser.rendered .theme.active:focus .theme-screenshot img { + opacity: 1; } Index: /trunk/src/wp-admin/includes/theme.php =================================================================== --- /trunk/src/wp-admin/includes/theme.php (revision 31953) +++ /trunk/src/wp-admin/includes/theme.php (revision 31954) @@ -548,11 +548,11 @@ -
+ <# } #> Index: /trunk/src/wp-admin/js/customize-controls.js =================================================================== --- /trunk/src/wp-admin/js/customize-controls.js (revision 31953) +++ /trunk/src/wp-admin/js/customize-controls.js (revision 31954) @@ -647,12 +647,4 @@ section.closeDetails(); - }); - - section.container.on( 'click keydown', '.theme-actions .button', function( event ) { - if ( api.utils.isKeydownButNotEnterEvent( event ) ) { - return; - } - - $( '.wp-full-overlay' ).addClass( 'customize-loading' ); }); @@ -1908,13 +1900,23 @@ } - api.section( control.section() ).showDetails( control.params.theme ); - }); - - control.container.on( 'click keydown', '.theme-actions .button', function( event ) { + if ( $( this ).hasClass( 'active' ) ) { + return; + } + + var previewUrl = $( this ).data( 'previewUrl' ); + + $( '.wp-full-overlay' ).addClass( 'customize-loading' ); + + window.parent.location = previewUrl; + }); + + control.container.on( 'click keydown', '.theme-actions .theme-details', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { return; } - $( '.wp-full-overlay' ).addClass( 'customize-loading' ); + event.preventDefault(); // Keep this AFTER the key filter above + + api.section( control.section() ).showDetails( control.params.theme ); }); }, Index: /trunk/src/wp-includes/class-wp-customize-control.php =================================================================== --- /trunk/src/wp-includes/class-wp-customize-control.php (revision 31953) +++ /trunk/src/wp-includes/class-wp-customize-control.php (revision 31954) @@ -1201,6 +1201,7 @@ */ public function content_template() { - ?> -