WordPress.org

Make WordPress Core

Changeset 28037


Ignore:
Timestamp:
04/08/2014 04:30:01 AM (6 years ago)
Author:
nacin
Message:

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

see #27055.

Location:
trunk/src/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/css/themes.css

    r28033 r28037  
    12701270    padding: 10px;
    12711271}
     1272.more-filters-container .wide-filters-group {
     1273    width: 38%;
     1274}
    12721275.more-filters-container .feature-name {
    12731276    margin: 0;
  • trunk/src/wp-admin/includes/theme.php

    r27748 r28037  
    193193            ),
    194194
    195         __( 'Columns' ) => array(
     195        __( 'Layout' ) => array(
     196            'fixed-layout'      => __( 'Fixed Layout' ),
     197            'fluid-layout'      => __( 'Fluid Layout' ),
     198            'responsive-layout' => __( 'Responsive Layout' ),
    196199            'one-column'    => __( 'One Column' ),
    197200            'two-columns'   => __( 'Two Columns' ),
     
    200203            'left-sidebar'  => __( 'Left Sidebar' ),
    201204            'right-sidebar' => __( 'Right Sidebar' ),
    202         ),
    203 
    204         __( 'Layout' ) => array(
    205             'fixed-layout'      => __( 'Fixed Layout' ),
    206             'fluid-layout'      => __( 'Fluid Layout' ),
    207             'responsive-layout' => __( 'Responsive Layout' ),
    208205        ),
    209206
     
    257254    $category_translations = array(
    258255        'Colors'   => __( 'Colors' ),
    259         'Columns'  => __( 'Columns' ),
    260256        'Layout'   => __( 'Layout' ),
    261257        'Features' => __( 'Features' ),
  • trunk/src/wp-admin/theme-install.php

    r28033 r28037  
    138138        $feature_list = get_theme_feature_list();
    139139        foreach ( $feature_list as $feature_name => $features ) {
    140             echo '<div class="filters-group">';
     140            if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack
     141                echo '<div class="filters-group wide-filters-group">';
     142            } else {
     143                echo '<div class="filters-group">';
     144            }
    141145            $feature_name = esc_html( $feature_name );
    142146            echo '<h4 class="feature-name">' . $feature_name . '</h4>';
Note: See TracChangeset for help on using the changeset viewer.