Ticket #27521: 27521.8.diff
File 27521.8.diff, 9.0 KB (added by , 11 years ago) |
---|
-
src/wp-admin/css/colors/_admin.scss
439 439 440 440 body.more-filters-opened .more-filters, 441 441 body.more-filters-opened .more-filters:before { 442 color: $menu-text; 443 background-color: $menu-background; 444 } 445 446 body.more-filters-opened .more-filters:hover, 447 body.more-filters-opened .more-filters:focus, 448 body.more-filters-opened .more-filters:hover:before, 449 body.more-filters-opened .more-filters:focus:before { 450 background-color: $menu-highlight-background; 442 451 color: $menu-highlight-text; 443 background-color: $menu-highlight-background;444 452 } 445 453 454 446 455 /* jQuery UI Slider */ 447 456 448 457 .wp-slider .ui-slider-handle, -
src/wp-admin/css/themes.css
40 40 top: -3px; 41 41 } 42 42 43 .theme-navigation a{ 44 text-decoration:none; 45 } 46 43 47 /* Position admin messages */ 44 48 .themes-php div.updated, 45 49 .themes-php div.error { … … 112 116 border-left: 1px solid rgba(0,0,0,0.05); 113 117 } 114 118 115 .theme-browser .theme:hover .theme-actions { 119 .theme-browser .theme:hover .theme-actions, 120 .theme-browser .theme.focus .theme-actions, 121 .theme-browser .theme:focus .theme-actions { 116 122 -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; 117 123 opacity: 1; 118 124 } … … 157 163 transition: opacity 0.2s ease-in-out; 158 164 } 159 165 160 .theme-browser .theme:hover .theme-screenshot { 166 .theme-browser .theme:hover .theme-screenshot, 167 .theme-browser .theme:focus .theme-screenshot { 161 168 background: #fff; 162 169 } 163 170 164 .theme-browser.rendered .theme:hover .theme-screenshot img { 171 .theme-browser.rendered .theme:hover .theme-screenshot img, 172 .theme-browser.rendered .theme:focus .theme-screenshot img { 165 173 opacity: 0.4; 166 174 } 167 175 … … 189 197 .theme-browser .theme:focus { 190 198 outline: 1px dotted #222; 191 199 } 192 /* Hide shortcut actions and hover feedback when using tab navigation */ 193 .theme-browser .theme:focus .theme-actions { 194 display: none; 195 } 196 /* Restore display of theme controls if you hover a focused theme */ 197 .theme-browser .theme:focus:hover .theme-actions { 198 display: block; 199 } 200 200 201 .theme-browser .theme:focus .more-details { 201 202 opacity: 1; 202 203 } … … 205 206 display: block; 206 207 } 207 208 208 .theme-browser.rendered .theme:hover .more-details { 209 .theme-browser.rendered .theme:hover .more-details, 210 .theme-browser.rendered .theme:focus .more-details { 209 211 -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; 210 212 opacity: 1; 211 213 } … … 359 361 text-indent: 4px; 360 362 } 361 363 362 .theme-browser .theme.add-new-theme:hover .theme-screenshot { 364 .theme-browser .theme.add-new-theme:hover .theme-screenshot, 365 .theme-browser .theme.add-new-theme:focus .theme-screenshot { 363 366 background: none; 364 367 } 365 368 366 .theme-browser .theme.add-new-theme:hover span:after { 369 .theme-browser .theme.add-new-theme:hover span:after, 370 .theme-browser .theme.add-new-theme:focus span:after { 367 371 background: #fff; 368 372 color: #0074a2; 369 373 } 370 374 371 .theme-browser .theme.add-new-theme:hover:after { 375 .theme-browser .theme.add-new-theme:hover:after, 376 .theme-browser .theme.add-new-theme:focus:after { 372 377 border-color: transparent; 373 378 color: #fff; 374 379 background: #0074a2; … … 387 392 margin-bottom: 10%; 388 393 } 389 394 390 .theme-browser .theme.add-new-theme:hover .theme-name { 395 .theme-browser .theme.add-new-theme:hover .theme-name, 396 .theme-browser .theme.add-new-theme:focus .theme-name { 391 397 color: #fff; 392 398 z-index: 2; 393 399 } … … 954 960 } 955 961 956 962 .theme:not(.active):hover .theme-actions, 957 .theme:hover .more-details { 963 .theme:not(.active):focus .theme-actions, 964 .theme:hover .more-details, 965 .theme:focus .more-details { 958 966 display: none; 959 967 } 960 968 961 .theme-browser.rendered .theme:hover .theme-screenshot img { 969 .theme-browser.rendered .theme:hover .theme-screenshot img, 970 .theme-browser.rendered .theme:focus .theme-screenshot img { 962 971 opacity: 1.0; 963 972 } 964 973 } … … 1163 1172 } 1164 1173 body.more-filters-opened .more-filters, 1165 1174 body.more-filters-opened .more-filters:before { 1166 background: rgb(46, 162, 204);1175 background: #777; 1167 1176 -webkit-border-radius: 2px; 1168 1177 border-radius: 2px; 1169 1178 border: none; 1170 1179 color: #fff; 1180 -webkit-transition: color .1s ease-in, background .1s ease-in; 1181 transition: color .1s ease-in, background .1s ease-in; 1171 1182 } 1183 1184 body.more-filters-opened .more-filters:hover, 1185 body.more-filters-opened .more-filters:focus, 1186 body.more-filters-opened .more-filters:hover:before, 1187 body.more-filters-opened .more-filters:focus:before { 1188 background: rgb(46, 162, 204); 1189 } 1190 1172 1191 .theme-install-php .theme-search { 1173 1192 position: absolute; 1174 1193 right: 10px; -
src/wp-admin/js/theme.js
235 235 'click .preview': 'preview', 236 236 'keydown': themes.isInstall ? 'preview': 'expand', 237 237 'touchend': themes.isInstall ? 'preview': 'expand', 238 'keyup': 'addFocus', 238 239 'touchmove': 'preventExpand' 239 240 }, 240 241 … … 264 265 } 265 266 }, 266 267 268 // Add class of focus to the theme we are focused on. 269 addFocus: function() { 270 var $themeToFocus = ( $( ':focus' ).hasClass( 'theme' ) ) ? $( ':focus' ) : $(':focus').parents('.theme'); 271 272 $('.theme.focus').removeClass('focus'); 273 $themeToFocus.addClass('focus'); 274 }, 275 267 276 // Single theme overlay screen 268 277 // It's shown when clicking a theme 269 278 expand: function( event ) { 270 279 var self = this; 271 280 281 272 282 event = event || window.event; 273 283 274 284 // 'enter' and 'space' keys expand the details view when a theme is :focused … … 303 313 return this.touchDrag = false; 304 314 } 305 315 316 // 'enter' and 'space' keys expand the details view when a theme is :focused 317 if ( event.type === 'keydown' && ( event.which !== 13 && event.which !== 32 ) ) { 318 return; 319 } 320 321 // pressing enter while focused on the buttons shouldn't open the preview 322 if ( event.type === 'keydown' && event.which !== 13 && $( ':focus' ).hasClass( 'button' ) ) { 323 return; 324 } 325 306 326 event.preventDefault(); 307 327 308 328 event = event || window.event; … … 799 819 search: function( event ) { 800 820 var options = {}; 801 821 822 802 823 // Clear on escape. 803 824 if ( event.type === 'keyup' && event.which === 27 ) { 804 825 event.target.value = ''; … … 932 953 933 954 // Handles Ajax request for searching through themes in public repo 934 955 search: function( event ) { 956 957 // Tabbing into the search input shouldn't trigger a search 958 if ( event.type === 'keyup' && event.which === 9 ) { 959 return; 960 } 961 935 962 this.collection = this.options.parent.view.collection; 936 963 937 964 // Clear on escape. … … 1085 1112 var $el = $( event.target ), 1086 1113 sort = $el.data( 'sort' ); 1087 1114 1115 // links that trigger sort have a # as the href, we don't want to add that to the url 1116 event.preventDefault(); 1117 1088 1118 // Bail if this is already active 1089 1119 if ( $el.hasClass( this.activeClass ) ) { 1090 1120 return; -
src/wp-admin/theme-install.php
104 104 <div class="wrap"> 105 105 <h2> 106 106 <?php echo esc_html( $title ); ?> 107 <a class="upload add-new-h2"><?php _e( 'Upload Theme' ); ?></a>108 <a class="browse-themes add-new-h2"><?php _ex( 'Browse', 'themes' ); ?></a>107 <a href="#" class="upload add-new-h2"><?php _e( 'Upload Theme' ); ?></a> 108 <a href="#" class="browse-themes add-new-h2"><?php _ex( 'Browse', 'themes' ); ?></a> 109 109 </h2> 110 110 111 111 <div class="upload-theme"> … … 114 114 115 115 <div class="theme-navigation"> 116 116 <span class="theme-count"></span> 117 < span class="theme-section current" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></span>118 < span class="theme-section" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></span>119 < span class="theme-section" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></span>117 <a class="theme-section current" href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a> 118 <a class="theme-section" href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a> 119 <a class="theme-section" href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a> 120 120 <div class="theme-top-filters"> 121 121 <!--<span class="theme-filter" data-filter="photoblogging">Photography</span> 122 122 <span class="theme-filter" data-filter="responsive-layout">Responsive</span>--> 123 < span class="more-filters"><?php _e( 'Feature Filter' ); ?></span>123 <a class="more-filters" href="#"><?php _e( 'Feature Filter' ); ?></a> 124 124 </div> 125 125 <div class="more-filters-container"> 126 126 <?php