From 96efc146c4e483fe76d6d6ee1c686d6d2406de90 Mon Sep 17 00:00:00 2001
From: "Daniel W. Robert" <danielwrobert@gmail.com>
Date: Wed, 23 Nov 2022 14:19:34 -0500
Subject: [PATCH 1/2] Update hex color val to currentColor.

---
 assets/css/editor.scss                    | 2 +-
 assets/js/icons/library/mini-cart-alt.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/css/editor.scss b/assets/css/editor.scss
index 301a9562dce..dc876c3cd46 100644
--- a/assets/css/editor.scss
+++ b/assets/css/editor.scss
@@ -33,7 +33,7 @@
 	}
 }
 
-svg.wc-block-editor-components-block-icon {
+:not(.site-editor-php) svg.wc-block-editor-components-block-icon {
 	color: $studio-woocommerce-purple-50;
 }
 
diff --git a/assets/js/icons/library/mini-cart-alt.tsx b/assets/js/icons/library/mini-cart-alt.tsx
index 2e57b357f0d..fc095bfc77a 100644
--- a/assets/js/icons/library/mini-cart-alt.tsx
+++ b/assets/js/icons/library/mini-cart-alt.tsx
@@ -29,10 +29,10 @@ const miniCartAlt = (
 		<g mask="url(#mask)">
 			<path
 				d="M2,4H0V6H2ZM2,2V0H0V2ZM4,4l1.8-.9L5.3,2H4Zm3.6,7.6,1.7,1,.5-.9-.4-1ZM6.3,14l-1.8-.9h0ZM20,17v2h2V17Zm0-2h2V13H20ZM8,15,6.2,14,4.6,17H8Zm1.1-2V11H7.9l-.6,1Zm9.2-1-1.8-1h0Zm3.6-6.5-1.8-1h0ZM6.2,4l-1.8.9L4.9,6H6.2ZM5.3,2l1.8-.9L6.5,0H5.3ZM4,4V2H0V4ZM4,2H2V6H4Zm5.4,8.7L5.8,3.1,2.2,4.9l3.6,7.5ZM8,15l1.3-2.4-3.5-2L4.5,13.1Zm0,0H8L4.5,13.1A4,4,0,0,0,8,19Zm12,0H8v4H20Zm-2,0v2h4V15ZM8,17H20V13H8Zm-.7-5L6.2,14l3.6,2,1.1-2Zm9.3-1H9.1v4h7.5Zm-.1,0h.1v4a4,4,0,0,0,3.5-2.1Zm3.6-6.5L16.5,11l3.6,1.9,3.5-6.5ZM21,6a1,1,0,0,1-.9-1.5l3.5,2A3,3,0,0,0,21,2ZM6.2,6H21V2H6.2ZM3.5,2.9l.9,2L8,3.1l-.9-2ZM2,4H5.3V0H2ZM8,20H8V16a4,4,0,0,0-4,4Zm0,0H4a4,4,0,0,0,4,4Zm0,0v4a4,4,0,0,0,4-4Zm0,0h4a4,4,0,0,0-4-4Zm10-4a4,4,0,0,0-4,4h4Zm4,4a4,4,0,0,0-4-4v4Zm-4,4a4,4,0,0,0,4-4H18Zm-4-4a4,4,0,0,0,4,4V20H14Z"
-				fill="#7f54b3"
+				fill="currentColor"
 			/>
 		</g>
-		<circle cx="20.2" cy="4.7" r="3.8" fill="#7f54b3" />
+		<circle cx="20.2" cy="4.7" r="3.8" fill="currentColor" />
 	</SVG>
 );
 

From 5cfa6b4987038671ac97f12678b30e023c00c92a Mon Sep 17 00:00:00 2001
From: "Daniel W. Robert" <danielwrobert@gmail.com>
Date: Wed, 7 Dec 2022 11:10:49 -0500
Subject: [PATCH 2/2] Remove fill attributes on SVG

Having the fill attributes explicitly defined on the SVG was setting the
icon to purple in unexpected cases.

This also reverts the quick attempt to adjust CSS selector for a fix, as
it was the incorrect approach.
---
 assets/css/editor.scss                    | 2 +-
 assets/js/icons/library/mini-cart-alt.tsx | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/assets/css/editor.scss b/assets/css/editor.scss
index dc876c3cd46..301a9562dce 100644
--- a/assets/css/editor.scss
+++ b/assets/css/editor.scss
@@ -33,7 +33,7 @@
 	}
 }
 
