Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 15:47:38 +02:00
Code Issues Projects Releases Wiki Activity

Theme Installer: Combine 'Layout' and 'Columns' filters so 'Features' can span two columns.

Browse Source 
see #27055.

Built from https://develop.svn.wordpress.org/trunk@28037


git-svn-id: http://core.svn.wordpress.org/trunk@27867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-04-08 04:30:15 +00:00
parent 640d9cb1a1
commit e7fc009f7c
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/css/themes-rtl.css
View File

@ -1269,6 +1269,9 @@ body.more-filters-opened.filters-applied .theme-browser {
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;

3
wp-admin/css/themes.css
View File

@ -1269,6 +1269,9 @@ body.more-filters-opened.filters-applied .theme-browser {
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;

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

12
wp-admin/includes/theme.php
View File

@ -192,7 +192,10 @@ function get_theme_feature_list( $api = true ) {
'light' => __( 'Light' ),
),
__( 'Columns' ) => array(
__( 'Layout' ) => array(
'fixed-layout' => __( 'Fixed Layout' ),
'fluid-layout' => __( 'Fluid Layout' ),
'responsive-layout' => __( 'Responsive Layout' ),
'one-column' => __( 'One Column' ),
'two-columns' => __( 'Two Columns' ),
'three-columns' => __( 'Three Columns' ),
@ -201,12 +204,6 @@ function get_theme_feature_list( $api = true ) {
'right-sidebar' => __( 'Right Sidebar' ),
),
__( 'Layout' ) => array(
'fixed-layout' => __( 'Fixed Layout' ),
'fluid-layout' => __( 'Fluid Layout' ),
'responsive-layout' => __( 'Responsive Layout' ),
),
__( 'Features' ) => array(
'accessibility-ready' => __( 'Accessibility Ready' ),
'blavatar' => __( 'Blavatar' ),
@ -256,7 +253,6 @@ function get_theme_feature_list( $api = true ) {
$category_translations = array(
'Colors' => __( 'Colors' ),
'Columns' => __( 'Columns' ),
'Layout' => __( 'Layout' ),
'Features' => __( 'Features' ),
'Subject' => __( 'Subject' )

6
wp-admin/theme-install.php
View File

@ -137,7 +137,11 @@ include(ABSPATH . 'wp-admin/admin-header.php');
<?php
$feature_list = get_theme_feature_list();
foreach ( $feature_list as $feature_name => $features ) {
echo '<div class="filters-group">';
if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack
echo '<div class="filters-group wide-filters-group">';
} else {
echo '<div class="filters-group">';
}
$feature_name = esc_html( $feature_name );
echo '<h4 class="feature-name">' . $feature_name . '</h4>';
echo '<ol class="feature-group">';