diff --git a/assets/css/style.scss b/assets/css/style.scss
index 7d72d79a03e..d4469472901 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -49,7 +49,8 @@
.wp-block-button__link {
word-break: break-word;
white-space: normal;
- margin: 0 auto !important;
+ margin-right: auto !important;
+ margin-left: auto !important;
display: inline-flex;
justify-content: center;
text-align: center;
diff --git a/assets/js/atomic/blocks/product-elements/button/style.scss b/assets/js/atomic/blocks/product-elements/button/style.scss
index fa0f8732255..bf931c879b1 100644
--- a/assets/js/atomic/blocks/product-elements/button/style.scss
+++ b/assets/js/atomic/blocks/product-elements/button/style.scss
@@ -1,7 +1,6 @@
.wp-block-button.wc-block-components-product-button {
word-break: break-word;
white-space: normal;
- margin-top: 0;
margin-bottom: $gap-small;
.wc-block-components-product-button__button {
@@ -10,7 +9,8 @@
font-family: inherit;
font-weight: inherit;
justify-content: center;
- margin: 0 auto;
+ margin-right: auto;
+ margin-left: auto;
white-space: normal;
word-break: break-word;
}
diff --git a/assets/js/atomic/blocks/product-elements/button/supports.ts b/assets/js/atomic/blocks/product-elements/button/supports.ts
index 6e5ade74b73..df0be2fb742 100644
--- a/assets/js/atomic/blocks/product-elements/button/supports.ts
+++ b/assets/js/atomic/blocks/product-elements/button/supports.ts
@@ -22,6 +22,7 @@ export const supports = {
},
...( hasSpacingStyleSupport() && {
spacing: {
+ margin: true,
padding: true,
__experimentalSkipSerialization: true,
},
diff --git a/assets/js/blocks/product-query/constants.ts b/assets/js/blocks/product-query/constants.ts
index db842cb4454..dc5b73a7cea 100644
--- a/assets/js/blocks/product-query/constants.ts
+++ b/assets/js/blocks/product-query/constants.ts
@@ -99,6 +99,15 @@ export const INNER_BLOCKS_TEMPLATE: InnerBlockTemplate[] = [
],
],
],
- [ 'core/query-pagination' ],
+ [
+ 'core/query-pagination',
+ {
+ layout: {
+ type: 'flex',
+ justifyContent: 'center',
+ },
+ },
+ [],
+ ],
[ 'core/query-no-results' ],
];
diff --git a/patterns/product-query-1-1-image-4-column-products-row.php b/patterns/product-query-1-1-image-4-column-products-row.php
new file mode 100644
index 00000000000..d8742e50a14
--- /dev/null
+++ b/patterns/product-query-1-1-image-4-column-products-row.php
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+