Commit ce4132da83f for woocommerce
commit ce4132da83fe8efb17346c2734a64bdf36818b9d
Author: yjailin <yoann.jailin@automattic.com>
Date: Tue Jul 21 14:53:02 2026 -0400
Fix: make coming soon page theme-aware and simplify layout (#65816)
* Fix: make coming soon page theme-aware and simplify layout
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: revert to wp:loginout block, remove hardcoded styles
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* fix: switch login control back to wp:button with is-style-outline
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff --git a/plugins/woocommerce/changelog/fix-coming-soon-page-theme-aware b/plugins/woocommerce/changelog/fix-coming-soon-page-theme-aware
new file mode 100644
index 00000000000..eb68837fe56
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-coming-soon-page-theme-aware
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix: make coming soon page theme-aware and simplify layout
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/coming-soon/entire-site.scss b/plugins/woocommerce/client/blocks/assets/js/blocks/coming-soon/entire-site.scss
index 2d26321b54a..f7ce5606347 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/coming-soon/entire-site.scss
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/coming-soon/entire-site.scss
@@ -5,9 +5,6 @@
}
.woocommerce-coming-soon-default {
- // This is default font family when no font family is selected. Users can override this in the block settings.
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
- Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
min-width: 320px;
// Set the background color to the coming soon color since some themes may have a different background color.
--cover--color-background: var(--woocommerce-coming-soon-color);
@@ -68,3 +65,16 @@
aspect-ratio: 1 / 1;
}
}
+
+.woocommerce-coming-soon-header-logo-title {
+ min-width: 0;
+}
+
+.woocommerce-coming-soon-header-login {
+ flex-shrink: 0;
+ min-width: 0;
+}
+
+.woocommerce-coming-soon-header-logo-title .wp-block-site-title {
+ font-size: clamp(var(--wp--preset--font-size--medium), 3.5vw, var(--wp--preset--font-size--x-large));
+}
diff --git a/plugins/woocommerce/patterns/page-coming-soon-default.php b/plugins/woocommerce/patterns/page-coming-soon-default.php
index 4849cfef21a..d5c80aadf4b 100644
--- a/plugins/woocommerce/patterns/page-coming-soon-default.php
+++ b/plugins/woocommerce/patterns/page-coming-soon-default.php
@@ -7,46 +7,45 @@
* Inserter: false
*/
-use Automattic\WooCommerce\Blocks\Templates\ComingSoonTemplate;
-
-$fonts = ComingSoonTemplate::get_font_families();
-$heading_font_family = $fonts['heading'];
-$body_font_family = $fonts['body'];
-
?>
-<!-- wp:woocommerce/coming-soon {"comingSoonPatternId":"page-coming-soon-default","className":"woocommerce-coming-soon-default","style":{"color":{"background":"#bea0f2","text":"#000000"},"elements":{"link":{"color":{"text":"#000000"}}}}} -->
-<div class="wp-block-woocommerce-coming-soon woocommerce-coming-soon-default has-text-color has-background has-link-color" style="color:#000000;background-color:#bea0f2"><!-- wp:cover {"customOverlayColor":"transparent","isUserOverlayColor":true,"minHeight":100,"minHeightUnit":"vh","className":"coming-soon-is-vertically-aligned-center coming-soon-cover","style":{"spacing":{"padding":{"top":"0px","bottom":"0px","left":"24px","right":"24px"}},"color":{"text":"inherit"},"elements":{"link":{"color":{"text":"inherit"}}}},"layout":{"type":"constrained","wideSize":"1280px"}} -->
+<!-- wp:woocommerce/coming-soon {"comingSoonPatternId":"page-coming-soon-default","className":"woocommerce-coming-soon-default"} -->
+<div class="wp-block-woocommerce-coming-soon woocommerce-coming-soon-default"><!-- wp:cover {"customOverlayColor":"transparent","isUserOverlayColor":true,"minHeight":100,"minHeightUnit":"vh","className":"coming-soon-is-vertically-aligned-center coming-soon-cover","style":{"spacing":{"padding":{"top":"0px","bottom":"0px","left":"24px","right":"24px"}},"color":{"text":"inherit"},"elements":{"link":{"color":{"text":"inherit"}}}},"layout":{"type":"constrained","wideSize":"1280px"}} -->
<div class="wp-block-cover coming-soon-is-vertically-aligned-center coming-soon-cover has-text-color has-link-color" style="color:inherit;padding-top:0px;padding-right:24px;padding-bottom:0px;padding-left:24px;min-height:100vh"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim" style="background-color:transparent"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"className":"woocommerce-coming-soon-banner-container","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"blockGap":"0px"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
<div class="wp-block-group woocommerce-coming-soon-banner-container" style="min-height:100vh"><!-- wp:group {"align":"wide","className":"woocommerce-coming-soon-header has-background","style":{"spacing":{"padding":{"bottom":"14px","top":"26px"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignwide woocommerce-coming-soon-header has-background" style="padding-top:26px;padding-bottom:14px"><!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between","flexWrap":"wrap"}} -->
-<div class="wp-block-group alignwide"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex"}} -->
-<div class="wp-block-group"><!-- wp:site-logo {"width":60,"style":{"layout":{"selfStretch":"fit","flexSize":null}}} /-->
+<div class="wp-block-group alignwide woocommerce-coming-soon-header has-background" style="padding-top:26px;padding-bottom:14px"><!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between","flexWrap":"nowrap"}} -->
+<div class="wp-block-group alignwide"><!-- wp:group {"className":"woocommerce-coming-soon-header-logo-title","style":{"spacing":{"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group woocommerce-coming-soon-header-logo-title"><!-- wp:site-logo {"width":60,"style":{"layout":{"selfStretch":"fit","flexSize":null}}} /-->
<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}}} -->
-<div class="wp-block-group"><!-- wp:site-title {"level":0,"style":{"typography":{"fontSize":"20px","letterSpacing":"0px"},"color":{"text":"#000000"},"elements":{"link":{"color":{"text":"#000000"}}}},"fontFamily":"<?php echo esc_html( $body_font_family ); ?>"} /--></div>
+<div class="wp-block-group"><!-- wp:site-title {"level":0} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
-<!-- wp:group {"className":"woocommerce-coming-soon-social-login","style":{"spacing":{"blockGap":"48px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group woocommerce-coming-soon-social-login"><!-- wp:template-part {"slug":"coming-soon-social-links","theme":"woocommerce/woocommerce","tagName":"div"} /-->
-
-<!-- wp:loginout {"style":{"elements":{"link":{"color":{"text":"#ffffff"}}},"color":{"background":"#000000"},"spacing":{"padding":{"top":"12px","bottom":"12px","left":"16px","right":"16px"}},"typography":{"fontSize":"14px","lineHeight":"1.2"},"border":{"radius":"6px"}},"fontFamily":"<?php echo esc_html( $body_font_family ); ?>"} /--></div>
-<!-- /wp:group --></div>
+<!-- wp:buttons {"className":"woocommerce-coming-soon-header-login"} -->
+<div class="wp-block-buttons woocommerce-coming-soon-header-login"><!-- wp:button {"className":"is-style-outline"} -->
+<div class="wp-block-button is-style-outline"><a class="wp-block-button__link wp-element-button" href="<?php echo esc_url( wp_login_url() ); ?>"><?php esc_html_e( 'Log in', 'woocommerce' ); ?></a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
<!-- wp:group {"style":{"layout":{"selfStretch":"fill","flexSize":null}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group"><!-- wp:heading {"textAlign":"center","level":1,"align":"wide","className":"woocommerce-coming-soon-banner","style":{"typography":{"fontSize":"48px","fontStyle":"normal","fontWeight":"400","lineHeight":"1.2"}},"fontFamily":"<?php echo esc_html( $heading_font_family ); ?>"} -->
-<h1 class="wp-block-heading alignwide has-text-align-center woocommerce-coming-soon-banner has-<?php echo esc_html( $heading_font_family ); ?>-font-family" style="font-size:48px;font-style:normal;font-weight:400;line-height:1.2"><?php echo esc_html__( "Pardon our dust! We're working on something amazing — check back soon!", 'woocommerce' ); ?></h1>
-<!-- /wp:heading --></div>
+<div class="wp-block-group"><!-- wp:heading {"textAlign":"center","level":1,"align":"wide","className":"woocommerce-coming-soon-banner"} -->
+<h1 class="wp-block-heading alignwide has-text-align-center woocommerce-coming-soon-banner"><?php echo esc_html( sprintf( /* translators: %s is the site name */ __( '%s is coming soon', 'woocommerce' ), get_bloginfo( 'name' ) ) ); ?></h1>
+<!-- /wp:heading -->
+
+<?php if ( get_bloginfo( 'description' ) ) : ?>
+<!-- wp:paragraph {"align":"center","fontSize":"medium"} -->
+<p class="has-text-align-center has-medium-font-size"><?php echo esc_html( get_bloginfo( 'description' ) ); ?></p>
+<!-- /wp:paragraph -->
+<?php endif; ?>
+</div>
<!-- /wp:group -->
<!-- wp:group {"className":"woocommerce-coming-soon-powered-by-woo","style":{"spacing":{"padding":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|10"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group woocommerce-coming-soon-powered-by-woo" style="padding-top:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--10)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|30","bottom":"0"}}}} -->
-<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--30);padding-bottom:0"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2","fontSize":"small"} -->
-<p class="has-text-align-center has-contrast-2-color has-text-color has-link-color has-small-font-size"> </p>
-<!-- /wp:paragraph --></div>
+<div class="wp-block-group woocommerce-coming-soon-powered-by-woo" style="padding-top:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--10)"><!-- wp:group {"style":{"spacing":{"padding":{"bottom":"var:preset|spacing|30"}}},"layout":{"type":"flex","justifyContent":"center"}} -->
+<div class="wp-block-group" style="padding-bottom:var(--wp--preset--spacing--30)"><!-- wp:template-part {"slug":"coming-soon-social-links","theme":"woocommerce/woocommerce","tagName":"div"} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group --></div>
<!-- /wp:group --></div></div>
diff --git a/plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts b/plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts
index f618cfd4b7a..171b3df7cff 100644
--- a/plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts
@@ -318,10 +318,8 @@ function runComingSoonTests( themeContext = '' ) {
.waitFor( { state: 'visible' } );
await expect(
- page.getByText(
- "Pardon our dust! We're working on something amazing — check back soon!"
- )
- ).toBeVisible();
+ page.locator( '.woocommerce-coming-soon-banner' )
+ ).toContainText( 'is coming soon' );
} );
test( `Store only coming soon mode${ testSuffix }`, async ( {