Skip to content

Commit 1ce036f

Browse files
committed
Merge branch 'trunk' of https://github.com/sabernhardt/wordpress-develop into trunk
2 parents b3ee28a + a1cf525 commit 1ce036f

140 files changed

Lines changed: 709 additions & 158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gruntfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,7 @@ module.exports = function(grunt) {
10331033
cwd: SOURCE_DIR,
10341034
src: [
10351035
'wp-{admin,includes}/images/**/*.{png,jpg,gif,jpeg}',
1036+
'wp-content/themes/**/*.{png,jpg,gif,jpeg}',
10361037
'wp-includes/js/tinymce/skins/wordpress/images/*.{png,jpg,gif,jpeg}'
10371038
],
10381039
dest: SOURCE_DIR

src/wp-admin/css/list-tables.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,6 +2143,11 @@ div.action-links,
21432143
padding: 10px 9px; /* reset from other list tables that have a label at this width */
21442144
}
21452145

2146+
#wpbody-content .wp-list-table.plugins .plugin-deleted-tr td,
2147+
#wpbody-content .wp-list-table.plugins .no-items td {
2148+
display: table-cell;
2149+
}
2150+
21462151
/* Plugin description hidden via Screen Options */
21472152
#wpbody-content .wp-list-table.plugins .desc.hidden {
21482153
display: none;
0 Bytes

src/wp-admin/images/loading.gif

-4 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes

src/wp-admin/images/xit.gif

0 Bytes
68 Bytes

0 commit comments

Comments
 (0)