Index: trunk/src/wp-admin/css/colors/_admin.scss =================================================================== --- trunk/src/wp-admin/css/colors/_admin.scss (revision 29023) +++ trunk/src/wp-admin/css/colors/_admin.scss (working copy) @@ -434,25 +434,32 @@ background: $highlight-color; } -.theme-section.current, -.theme-filter.current { +/* Filter */ + +.wp-filter-link.current { border-bottom-color: $menu-background; } -body.more-filters-opened .more-filters, -body.more-filters-opened .more-filters:before { +body.show-filter-drawer .wp-filter-drawer-toggle { color: $menu-text; background-color: $menu-background; } -body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus, -body.more-filters-opened .more-filters:hover:before, -body.more-filters-opened .more-filters:focus:before { +body.show-filter-drawer .wp-filter-drawer-toggle:before { + color: $menu-text; +} + +body.show-filter-drawer .wp-filter-drawer-toggle:hover, +body.show-filter-drawer .wp-filter-drawer-toggle:focus { background-color: $menu-highlight-background; color: $menu-highlight-text; } +body.show-filter-drawer .wp-filter-drawer-toggle:hover:before, +body.show-filter-drawer .wp-filter-drawer-toggle:focus:before { + color: $menu-highlight-text; +} + /* Widgets */ .widgets-chooser li.widgets-chooser-selected { Index: trunk/src/wp-admin/css/common.css =================================================================== --- trunk/src/wp-admin/css/common.css (revision 29023) +++ trunk/src/wp-admin/css/common.css (working copy) @@ -627,6 +627,21 @@ padding-right: 0; } +.wp-title-count { + display: inline; + padding: 4px 10px; + -webkit-border-radius: 30px; + border-radius: 30px; + background: #777; + font-size: 14px; + font-weight: 600; + color: #fff; + position: relative; + top: -3px; + margin-left: 5px; + margin-right: 20px; +} + .wp-dialog { background-color: #fff; } Index: trunk/src/wp-admin/css/filter.css =================================================================== --- trunk/src/wp-admin/css/filter.css (revision 0) +++ trunk/src/wp-admin/css/filter.css (working copy) @@ -0,0 +1,266 @@ +.wp-filter { + background: #fff; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + color: #555; + display: inline-block; + font-size: 13px; + margin: 12px 0 25px; + padding: 0 20px; + position: relative; + width: 100%; +} +.wp-filter a { + text-decoration: none; +} + +.wp-filter-count { + display: inline-block; + vertical-align: middle; + min-width: 4em; +} +.wp-filter-count .count { + display: inline-block; + padding: 4px 10px; + -webkit-border-radius: 30px; + border-radius: 30px; + background: #777; + font-size: 14px; + font-weight: 600; + color: #fff; + position: relative; + top: -1px; +} + +.wp-filter-links { + margin: 0; + display: inline-block; +} +.wp-filter-links li { + margin: 0; + display: inline-block; +} +.wp-filter-link { + border-bottom: 4px solid #fff; + color: #666; + cursor: pointer; + display: inline-block; + margin: 0 10px; + padding: 15px 0; +} +.wp-filter-links .current { + border-bottom: 4px solid #666; + color: #222; +} + +.wp-filter-search { + position: absolute; + right: 10px; + top: 9px; + left: auto; + font-size: 16px; + font-weight: 300; + line-height: 1.5; + width: 280px; + padding: 3px 5px; +} + +.wp-filter-drawer-toggle { + color: #666; + cursor: pointer; + display: inline-block; + margin: 0 10px; + padding: 4px 6px; +} +.wp-filter-drawer-toggle:before { + color: #777; + text-align: center; + margin: 0 5px 0 0; + content: "\f111"; + display: inline-block; + width: 16px; + height: 16px; + -webkit-font-smoothing: antialiased; + font-size: 16px; + line-height: 1; + font-family: "dashicons"; + text-decoration: inherit; + font-weight: normal; + font-style: normal; + vertical-align: top; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + text-align: center; +} +.wp-filter-drawer-toggle:hover { + color: #777; +} +.wp-filter-drawer-toggle.current:before { + color: #fff; +} + +.wp-filter-drawer { + display: none; + padding: 20px; + border-top: 1px solid #eee; + margin: 0 -20px; + background: #fafafa; +} +body.show-filter-drawer .wp-filter-drawer { + display: block; + overflow: hidden; +} +body.show-filter-drawer .wp-filter-drawer-toggle:hover, +body.show-filter-drawer .wp-filter-drawer-toggle:focus { + background: rgb(46, 162, 204); +} +body.show-filter-drawer .wp-filter-link.current { + border-bottom: none; +} + +body.show-filter-drawer .wp-filter-drawer-toggle { + background: #777; + -webkit-border-radius: 2px; + border-radius: 2px; + border: none; + color: #fff; +} +body.show-filter-drawer .wp-filter-drawer-toggle:before { + color: #fff; +} + +.wp-filter-group { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + float: left; + width: 19%; + background: #fff; + margin: 0 1% 0 0; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + padding: 10px; +} +.wp-filter-group-wide { + width: 38%; +} +.wp-filter-group-title { + margin: 0; + position: relative; +} + +.wp-filter-drawer ol { + list-style-type: none; + margin: 20px 0 0; + font-size: 12px; +} +.wp-filter-drawer li { + display: inline-block; + vertical-align: top; + list-style-type: none; + margin: 5px 0; + padding-right: 25px; + width: 160px; +} + +.wp-filter .button.wp-filter-drawer-apply { + margin: 0 0 20px; +} +.wp-filter .button.wp-filter-drawer-apply span { + display: inline-block; + font-size: 12px; + text-indent: 10px; + opacity: 0.8; +} +.wp-filter .button.wp-filter-drawer-clear { + display: none; + margin: 0 0 20px 10px; +} + +.wp-filter-by { + display: none; + margin: 0; +} +.wp-filter-by > span { + font-weight: 600; +} +.wp-filter-by a { + margin-left: 10px; +} +.wp-filter-by .tags { + display: inline; +} +.wp-filter-by .tag { + background: #fff; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + font-size: 11px; + margin: 0 5px; + padding: 4px 8px; +} + +body.filters-applied .wp-filter-group, +body.filters-applied .wp-filter-drawer a.button, +body.filters-applied .wp-filter-drawer br { + display: none !important; +} +body.filters-applied .wp-filter-by { + display: block; +} +body.filters-applied .wp-filter-drawer { + padding: 20px; +} + +body.show-filter-drawer .wp-filter-content, +body.show-filter-drawer.filters-applied.loading-content .wp-filter-content { + display: none; +} +body.show-filter-drawer.filters-applied .wp-filter-content { + display: block; +} + +.loading-content .wp-filter-content, +.error .wp-filter-content { + display: none; +} +.loading-content .spinner { + display: block; + margin: 40px auto 0; + float: none; +} + +@media only screen and (max-width: 1120px) { + + .wp-filter-search { + margin: 20px 0; + position: static; + width: 100%; + } + + .wp-filter-drawer { + border-bottom: 1px solid #eee; + } + .wp-filter-group { + margin-bottom: 0; + margin-top: 5px; + width: 100%; + } + .wp-filter-group li { + margin: 10px 0; + } +} + +@media only screen and (max-width: 782px) { + + .wp-filter-group, + .wp-filter-group li { + width: 100%; + } + +} \ No newline at end of file Index: trunk/src/wp-admin/css/themes.css =================================================================== --- trunk/src/wp-admin/css/themes.css (revision 29023) +++ trunk/src/wp-admin/css/themes.css (working copy) @@ -25,25 +25,6 @@ margin-left: 20px; } -.themes-php .wrap .theme-count, -.theme-navigation .theme-count { - color: #fff; - -webkit-border-radius: 30px; - border-radius: 30px; - background: #777; - font-size: 14px; - padding: 4px 10px; - font-weight: 600; - margin-left: 5px; - margin-right: 20px; - position: relative; - top: -3px; -} - -.theme-navigation a { - text-decoration:none; -} - /* Position admin messages */ .themes-php div.updated, .themes-php div.error { @@ -51,6 +32,20 @@ clear: both; } +/* + * The search form + */ +.themes-php .wp-filter-search { + position: relative; + top: -2px; + left: 20px; + font-size: 16px; + font-weight: 300; + line-height: 1.5; + width: 280px; + margin: 0; +} + .themes-php div.updated a { text-decoration: underline; } @@ -401,19 +396,6 @@ z-index: 2; } -/* - * The search form - */ -.themes-php .theme-search { - position: relative; - top: -2px; - left: 20px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} - /** * Theme Overlay * Shown when clicking a theme @@ -1024,8 +1006,8 @@ .themes-php .wrap h2 { width: 100%; } - - .themes-php .theme-search { + + .themes-php .wp-filter-search { float: none; clear: both; left: 0; @@ -1088,21 +1070,6 @@ display: none !important; } -.theme-navigation { - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - color: #555; - display: inline-block; - font-size: 13px; - margin: 20px 0 30px; - padding: 0 20px; - position: relative; - width: 100%; -} .theme-install-php a.upload, .theme-install-php a.browse-themes { cursor: pointer; @@ -1118,8 +1085,8 @@ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - display: none; - margin: 0px 0 0; + display: none; + margin: 0; padding: 0; width: 100%; overflow: hidden; @@ -1144,190 +1111,11 @@ padding: 40px 0 0; text-align: center; } -body.show-upload-theme .upload-theme + .theme-navigation, -body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser { +body.show-upload-theme .upload-theme + .wp-filter, +body.show-upload-theme .upload-theme + .wp-filter + .theme-browser { display: none; } -.theme-navigation .theme-count { - margin-left: 0; - position: absolute; - top: 12px; -} -.theme-count + .theme-section { - margin-left: 60px; -} -.theme-section, -.theme-filter { - border-bottom: 4px solid #fff; - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 15px 0; -} -.theme-section.current, -.theme-filter.current { - border-bottom: 4px solid #666; - color: #222; -} -.theme-top-filters { - display: inline-block; -} -.theme-navigation .more-filters { - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 4px 6px; -} -body.more-filters-opened .more-filters, -body.more-filters-opened .more-filters:before { - background: #777; - -webkit-border-radius: 2px; - border-radius: 2px; - border: none; - color: #fff; -} -body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus, -body.more-filters-opened .more-filters:hover:before, -body.more-filters-opened .more-filters:focus:before { - background: rgb(46, 162, 204); -} - -.theme-install-php .theme-search { - position: absolute; - right: 10px; - top: 9px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} -.more-filters:before { - color: #777; - text-align: center; - margin: 0 5px 0 0; - content: "\f111"; - display: inline-block; - width: 16px; - height: 16px; - -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1; - font-family: "dashicons"; - text-decoration: inherit; - font-weight: normal; - font-style: normal; - vertical-align: top; - -webkit-transition: color .1s ease-in 0; - transition: color .1s ease-in 0; - text-align: center; -} -.more-filters.current:before { - color: #fff; -} -.more-filters-container { - display: none; - padding: 20px; - border-top: 1px solid #eee; - margin: 0 -20px; - background: #fafafa; -} -body.more-filters-opened .more-filters-container { - display: block; - overflow: hidden; -} -body.more-filters-opened .theme-section.current { - border-bottom: none; -} -body.more-filters-opened .theme-browser, -body.more-filters-opened.filters-applied.loading-themes .theme-browser { - display: none; -} -body.more-filters-opened.filters-applied .theme-browser { - display: block; -} -.more-filters-container .filters-group { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - float: left; - width: 19%; - background: #fff; - margin: 0 1% 0 0; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - padding: 10px; -} -.more-filters-container .wide-filters-group { - width: 38%; -} -.more-filters-container .feature-name { - margin: 0; - position: relative; -} -.more-filters-container ol { - list-style-type: none; - margin: 20px 0 0; - font-size: 12px; -} -.more-filters-container li { - display: inline-block; - vertical-align: top; - list-style-type: none; - margin: 5px 0; - padding-right: 25px; - width: 160px; -} -.theme-navigation .more-filters-container .apply-filters { - margin: 0 0 20px; -} -.theme-navigation .more-filters-container .clear-filters { - display: none; - margin: 0 0 20px 10px; -} -.more-filters-container .apply-filters span { - display: inline-block; - font-size: 12px; - text-indent: 10px; - opacity: 0.8; -} -.more-filters-container .filtering-by { - display: none; - margin: 0; -} -.more-filters-container .filtering-by > span { - font-weight: 600; -} -.more-filters-container .filtering-by .tags { - display: inline; -} -.more-filters-container .filtering-by .tag { - background: #fff; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - font-size: 11px; - margin: 0 5px; - padding: 4px 8px; -} -.more-filters-container .filtering-by a { - margin-left: 10px; -} -body.filters-applied .more-filters-container .filters-group, -body.filters-applied .more-filters-container a.button, -body.filters-applied .more-filters-container br { - display: none !important; -} -body.filters-applied .more-filters-container .filtering-by { - display: block; -} -body.filters-applied .more-filters-container { - padding: 20px; -} p.no-themes { color: #999; font-size: 18px; @@ -1344,20 +1132,12 @@ display: none !important; } - .theme-install-php .add-new-theme { display: none !important; } @media only screen and (max-width: 1120px) { - .theme-install-php .theme-search { - margin: 20px 0; - position: static; - width: 100%; - } - .more-filters-container { - border-bottom: 1px solid #eee; - } + .upload-theme .wp-upload-form { margin: 20px 0; max-width: 100%; @@ -1367,23 +1147,7 @@ padding: 20px 0 0; text-align: left; } - .more-filters-container .filters-group { - margin-bottom: 0; - margin-top: 5px; - width: 100%; - } - .more-filters-container .filters-group li { - margin: 10px 0; - } -} -@media only screen and (max-width: 782px) { - .more-filters-container .filters-group { - width: 100%; - } - .more-filters-container .filters-group li { - width: 100%; - } } .rating { @@ -1447,15 +1211,6 @@ line-height: 20px; color: #999; } -.loading-themes .theme-browser, -.error .theme-browser { - display: none; -} -.loading-themes .spinner { - display: block; - margin: 40px auto 0; - float: none; -} /*------------------------------------------------------------------------------ 16.3 - Custom Header Screen @@ -1704,16 +1459,24 @@ display: none; } -.wp-full-overlay .theme-navigation { +.wp-full-overlay-navigation { + background: #fff; + -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); + box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: inline-block; padding: 10px 20px; position: absolute; - bottom: 10px; - text-align: left; + bottom: 10px; + margin: 20px 0 30px; + width: 100%; } -.wp-full-overlay .theme-navigation .next-theme { +.wp-full-overlay-navigation .next-theme { float: right; } -.wp-full-overlay.no-navigation .theme-navigation { +.wp-full-overlay.no-navigation .wp-full-overlay-navigation { display: none; } Index: trunk/src/wp-admin/css/wp-admin.css =================================================================== --- trunk/src/wp-admin/css/wp-admin.css (revision 29023) +++ trunk/src/wp-admin/css/wp-admin.css (working copy) @@ -12,3 +12,4 @@ @import url(nav-menus.css); @import url(widgets.css); @import url(l10n.css); +@import url(filter.css); Index: trunk/src/wp-admin/js/theme.js =================================================================== --- trunk/src/wp-admin/js/theme.js (revision 29023) +++ trunk/src/wp-admin/js/theme.js (working copy) @@ -105,7 +105,7 @@ // Render and append after screen title view.render(); this.searchContainer - .append( $.parseHTML( '' ) ) + .append( $.parseHTML( '' ) ) .append( view.el ); }, @@ -342,7 +342,7 @@ beforeSend: function() { if ( ! paginated ) { // Spin it - $( 'body' ).addClass( 'loading-themes' ).removeClass( 'no-results' ); + $( 'body' ).addClass( 'loading-content' ).removeClass( 'no-results' ); } } }); @@ -1080,8 +1080,8 @@ themes.view.Search = wp.Backbone.View.extend({ tagName: 'input', - className: 'theme-search', - id: 'theme-search-input', + className: 'wp-filter-search', + id: 'wp-filter-search-input', searching: false, attributes: { @@ -1168,11 +1168,11 @@ }, search: function( query ) { - $( '.theme-search' ).val( query ); + $( '.wp-filter-search' ).val( query ); }, themes: function() { - $( '.theme-search' ).val( '' ); + $( '.wp-filter-search' ).val( '' ); }, navigate: function() { @@ -1229,7 +1229,7 @@ // Handles search route event themes.router.on( 'route:search', function() { - $( '.theme-search' ).trigger( 'keyup' ); + $( '.wp-filter-search' ).trigger( 'keyup' ); }); this.extraRoutes(); @@ -1288,8 +1288,8 @@ request.tag = [ value.slice( 4 ) ]; } - $( '.theme-section.current' ).removeClass( 'current' ); - $( 'body' ).removeClass( 'more-filters-opened filters-applied' ); + $( '.wp-filter-link.current' ).removeClass( 'current' ); + $( 'body' ).removeClass( 'show-filter-drawer filters-applied' ); // Get the themes by sending Ajax POST request to api.wordpress.org/themes // or searching the local cache @@ -1304,16 +1304,16 @@ el: '#wpbody-content .wrap', - // Register events for sorting and filters in theme-navigation + // Register events for sorting and filters in wp-filter events: { - 'click .theme-section': 'onSort', + 'click .wp-filter-link': 'onSort', 'click .theme-filter': 'onFilter', - 'click .more-filters': 'moreFilters', - 'click .apply-filters': 'applyFilters', - 'click [type="checkbox"]': 'addFilter', - 'click .clear-filters': 'clearFilters', - 'click .feature-name': 'filterSection', - 'click .filtering-by a': 'backToFilters' + 'click .wp-filter-drawer-toggle': 'moreFilters', + 'click .wp-filter-drawer-apply': 'applyFilters', + 'click .wp-filter-group [type="checkbox"]': 'addFilter', + 'click .wp-filter-drawer-clear': 'clearFilters', + 'click .wp-filter-group-title': 'filterSection', + 'click .wp-filter-by a': 'backToFilters' }, // Initial render method @@ -1343,12 +1343,12 @@ }); this.listenTo( this.collection, 'query:success', function() { - $( 'body' ).removeClass( 'loading-themes' ); + $( 'body' ).removeClass( 'loading-content' ); $( '.theme-browser' ).find( 'div.error' ).remove(); }); this.listenTo( this.collection, 'query:fail', function() { - $( 'body' ).removeClass( 'loading-themes' ); + $( 'body' ).removeClass( 'loading-content' ); $( '.theme-browser' ).find( 'div.error' ).remove(); $( '.theme-browser' ).find( 'div.themes' ).before( '

' + l10n.error + '

' ); }); @@ -1386,7 +1386,7 @@ event.preventDefault(); - $( 'body' ).removeClass( 'filters-applied more-filters-opened' ); + $( 'body' ).removeClass( 'filters-applied show-filter-drawer' ); // Bail if this is already active if ( $el.hasClass( this.activeClass ) ) { @@ -1402,7 +1402,7 @@ sort: function( sort ) { this.clearSearch(); - $( '.theme-section, .theme-filter' ).removeClass( this.activeClass ); + $( '.wp-filter-link, .theme-filter' ).removeClass( this.activeClass ); $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass ); this.browse( sort ); @@ -1419,7 +1419,7 @@ return; } - $( '.theme-filter, .theme-section' ).removeClass( this.activeClass ); + $( '.wp-filter-link, .theme-filter' ).removeClass( this.activeClass ); $el.addClass( this.activeClass ); if ( ! filter ) { @@ -1446,18 +1446,18 @@ var name, tags = this.filtersChecked(), request = { tag: tags }, - filteringBy = $( '.filtering-by .tags' ); + filteringBy = $( '.wp-filter-by .tags' ); if ( event ) { event.preventDefault(); } $( 'body' ).addClass( 'filters-applied' ); - $( '.theme-section.current' ).removeClass( 'current' ); + $( '.wp-filter-link.current' ).removeClass( 'current' ); filteringBy.empty(); _.each( tags, function( tag ) { - name = $( 'label[for="feature-id-' + tag + '"]' ).text(); + name = $( 'label[for="filter-id-' + tag + '"]' ).text(); filteringBy.append( '' + name + '' ); }); @@ -1469,7 +1469,7 @@ // Get the checked filters // @return {array} of tags or false filtersChecked: function() { - var items = $( '.feature-group' ).find( ':checkbox' ), + var items = $( '.wp-filter-group' ).find( ':checkbox' ), tags = []; _.each( items.filter( ':checked' ), function( item ) { @@ -1478,14 +1478,14 @@ // When no filters are checked, restore initial state and return if ( tags.length === 0 ) { - $( '.apply-filters' ).find( 'span' ).text( '' ); - $( '.clear-filters' ).hide(); + $( '.wp-filter-drawer-apply' ).find( 'span' ).text( '' ); + $( '.wp-filter-drawer-clear' ).hide(); $( 'body' ).removeClass( 'filters-applied' ); return false; } - $( '.apply-filters' ).find( 'span' ).text( tags.length ); - $( '.clear-filters' ).css( 'display', 'inline-block' ); + $( '.wp-filter-drawer-apply' ).find( 'span' ).text( tags.length ); + $( '.wp-filter-drawer-clear' ).css( 'display', 'inline-block' ); return tags; }, @@ -1494,7 +1494,7 @@ // Overwrite search container class to append search // in new location - searchContainer: $( '.theme-navigation' ), + searchContainer: $( '.wp-filter' ), uploader: function() { $( 'a.upload' ).on( 'click', function( event ) { @@ -1519,14 +1519,14 @@ // If the filters section is opened and filters are checked // run the relevant query collapsing to filtered-by state - if ( $( 'body' ).hasClass( 'more-filters-opened' ) && this.filtersChecked() ) { + if ( $( 'body' ).hasClass( 'show-filter-drawer' ) && this.filtersChecked() ) { return this.addFilter(); } this.clearSearch(); themes.router.navigate( themes.router.baseUrl( '' ) ); - $( 'body' ).toggleClass( 'more-filters-opened' ); + $( 'body' ).toggleClass( 'show-filter-drawer' ); }, // Expand/collapse each individual filter section @@ -1537,7 +1537,7 @@ // Clears all the checked filters // @uses filtersChecked() clearFilters: function( event ) { - var items = $( '.feature-group' ).find( ':checkbox' ), + var items = $( '.wp-filter-group' ).find( ':checkbox' ), self = this; event.preventDefault(); @@ -1557,7 +1557,7 @@ }, clearSearch: function() { - $( '#theme-search-input').val( '' ); + $( '#wp-filter-search-input').val( '' ); } }); @@ -1575,7 +1575,7 @@ }, search: function( query ) { - $( '.theme-search' ).val( query ); + $( '.wp-filter-search' ).val( query ); }, navigate: function() { @@ -1647,7 +1647,7 @@ // The `search` route event. The router populates the input field. themes.router.on( 'route:search', function() { - $( '.theme-search' ).focus().trigger( 'keyup' ); + $( '.wp-filter-search' ).focus().trigger( 'keyup' ); }); this.extraRoutes(); Index: trunk/src/wp-admin/theme-install.php =================================================================== --- trunk/src/wp-admin/theme-install.php (revision 29023) +++ trunk/src/wp-admin/theme-install.php (working copy) @@ -134,48 +134,62 @@ -
- - - - -
- - +
+
+
-
- - -
+
    + 'Featured', + 'popular' => 'Popular', + 'new' => 'Latest', + ); + foreach( $filter_links as $filter_link_sort => $filter_link_text ) { ?> +
  • + + + +
    • + +
+ + + +
+
+ + +
$features ) { if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack - echo '
'; + echo '
'; } else { - echo '
'; + echo '
'; } $feature_name = esc_html( $feature_name ); - echo '

' . $feature_name . '

'; - echo '
    '; + echo '

    ' . $feature_name . '

    '; + echo '
      '; foreach ( $features as $feature => $feature_name ) { $feature = esc_attr( $feature ); - echo '
    1. '; - echo '
      2. '; + echo '
    2. '; + echo '
      3. '; } echo '
    '; echo '
'; } ?> -
+
-
+ +

@@ -262,7 +276,7 @@ -
+
Index: trunk/src/wp-admin/themes.php =================================================================== --- trunk/src/wp-admin/themes.php (revision 29023) +++ trunk/src/wp-admin/themes.php (working copy) @@ -117,7 +117,7 @@

- +