Merge branch 'trunk' into 44187-cys-on-core-conditionally-change-the-…

…default-fonts-available-based-on-user-consent

plugins/woocommerce-admin/client/customize-store/assembler-hub/sidebar/global-styles/font-pairing-variations/preview.tsx

@@ -91,6 +91,7 @@ export const FontPairingVariationPreview = () => {
 	const defaultHeight = isDesktop
 		? FONT_PREVIEW_LARGE_HEIGHT
 		: FONT_PREVIEW_HEIGHT;
+
 	const ratio = width ? width / defaultWidth : 1;
 	const normalizedHeight = Math.ceil( defaultHeight * ratio );
 	const externalFontFamilies = fontFamilies.filter(

plugins/woocommerce-admin/client/customize-store/assembler-hub/sidebar/sidebar-navigation-screen-footer.tsx

@@ -102,36 +102,40 @@ export const SidebarNavigationScreenFooter = () => {
 		? __( 'Change your footer', 'woocommerce' )
 		: __( 'Choose your footer', 'woocommerce' );
 
+	const description = aiOnline
+		? __(
+				"Select a new footer from the options below. Your footer includes your site's secondary navigation and will be added to every page. You can continue customizing this via the <EditorLink>Editor</EditorLink>.",
+				'woocommerce'
+		  )
+		: __(
+				"Select a footer from the options below. Your footer includes your site's secondary navigation and will be added to every page. You can continue customizing this via the <EditorLink>Editor</EditorLink> later.",
+				'woocommerce'
+		  );
+
 	return (
 		<SidebarNavigationScreen
 			title={ title }
 			onNavigateBackClick={ resetHighlightedBlockIndex }
-			description={ createInterpolateElement(
-				__(
-					"Select a new footer from the options below. Your footer includes your site's secondary navigation and will be added to every page. You can continue customizing this via the <EditorLink>Editor</EditorLink>.",
-					'woocommerce'
+			description={ createInterpolateElement( description, {
+				EditorLink: (
+					<Link
+						onClick={ () => {
+							recordEvent(
+								'customize_your_store_assembler_hub_editor_link_click',
+								{
+									source: 'footer',
+								}
+							);
+							window.open(
+								`${ ADMIN_URL }site-editor.php`,
+								'_blank'
+							);
+							return false;
+						} }
+						href=""
+					/>
 				),
-				{
-					EditorLink: (
-						<Link
-							onClick={ () => {
-								recordEvent(
-									'customize_your_store_assembler_hub_editor_link_click',
-									{
-										source: 'footer',
-									}
-								);
-								window.open(
-									`${ ADMIN_URL }site-editor.php`,
-									'_blank'
-								);
-								return false;
-							} }
-							href=""
-						/>
-					),
-				}
-			) }
+			} ) }
 			content={
 				<>
 					<div className="woocommerce-customize-store__sidebar-footer-content">

plugins/woocommerce-admin/client/customize-store/assembler-hub/sidebar/sidebar-navigation-screen-homepage.tsx

@@ -100,14 +100,14 @@ export const SidebarNavigationScreenHomepage = () => {
 
 	const title = aiOnline
 		? __( 'Change your homepage', 'woocommerce' )
-		: __( 'Design your homepage', 'woocommerce' );
+		: __( 'Choose your homepage', 'woocommerce' );
 	const sidebarMessage = aiOnline
 		? __(
 				'Based on the most successful stores in your industry and location, our AI tool has recommended this template for your business. Prefer a different layout? Choose from the templates below now, or later via the <EditorLink>Editor</EditorLink>.',
 				'woocommerce'
 		  )
 		: __(
-				'Based on the most successful stores, we recommend this layout for your business. Prefer something different? Choose from the templates below now, or continue customizing this page, including the content, later via the <EditorLink>Editor</EditorLink>.',
+				'Create an engaging homepage by selecting one of our pre-designed layouts. You can continue customizing this page, including the content, later via the <EditorLink>Editor</EditorLink>.',
 				'woocommerce'
 		  );
 

plugins/woocommerce-admin/client/customize-store/assembler-hub/style.scss

@@ -460,13 +460,13 @@
 
 		.woocommerce-customize-store_global-styles-variations_item {
 			border-radius: 2px;
-			border: 1px solid #dcdcde;
+			outline: 1px solid #dcdcde;
 			background: #fff;
 
 			&:hover,
 			&.is-active {
 				border-radius: 2px;
-				border: 1.5px solid var(--wp-admin-theme-color);
+				outline: 1.5px solid var(--wp-admin-theme-color);
 				background: #fff;
 			}
 		}

plugins/woocommerce-blocks/docs/internal-developers/blockified-templates/compatibility-layer.md

@@ -1,7 +1,19 @@
 # Compatibility Layer - [AbstractTemplateCompatibility.php](https://github.com/woocommerce/woocommerce-blocks/blob/trunk/src/Templates/AbstractTemplateCompatibility.php)
 
 The Compatibility Layer ensures that blockified templates work correctly with extensions that use hooks to extend their behavior. It appends/pre-appends the corresponding hooks to each block. Also, it removes the default callbacks added to those hooks by WooCommerce.
-The Compatibility Layer disables when the `WooCommerce Single Product`, `WooCommerce Product Attribute`, `WooCommerce Product Taxonomy`, `WooCommerce Product Tag`, `WooCommerce Product Search Results` or `WooCommerce Product Grid` block is added on the page. Furthermore, it is possible to disable the compatibility layer via the hook: [`woocommerce_disable_compatibility_layer`](https://github.com/woocommerce/woocommerce-blocks/blob/trunk/src/Templates/AbstractTemplateCompatibility.php/#L41-L42).
+
+The Compatibility Layer is disabled when either of classic template blocks are added on the page:
+
+- `WooCommerce Single Product`,
+- `WooCommerce Product Attribute`,
+- `WooCommerce Product Taxonomy`,
+- `WooCommerce Product Tag`,
+- `WooCommerce Product Search Results`,
+- `WooCommerce Product Grid`.
+
+Please note these blocks represent classic templates. As an example, using Single Product block won't disable Compatibility Layer.
+
+Furthermore, it is possible to disable the compatibility layer via the hook: [`woocommerce_disable_compatibility_layer`](https://github.com/woocommerce/woocommerce-blocks/blob/trunk/src/Templates/AbstractTemplateCompatibility.php/#L41-L42).
 
 ## Archive Product Templates - [ArchiveProductTemplatesCompatibility](https://github.com/woocommerce/woocommerce-blocks/blob/trunk/src/Templates/ArchiveProductTemplatesCompatibility.php)