rebased and fixed conflicts

spearhead/assets/sass/block-extends/_woocommerce.scss

@@ -40,19 +40,21 @@ body[class*="woocommerce"] #page {
 	}
 }
 
-#content .wc-block-grid{
-	.wc-block-grid__product {
-		.wc-block-grid__product-onsale {
-			top: -0.5em;
-			right: -0.5em;
-		}
+#content {
+	.wc-block-grid{
+		.wc-block-grid__product {
+			.wc-block-grid__product-onsale {
+				top: -0.5em;
+				right: -0.5em;
+			}
 
-		.wc-block-grid__product-title{
-			font-family: var(--global--font-secondary);
-		}
+			.wc-block-grid__product-title{
+				font-family: var(--global--font-secondary);
+			}
 
-		.wc-block-grid__product-price {
-			color: var(--global--color-foreground);
+			.wc-block-grid__product-price {
+				color: var(--global--color-foreground);
+			}
 		}
 	}
 	.wc-block-featured-product {
@@ -60,7 +62,6 @@ body[class*="woocommerce"] #page {
 			font-size: var(--global--font-size-sm);
 		}
 	}
-
 }
 
 .wc-block-components-review-list-item__author + .wc-block-components-review-list-item__published-date::before {

spearhead/style-rtl.css

@@ -752,7 +752,7 @@ body[class*="woocommerce"] #page .woocommerce-tabs .panel h2 {
 	color: var(--global--color-foreground);
 }
 
-#content .wc-block-grid .wc-block-featured-product .wc-block-featured-product__price {
+#content .wc-block-featured-product .wc-block-featured-product__price {
 	font-size: var(--global--font-size-sm);
 }
 

spearhead/style.css

@@ -752,7 +752,7 @@ body[class*="woocommerce"] #page .woocommerce-tabs .panel h2 {
 	color: var(--global--color-foreground);
 }
 
-#content .wc-block-grid .wc-block-featured-product .wc-block-featured-product__price {
+#content .wc-block-featured-product .wc-block-featured-product__price {
 	font-size: var(--global--font-size-sm);
 }