Merge pull request #4202 from WordPress/update/latest-posts-list-columns

Latest Posts: Use `columns-x` class only for grid layout
WordPress · Jan 10, 2018 · 213c64b · 213c64b
2 parents af8826b + eb1b301
commit 213c64b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/blocks/library/latest-posts/block.js b/blocks/library/latest-posts/block.js
@@ -127,8 +127,9 @@ class LatestPostsBlock extends Component {
 				</BlockControls>
 			),
 			<ul
-				className={ classnames( this.props.className, 'columns-' + columns, {
+				className={ classnames( this.props.className, {
 					'is-grid': layout === 'grid',
+					[ `columns-${ columns }` ]: layout === 'grid',
 				} ) }
 				key="latest-posts"
 			>

diff --git a/blocks/library/latest-posts/index.php b/blocks/library/latest-posts/index.php
@@ -52,7 +52,7 @@ function gutenberg_render_block_core_latest_posts( $attributes ) {
 		$class .= ' is-grid';
 	}
 
-	if ( isset( $attributes['columns'] ) ) {
+	if ( isset( $attributes['columns'] ) && 'grid' === $attributes['layout'] ) {
 		$class .= ' columns-' . $attributes['columns'];
 	}