From b65b93e7e7536733ab6cbd062e1c5f1928f0659c Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Wed, 29 Jan 2020 10:28:40 +0000
Subject: [PATCH] Rename the "Align Buttons" option for the All Products Block
 (https://github.com/woocommerce/woocommerce-blocks/pull/1659)

* Allow css to work for any element

* Rename option to specific last block rather than button
---
 .../assets/js/base/components/product-list/style.scss  | 10 +++++++---
 .../assets/js/components/grid-layout-control/index.js  |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/woocommerce-blocks/assets/js/base/components/product-list/style.scss b/plugins/woocommerce-blocks/assets/js/base/components/product-list/style.scss
index 4ff44887ac4..3fed9644204 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/product-list/style.scss
+++ b/plugins/woocommerce-blocks/assets/js/base/components/product-list/style.scss
@@ -264,7 +264,8 @@
 	.wc-block-grid__product-image,
 	.wc-block-grid__product-title,
 	.wc-block-grid__product-price,
-	.wc-block-grid__product-rating {
+	.wc-block-grid__product-rating,
+	.wc-block-grid__product-add-to-cart {
 		margin-top: 0;
 		margin-bottom: $gap-small;
 	}
@@ -276,8 +277,11 @@
 			display: flex;
 			flex-direction: column;
 		}
-		.wc-block-grid__product-add-to-cart {
-			margin-top: auto !important;
+		.wc-block-grid__product > .wc-block-grid__product-title:last-child,
+		.wc-block-grid__product > div:last-child {
+			margin-top: auto;
+			margin-bottom: 0;
+			padding-bottom: $gap-small;
 		}
 	}
 	@for $i from 1 to 9 {
diff --git a/plugins/woocommerce-blocks/assets/js/components/grid-layout-control/index.js b/plugins/woocommerce-blocks/assets/js/components/grid-layout-control/index.js
index 64bb544165e..0202ce1a412 100644
--- a/plugins/woocommerce-blocks/assets/js/components/grid-layout-control/index.js
+++ b/plugins/woocommerce-blocks/assets/js/components/grid-layout-control/index.js
@@ -49,15 +49,18 @@ const GridLayoutControl = ( {
 				max={ MAX_ROWS }
 			/>
 			<ToggleControl
-				label={ __( 'Align Buttons', 'woo-gutenberg-products-block' ) }
+				label={ __(
+					'Align Last Block',
+					'woo-gutenberg-products-block'
+				) }
 				help={
 					alignButtons
 						? __(
-								'Buttons are aligned vertically.',
+								'The last inner block will be aligned vertically.',
 								'woo-gutenberg-products-block'
 						  )
 						: __(
-								'Buttons follow content.',
+								'The last inner block will follow other content.',
 								'woo-gutenberg-products-block'
 						  )
 				}