<!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>[29596] trunk/src/wp-admin: Make filter bar CSS less verbose and redundant.</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/29596">29596</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-25 15:57:34 +0000 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make filter bar CSS less verbose and redundant.
Also removes an unused handler in the theme feature filter.
see <a href="http://core.trac.wordpress.org/ticket/28794">#28794</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/common.css (29595 => 29596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/common.css 2014-08-25 15:27:45 UTC (rev 29595)
+++ trunk/src/wp-admin/css/common.css 2014-08-25 15:57:34 UTC (rev 29596)
</span><span class="lines">@@ -934,22 +934,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Filter bar */
</span><del>-
-.wp-title-count {
- display: inline;
- position: relative;
- top: -3px;
- margin-left: 5px;
- margin-right: 20px;
- padding: 4px 10px;
- -webkit-border-radius: 30px;
- border-radius: 30px;
- background: #777;
- color: #fff;
- font-size: 14px;
- font-weight: 600;
-}
-
</del><span class="cx"> .wp-filter {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> position: relative;
</span><span class="lines">@@ -971,13 +955,14 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-count {
</del><ins>+.filter-count {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> min-width: 4em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-count .count {
</del><ins>+.title-count,
+.filter-count .count {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> position: relative;
</span><span class="cx"> top: -1px;
</span><span class="lines">@@ -990,17 +975,25 @@
</span><span class="cx"> font-weight: 600;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-links {
</del><ins>+/* not a part of filter bar, but derived from it, so here for now */
+.title-count {
+ display: inline;
+ top: -3px;
+ margin-left: 5px;
+ margin-right: 20px;
+}
+
+.filter-links {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-links li {
</del><ins>+.filter-links li {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-link {
</del><ins>+.filter-links li > a {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> margin: 0 10px;
</span><span class="cx"> padding: 15px 0;
</span><span class="lines">@@ -1009,16 +1002,25 @@
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-links .current {
</del><ins>+.filter-links .current {
+ box-shadow: none;
</ins><span class="cx"> border-bottom: 4px solid #666;
</span><span class="cx"> color: #222;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-search {
- position: absolute;
- top: 9px;
- right: 10px;
- left: auto;
</del><ins>+.filter-links li > a:hover,
+.filter-links li > a:focus,
+.show-filters .filter-links a.current:hover,
+.show-filters .filter-links a.current:focus {
+ color: #2ea2cc;
+}
+
+.wp-filter .search-form {
+ float: right;
+ margin-top: 9px;
+}
+
+.wp-filter .search-form input[type="search"] {
</ins><span class="cx"> padding: 3px 5px;
</span><span class="cx"> width: 280px;
</span><span class="cx"> font-size: 16px;
</span><span class="lines">@@ -1026,16 +1028,12 @@
</span><span class="cx"> line-height: 1.5;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-no-results {
- color: #999;
- font-size: 18px;
- font-style: normal;
- margin: 0;
- padding: 100px 0 0;
- text-align: center;
</del><ins>+.wp-filter .search-form select {
+ height: 33px;
+ vertical-align: top;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer-toggle {
</del><ins>+.wp-filter .drawer-toggle {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> margin: 0 10px;
</span><span class="cx"> padding: 4px 6px;
</span><span class="lines">@@ -1043,7 +1041,7 @@
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer-toggle:before {
</del><ins>+.wp-filter .drawer-toggle:before {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> vertical-align: top;
</span><span class="cx"> content: "\f111";
</span><span class="lines">@@ -1063,15 +1061,16 @@
</span><span class="cx"> -webkit-font-smoothing: antialiased;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer-toggle:hover {
- color: #777;
</del><ins>+.wp-filter .drawer-toggle:hover,
+.wp-filter .drawer-toggle:hover:before {
+ color: #2ea2cc;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer-toggle.current:before {
</del><ins>+.wp-filter .drawer-toggle.current:before {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer {
</del><ins>+.filter-drawer {
</ins><span class="cx"> display: none;
</span><span class="cx"> margin: 0 -20px;
</span><span class="cx"> padding: 20px;
</span><span class="lines">@@ -1079,21 +1078,21 @@
</span><span class="cx"> background: #fafafa;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer .wp-filter-drawer {
</del><ins>+.show-filters .filter-drawer {
</ins><span class="cx"> display: block;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer .wp-filter-drawer-toggle:hover,
-body.show-filter-drawer .wp-filter-drawer-toggle:focus {
</del><ins>+.show-filters .wp-filter .drawer-toggle:hover,
+.show-filters .wp-filter .drawer-toggle:focus {
</ins><span class="cx"> background: rgb(46, 162, 204);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer .wp-filter-link.current {
</del><ins>+.show-filters .filter-links a.current {
</ins><span class="cx"> border-bottom: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer .wp-filter-drawer-toggle {
</del><ins>+.show-filters .wp-filter .drawer-toggle {
</ins><span class="cx"> -webkit-border-radius: 2px;
</span><span class="cx"> border-radius: 2px;
</span><span class="cx"> border: none;
</span><span class="lines">@@ -1101,11 +1100,11 @@
</span><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer .wp-filter-drawer-toggle:before {
</del><ins>+.show-filters .wp-filter .drawer-toggle:before {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-group {
</del><ins>+.filter-group {
</ins><span class="cx"> -webkit-box-sizing: border-box;
</span><span class="cx"> -moz-box-sizing: border-box;
</span><span class="cx"> box-sizing: border-box;
</span><span class="lines">@@ -1119,22 +1118,22 @@
</span><span class="cx"> box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-group-wide {
</del><ins>+.filter-group.wide {
</ins><span class="cx"> width: 38%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-group-title {
</del><ins>+.filter-group h4 {
</ins><span class="cx"> position: relative;
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer ol {
</del><ins>+.filter-drawer ol {
</ins><span class="cx"> margin: 20px 0 0;
</span><span class="cx"> list-style-type: none;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer li {
</del><ins>+.filter-drawer li {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> vertical-align: top;
</span><span class="cx"> margin: 5px 0;
</span><span class="lines">@@ -1143,11 +1142,11 @@
</span><span class="cx"> list-style-type: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-drawer-buttons {
</del><ins>+.filter-drawer .buttons {
</ins><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter .wp-filter-drawer-buttons .button span {
</del><ins>+.filter-drawer .buttons .button span {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> opacity: 0.8;
</span><span class="cx"> font-size: 12px;
</span><span class="lines">@@ -1159,24 +1158,24 @@
</span><span class="cx"> margin: 0 0 20px 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-by {
</del><ins>+.filtered-by {
</ins><span class="cx"> display: none;
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-by > span {
</del><ins>+.filtered-by > span {
</ins><span class="cx"> font-weight: 600;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-by a {
</del><ins>+.filtered-by a {
</ins><span class="cx"> margin-left: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-by .tags {
</del><ins>+.filtered-by .tags {
</ins><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-filter-by .tag {
</del><ins>+.filtered-by .tag {
</ins><span class="cx"> margin: 0 5px;
</span><span class="cx"> padding: 4px 8px;
</span><span class="cx"> border: 1px solid #e5e5e5;
</span><span class="lines">@@ -1186,34 +1185,31 @@
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.filters-applied .wp-filter-group,
-body.filters-applied .wp-filter-drawer a.button,
-body.filters-applied .wp-filter-drawer br {
</del><ins>+.filters-applied .filter-group,
+.filters-applied .filter-drawer .buttons,
+.filters-applied .filter-drawer br {
</ins><span class="cx"> display: none !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.filters-applied .wp-filter-by {
</del><ins>+.filters-applied .filtered-by {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.filters-applied .wp-filter-drawer {
</del><ins>+.filters-applied .filter-drawer {
</ins><span class="cx"> padding: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer .wp-filter-content,
-body.show-filter-drawer.filters-applied.loading-content .wp-filter-content {
</del><ins>+.show-filters .content-filterable,
+.show-filters.filters-applied.loading-content .content-filterable,
+.loading-content .content-filterable,
+.error .content-filterable {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.show-filter-drawer.filters-applied .wp-filter-content {
</del><ins>+.show-filters.filters-applied .content-filterable {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.loading-content .wp-filter-content,
-.error .wp-filter-content {
- display: none;
-}
-
</del><span class="cx"> .loading-content .spinner {
</span><span class="cx"> display: block;
</span><span class="cx"> margin: 40px auto 0;
</span><span class="lines">@@ -1221,30 +1217,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media only screen and (max-width: 1120px) {
</span><del>- .wp-filter-search {
- position: static;
</del><ins>+ .wp-filter .search-form {
+ float: none;
</ins><span class="cx"> margin: 20px 0;
</span><del>- width: 100%;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- .wp-filter-drawer {
</del><ins>+ .filter-drawer {
</ins><span class="cx"> border-bottom: 1px solid #eee;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .wp-filter-group {
</del><ins>+ .filter-group {
</ins><span class="cx"> margin-bottom: 0;
</span><span class="cx"> margin-top: 5px;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .wp-filter-group li {
</del><ins>+ .filter-group li {
</ins><span class="cx"> margin: 10px 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media only screen and (max-width: 782px) {
</span><del>- .wp-filter-group,
- .wp-filter-group li {
</del><ins>+ .filter-group,
+ .filter-group li {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (29595 => 29596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js 2014-08-25 15:27:45 UTC (rev 29595)
+++ trunk/src/wp-admin/js/theme.js 2014-08-25 15:57:34 UTC (rev 29596)
</span><span class="lines">@@ -1288,8 +1288,8 @@
</span><span class="cx"> request.tag = [ value.slice( 4 ) ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $( '.wp-filter-link.current' ).removeClass( 'current' );
- $( 'body' ).removeClass( 'show-filter-drawer filters-applied' );
</del><ins>+ $( '.filter-links li > a.current' ).removeClass( 'current' );
+ $( 'body' ).removeClass( 'show-filters filters-applied' );
</ins><span class="cx">
</span><span class="cx"> // Get the themes by sending Ajax POST request to api.wordpress.org/themes
</span><span class="cx"> // or searching the local cache
</span><span class="lines">@@ -1306,14 +1306,13 @@
</span><span class="cx">
</span><span class="cx"> // Register events for sorting and filters in theme-navigation
</span><span class="cx"> events: {
</span><del>- 'click .wp-filter-link': 'onSort',
</del><ins>+ 'click .filter-links li > a': 'onSort',
</ins><span class="cx"> 'click .theme-filter': 'onFilter',
</span><del>- 'click .wp-filter-drawer-toggle': 'moreFilters',
- 'click .wp-filter-drawer .apply-filters': 'applyFilters',
- 'click .wp-filter-group [type="checkbox"]': 'addFilter',
- 'click .wp-filter-drawer .clear-filters': 'clearFilters',
- 'click .wp-filter-group-title': 'filterSection',
- 'click .wp-filter-by a': 'backToFilters'
</del><ins>+ 'click .drawer-toggle': 'moreFilters',
+ 'click .filter-drawer .apply-filters': 'applyFilters',
+ 'click .filter-group [type="checkbox"]': 'addFilter',
+ 'click .filter-drawer .clear-filters': 'clearFilters',
+ 'click .filtered-by': 'backToFilters'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Initial render method
</span><span class="lines">@@ -1386,7 +1385,7 @@
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx">
</span><del>- $( 'body' ).removeClass( 'filters-applied show-filter-drawer' );
</del><ins>+ $( 'body' ).removeClass( 'filters-applied show-filters' );
</ins><span class="cx">
</span><span class="cx"> // Bail if this is already active
</span><span class="cx"> if ( $el.hasClass( this.activeClass ) ) {
</span><span class="lines">@@ -1402,7 +1401,7 @@
</span><span class="cx"> sort: function( sort ) {
</span><span class="cx"> this.clearSearch();
</span><span class="cx">
</span><del>- $( '.wp-filter-link, .theme-filter' ).removeClass( this.activeClass );
</del><ins>+ $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
</ins><span class="cx"> $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
</span><span class="cx">
</span><span class="cx"> this.browse( sort );
</span><span class="lines">@@ -1419,7 +1418,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $( '.wp-filter-link, .theme-section' ).removeClass( this.activeClass );
</del><ins>+ $( '.filter-links li > a, .theme-section' ).removeClass( this.activeClass );
</ins><span class="cx"> $el.addClass( this.activeClass );
</span><span class="cx">
</span><span class="cx"> if ( ! filter ) {
</span><span class="lines">@@ -1446,14 +1445,14 @@
</span><span class="cx"> var name,
</span><span class="cx"> tags = this.filtersChecked(),
</span><span class="cx"> request = { tag: tags },
</span><del>- filteringBy = $( '.wp-filter-by .tags' );
</del><ins>+ filteringBy = $( '.filtered-by .tags' );
</ins><span class="cx">
</span><span class="cx"> if ( event ) {
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $( 'body' ).addClass( 'filters-applied' );
</span><del>- $( '.wp-filter-link.current' ).removeClass( 'current' );
</del><ins>+ $( '.filter-links li > a.current' ).removeClass( 'current' );
</ins><span class="cx"> filteringBy.empty();
</span><span class="cx">
</span><span class="cx"> _.each( tags, function( tag ) {
</span><span class="lines">@@ -1469,7 +1468,7 @@
</span><span class="cx"> // Get the checked filters
</span><span class="cx"> // @return {array} of tags or false
</span><span class="cx"> filtersChecked: function() {
</span><del>- var items = $( '.wp-filter-group' ).find( ':checkbox' ),
</del><ins>+ var items = $( '.filter-group' ).find( ':checkbox' ),
</ins><span class="cx"> tags = [];
</span><span class="cx">
</span><span class="cx"> _.each( items.filter( ':checked' ), function( item ) {
</span><span class="lines">@@ -1478,14 +1477,14 @@
</span><span class="cx">
</span><span class="cx"> // When no filters are checked, restore initial state and return
</span><span class="cx"> if ( tags.length === 0 ) {
</span><del>- $( '.wp-filter-drawer .apply-filters' ).find( 'span' ).text( '' );
- $( '.wp-filter-drawer .clear-filters' ).hide();
</del><ins>+ $( '.filter-drawer .apply-filters' ).find( 'span' ).text( '' );
+ $( '.filter-drawer .clear-filters' ).hide();
</ins><span class="cx"> $( 'body' ).removeClass( 'filters-applied' );
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $( '.wp-filter-drawer .apply-filters' ).find( 'span' ).text( tags.length );
- $( '.wp-filter-drawer .clear-filters' ).css( 'display', 'inline-block' );
</del><ins>+ $( '.filter-drawer .apply-filters' ).find( 'span' ).text( tags.length );
+ $( '.filter-drawer .clear-filters' ).css( 'display', 'inline-block' );
</ins><span class="cx">
</span><span class="cx"> return tags;
</span><span class="cx"> },
</span><span class="lines">@@ -1494,7 +1493,7 @@
</span><span class="cx">
</span><span class="cx"> // Overwrite search container class to append search
</span><span class="cx"> // in new location
</span><del>- searchContainer: $( '.wp-filter' ),
</del><ins>+ searchContainer: $( '.wp-filter .search-form' ),
</ins><span class="cx">
</span><span class="cx"> uploader: function() {
</span><span class="cx"> $( 'a.upload' ).on( 'click', function( event ) {
</span><span class="lines">@@ -1519,25 +1518,20 @@
</span><span class="cx">
</span><span class="cx"> // If the filters section is opened and filters are checked
</span><span class="cx"> // run the relevant query collapsing to filtered-by state
</span><del>- if ( $( 'body' ).hasClass( 'show-filter-drawer' ) && this.filtersChecked() ) {
</del><ins>+ if ( $( 'body' ).hasClass( 'show-filters' ) && this.filtersChecked() ) {
</ins><span class="cx"> return this.addFilter();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.clearSearch();
</span><span class="cx">
</span><span class="cx"> themes.router.navigate( themes.router.baseUrl( '' ) );
</span><del>- $( 'body' ).toggleClass( 'show-filter-drawer' );
</del><ins>+ $( 'body' ).toggleClass( 'show-filters' );
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- // Expand/collapse each individual filter section
- filterSection: function() {
- $( event.target ).parent().toggleClass( 'open' );
- },
-
</del><span class="cx"> // Clears all the checked filters
</span><span class="cx"> // @uses filtersChecked()
</span><span class="cx"> clearFilters: function( event ) {
</span><del>- var items = $( '.wp-filter-group' ).find( ':checkbox' ),
</del><ins>+ var items = $( '.filter-group' ).find( ':checkbox' ),
</ins><span class="cx"> self = this;
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/theme-install.php (29595 => 29596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/theme-install.php 2014-08-25 15:27:45 UTC (rev 29595)
+++ trunk/src/wp-admin/theme-install.php 2014-08-25 15:57:34 UTC (rev 29596)
</span><span class="lines">@@ -135,20 +135,22 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="wp-filter">
</span><del>- <div class="wp-filter-count">
</del><ins>+ <div class="filter-count">
</ins><span class="cx"> <span class="count theme-count"></span>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <ul class="wp-filter-links">
- <li><a class="wp-filter-link" href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
- <li><a class="wp-filter-link" href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
- <li><a class="wp-filter-link" href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
</del><ins>+ <ul class="filter-links">
+ <li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
+ <li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
+ <li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
</ins><span class="cx"> </ul>
</span><span class="cx">
</span><del>- <a class="wp-filter-drawer-toggle" href="#"><?php _e( 'Feature Filter' ); ?></a>
</del><ins>+ <a class="drawer-toggle" href="#"><?php _e( 'Feature Filter' ); ?></a>
</ins><span class="cx">
</span><del>- <div class="wp-filter-drawer">
- <div class="wp-filter-drawer-buttons">
</del><ins>+ <div class="search-form"></div>
+
+ <div class="filter-drawer">
+ <div class="buttons">
</ins><span class="cx"> <a class="apply-filters button button-secondary" href="#"><?php _e( 'Apply Filters' ); ?><span></span></a>
</span><span class="cx"> <a class="clear-filters button button-secondary" href="#"><?php _e( 'Clear' ); ?></a>
</span><span class="cx"> </div>
</span><span class="lines">@@ -156,12 +158,12 @@
</span><span class="cx"> $feature_list = get_theme_feature_list();
</span><span class="cx"> foreach ( $feature_list as $feature_name => $features ) {
</span><span class="cx"> if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack
</span><del>- echo '<div class="wp-filter-group wp-filter-group-wide">';
</del><ins>+ echo '<div class="filter-group wide">';
</ins><span class="cx"> } else {
</span><del>- echo '<div class="wp-filter-group">';
</del><ins>+ echo '<div class="filter-group">';
</ins><span class="cx"> }
</span><span class="cx"> $feature_name = esc_html( $feature_name );
</span><del>- echo '<h4 class="wp-filter-group-title">' . $feature_name . '</h4>';
</del><ins>+ echo '<h4>' . $feature_name . '</h4>';
</ins><span class="cx"> echo '<ol class="feature-group">';
</span><span class="cx"> foreach ( $features as $feature => $feature_name ) {
</span><span class="cx"> $feature = esc_attr( $feature );
</span><span class="lines">@@ -172,14 +174,14 @@
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <div class="wp-filter-by">
</del><ins>+ <div class="filtered-by">
</ins><span class="cx"> <span><?php _e( 'Filtering by:' ); ?></span>
</span><span class="cx"> <div class="tags"></div>
</span><span class="cx"> <a href="#"><?php _e( 'Edit' ); ?></a>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>- <div class="theme-browser wp-filter-content"></div>
</del><ins>+ <div class="theme-browser content-filterable"></div>
</ins><span class="cx"> <div class="theme-install-overlay wp-full-overlay expanded"></div>
</span><span class="cx">
</span><span class="cx"> <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/themes.php (29595 => 29596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/themes.php 2014-08-25 15:27:45 UTC (rev 29595)
+++ trunk/src/wp-admin/themes.php 2014-08-25 15:57:34 UTC (rev 29596)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <h2><?php esc_html_e( 'Themes' ); ?>
</span><del>- <span class="wp-title-count theme-count"><?php echo count( $themes ); ?></span>
</del><ins>+ <span class="title-count theme-count"><?php echo count( $themes ); ?></span>
</ins><span class="cx"> <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
</span><span class="cx"> <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html( _x( 'Add New', 'Add new theme' ) ); ?></a>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>