-:not(.site-editor-php) svg.wc-block-editor-components-block-icon {
+svg.wc-block-editor-components-block-icon {
 	color: $studio-woocommerce-purple-50;
 }
 
diff --git a/assets/js/icons/library/mini-cart-alt.tsx b/assets/js/icons/library/mini-cart-alt.tsx
index fc095bfc77a..23dbbb25ca5 100644
--- a/assets/js/icons/library/mini-cart-alt.tsx
+++ b/assets/js/icons/library/mini-cart-alt.tsx
@@ -4,7 +4,7 @@
 import { SVG } from '@wordpress/primitives';
 
 const miniCartAlt = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<defs>
 			<mask
 				id="mask"
@@ -27,12 +27,9 @@ const miniCartAlt = (
 			</mask>
 		</defs>
 		<g mask="url(#mask)">
-			<path
-				d="M2,4H0V6H2ZM2,2V0H0V2ZM4,4l1.8-.9L5.3,2H4Zm3.6,7.6,1.7,1,.5-.9-.4-1ZM6.3,14l-1.8-.9h0ZM20,17v2h2V17Zm0-2h2V13H20ZM8,15,6.2,14,4.6,17H8Zm1.1-2V11H7.9l-.6,1Zm9.2-1-1.8-1h0Zm3.6-6.5-1.8-1h0ZM6.2,4l-1.8.9L4.9,6H6.2ZM5.3,2l1.8-.9L6.5,0H5.3ZM4,4V2H0V4ZM4,2H2V6H4Zm5.4,8.7L5.8,3.1,2.2,4.9l3.6,7.5ZM8,15l1.3-2.4-3.5-2L4.5,13.1Zm0,0H8L4.5,13.1A4,4,0,0,0,8,19Zm12,0H8v4H20Zm-2,0v2h4V15ZM8,17H20V13H8Zm-.7-5L6.2,14l3.6,2,1.1-2Zm9.3-1H9.1v4h7.5Zm-.1,0h.1v4a4,4,0,0,0,3.5-2.1Zm3.6-6.5L16.5,11l3.6,1.9,3.5-6.5ZM21,6a1,1,0,0,1-.9-1.5l3.5,2A3,3,0,0,0,21,2ZM6.2,6H21V2H6.2ZM3.5,2.9l.9,2L8,3.1l-.9-2ZM2,4H5.3V0H2ZM8,20H8V16a4,4,0,0,0-4,4Zm0,0H4a4,4,0,0,0,4,4Zm0,0v4a4,4,0,0,0,4-4Zm0,0h4a4,4,0,0,0-4-4Zm10-4a4,4,0,0,0-4,4h4Zm4,4a4,4,0,0,0-4-4v4Zm-4,4a4,4,0,0,0,4-4H18Zm-4-4a4,4,0,0,0,4,4V20H14Z"
-				fill="currentColor"
-			/>
+			<path d="M2,4H0V6H2ZM2,2V0H0V2ZM4,4l1.8-.9L5.3,2H4Zm3.6,7.6,1.7,1,.5-.9-.4-1ZM6.3,14l-1.8-.9h0ZM20,17v2h2V17Zm0-2h2V13H20ZM8,15,6.2,14,4.6,17H8Zm1.1-2V11H7.9l-.6,1Zm9.2-1-1.8-1h0Zm3.6-6.5-1.8-1h0ZM6.2,4l-1.8.9L4.9,6H6.2ZM5.3,2l1.8-.9L6.5,0H5.3ZM4,4V2H0V4ZM4,2H2V6H4Zm5.4,8.7L5.8,3.1,2.2,4.9l3.6,7.5ZM8,15l1.3-2.4-3.5-2L4.5,13.1Zm0,0H8L4.5,13.1A4,4,0,0,0,8,19Zm12,0H8v4H20Zm-2,0v2h4V15ZM8,17H20V13H8Zm-.7-5L6.2,14l3.6,2,1.1-2Zm9.3-1H9.1v4h7.5Zm-.1,0h.1v4a4,4,0,0,0,3.5-2.1Zm3.6-6.5L16.5,11l3.6,1.9,3.5-6.5ZM21,6a1,1,0,0,1-.9-1.5l3.5,2A3,3,0,0,0,21,2ZM6.2,6H21V2H6.2ZM3.5,2.9l.9,2L8,3.1l-.9-2ZM2,4H5.3V0H2ZM8,20H8V16a4,4,0,0,0-4,4Zm0,0H4a4,4,0,0,0,4,4Zm0,0v4a4,4,0,0,0,4-4Zm0,0h4a4,4,0,0,0-4-4Zm10-4a4,4,0,0,0-4,4h4Zm4,4a4,4,0,0,0-4-4v4Zm-4,4a4,4,0,0,0,4-4H18Zm-4-4a4,4,0,0,0,4,4V20H14Z" />
 		</g>
-		<circle cx="20.2" cy="4.7" r="3.8" fill="currentColor" />
+		<circle cx="20.2" cy="4.7" r="3.8" />
 	</SVG>
 );