From d5c3a966be4193a90aa140de2a22eb6bc1edf277 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Tue, 8 Apr 2014 04:30:01 +0000
Subject: [PATCH] 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
---
 src/wp-admin/css/themes.css     |  3 +++
 src/wp-admin/includes/theme.php | 12 ++++--------
 src/wp-admin/theme-install.php  |  6 +++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index b78d727a3d..18bc7adeef 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -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;
diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php
index 0853fa62db..aa3441c3ed 100644
--- a/src/wp-admin/includes/theme.php
+++ b/src/wp-admin/includes/theme.php
@@ -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' )
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 18d6ff4c09..6df165d545 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -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">';