Site Logo: Fix default size (#30846)

Add a new "is-default-size" class, and attach the 120px width to it.
WordPress · Apr 15, 2021 · a0f7498 · a0f7498
1 parent 3b1360e
commit a0f7498
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/packages/block-library/src/site-logo/edit.js b/packages/block-library/src/site-logo/edit.js
@@ -337,7 +337,7 @@ export default function LogoEdit( {
 	);
 
 	const classes = classnames( className, {
-		'is-resized': !! width,
+		'is-default-size': ! width,
 	} );
 
 	const blockProps = useBlockProps( {

diff --git a/packages/block-library/src/site-logo/editor.scss b/packages/block-library/src/site-logo/editor.scss
@@ -10,12 +10,12 @@
 		pointer-events: none;
 	}
 
-	&.is-resized {
+	&:not(.is-default-size) {
 		display: table;
 	}
 
 	// Provide a sane starting point for the size.
-	&:not(.is-resized) {
+	&.is-default-size {
 		width: 120px;
 
 		img {

diff --git a/packages/block-library/src/site-logo/index.php b/packages/block-library/src/site-logo/index.php
@@ -32,6 +32,10 @@ function render_block_core_site_logo( $attributes ) {
 		$classnames[] = "align{$attributes['align']}";
 	}
 
+	if ( empty( $attributes['width'] ) ) {
+		$classnames[] = 'is-default-size';
+	}
+
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classnames ) ) );
 	$html               = sprintf( '<div %s>%s</div>', $wrapper_attributes, $custom_logo );
 	remove_filter( 'wp_get_attachment_image_src', $adjust_width_height_filter );

diff --git a/packages/block-library/src/site-logo/style.scss b/packages/block-library/src/site-logo/style.scss
@@ -6,8 +6,9 @@
 	}
 
 	// Provide a sane starting point for the size.
-	&:not(.is-resized) img {
+	&.is-default-size img {
 		width: 120px;
+		height: auto;
 	}
 
 	.aligncenter {