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

see #27055.


git-svn-id: https://develop.svn.wordpress.org/trunk@28037 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2014-04-08 04:30:01 +00:00
parent 62b57b3b1f
commit d5c3a966be
3 changed files with 12 additions and 9 deletions

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' )