From 5ccd4a112fcd5a4a79dded41842ffb38356580e8 Mon Sep 17 00:00:00 2001
From: Richard Ortiz <rcrd.ortiz@gmail.com>
Date: Fri, 14 Jun 2024 17:05:17 +0200
Subject: [PATCH 1/2] Fixed blockbase children style variations problems. Added
 .idea folder to gitignore

---
 .gitignore         | 1 +
 attar/theme.json   | 5 ++++-
 marl/theme.json    | 5 ++++-
 russell/theme.json | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad054824e3..7c563b1611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ vendor/
 .github_token
 .wp-env.override.json
 .pub-git-hash
+.idea
 
 #Ignoring headstart files
 */inc/headstart/*
diff --git a/attar/theme.json b/attar/theme.json
index af1915aba3..71d13550f3 100644
--- a/attar/theme.json
+++ b/attar/theme.json
@@ -24,7 +24,10 @@
                 "primary": "var(--wp--preset--color--foreground)",
                 "secondary": "var(--wp--preset--color--foreground)",
                 "tertiary": "var(--wp--preset--color--background)"
-            }
+            },
+            "excludedParentStyleVariations": [
+                "Ruby Wine"
+            ]
         }
     },
     "styles": {
diff --git a/marl/theme.json b/marl/theme.json
index 68a3ce8fc4..e3683d2ea7 100644
--- a/marl/theme.json
+++ b/marl/theme.json
@@ -30,7 +30,10 @@
                 "primary": "var(--wp--preset--color--foreground)",
                 "secondary": "var(--wp--preset--color--foreground)",
                 "tertiary": "var(--wp--preset--color--tertiary)"
-            }
+            },
+            "excludedParentStyleVariations": [
+                "Ruby Wine"
+            ]
         }
     },
     "styles": {
diff --git a/russell/theme.json b/russell/theme.json
index 438682d935..5879b6e062 100644
--- a/russell/theme.json
+++ b/russell/theme.json
@@ -34,7 +34,10 @@
         "custom": {
             "separator": {
                 "margin": "var(--wp--custom--gap--vertical) auto"
-            }
+            },
+            "excludedParentStyleVariations": [
+                "Ruby Wine"
+            ]
         },
         "typography": {
             "customFontSize": true,

From a804c279bc8a2815634f747992142f111163213e Mon Sep 17 00:00:00 2001
From: Richard Ortiz <rcrd.ortiz@gmail.com>
Date: Mon, 17 Jun 2024 12:19:49 +0200
Subject: [PATCH 2/2] Fixed more themes that inherit from blockbase that were
 specified on another issue

---
 appleton/theme.json | 6 ++++++
 dorna/theme.json    | 7 ++++++-
 farrow/theme.json   | 6 +++++-
 heiwa/theme.json    | 3 +++
 meraki/theme.json   | 5 ++++-
 russell/theme.json  | 3 ++-
 6 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/appleton/theme.json b/appleton/theme.json
index 48995a603a..2a0e09489a 100644
--- a/appleton/theme.json
+++ b/appleton/theme.json
@@ -42,6 +42,12 @@
 			"contentSize": "840px",
 			"wideSize": "1200px"
 		},
+		"custom": {
+			"excludedParentStyleVariations": [
+				"Ruby Wine",
+				"Charcoal"
+			]
+		},
 		"color": {
 			"palette": [
 				{
diff --git a/dorna/theme.json b/dorna/theme.json
index 65de08b83f..22d1f7adcd 100644
--- a/dorna/theme.json
+++ b/dorna/theme.json
@@ -34,7 +34,12 @@
                     "default": "#F0F0F0"
                 }
             ]
-        }
+        },
+      "custom": {
+        "excludedParentStyleVariations": [
+          "Ruby Wine"
+        ]
+      }
     },
     "styles": {
         "blocks": {
diff --git a/farrow/theme.json b/farrow/theme.json
index be9e3c5c96..4c0f3e8e81 100644
--- a/farrow/theme.json
+++ b/farrow/theme.json
@@ -24,7 +24,11 @@
                 "primary": "var(--wp--preset--color--foreground)",
                 "secondary": "var(--wp--preset--color--foreground)",
                 "tertiary": "var(--wp--preset--color--background)"
-            }
+            },
+            "excludedParentStyleVariations": [
+                "Ruby Wine",
+                "Charcoal"
+            ]
         }
     },
     "styles": {
diff --git a/heiwa/theme.json b/heiwa/theme.json
index 33f2fa9342..e7504e560d 100644
--- a/heiwa/theme.json
+++ b/heiwa/theme.json
@@ -31,6 +31,9 @@
 			]
 		},
 		"custom": {
+			"excludedParentStyleVariations": [
+				"Ruby Wine"
+			],
 			"body": {
 				"typography": {
 					"lineHeight": 1.56
diff --git a/meraki/theme.json b/meraki/theme.json
index eae9be60af..c25d61f0c0 100644
--- a/meraki/theme.json
+++ b/meraki/theme.json
@@ -36,6 +36,9 @@
 			]
 		},
 		"custom": {
+			"excludedParentStyleVariations": [
+				"Ruby Wine"
+			],
 			"heading": {
 				"typography": {
 					"fontWeight": 500
@@ -49,7 +52,7 @@
 				"border": {
 					"radius": "50px",
 					"color": "var(--wp--preset--color--foreground)"
-				},	
+				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--tiny)",
 					"lineHeight": "1.2"
diff --git a/russell/theme.json b/russell/theme.json
index 5879b6e062..d629f2bafa 100644
--- a/russell/theme.json
+++ b/russell/theme.json
@@ -36,7 +36,8 @@
                 "margin": "var(--wp--custom--gap--vertical) auto"
             },
             "excludedParentStyleVariations": [
-                "Ruby Wine"
+                "Ruby Wine",
+                "Charcoal"
             ]
         },
         "typography": {