浏览代码

Fixed Blockbase children style variations (#7859)

* Fixed blockbase children style variations problems. Added .idea folder to gitignore

* Fixed more themes that inherit from blockbase that were specified on another issue
Richard Ortiz 1 年之前
父节点
当前提交
2dc712eb3e
共有 9 个文件被更改,包括 38 次插入6 次删除
  1. 1 0
      .gitignore
  2. 6 0
      appleton/theme.json
  3. 4 1
      attar/theme.json
  4. 6 1
      dorna/theme.json
  5. 5 1
      farrow/theme.json
  6. 3 0
      heiwa/theme.json
  7. 4 1
      marl/theme.json
  8. 4 1
      meraki/theme.json
  9. 5 1
      russell/theme.json

+ 1 - 0
.gitignore

@@ -15,6 +15,7 @@ vendor/
 .github_token
 .wp-env.override.json
 .pub-git-hash
+.idea
 
 #Ignoring headstart files
 */inc/headstart/*

+ 6 - 0
appleton/theme.json

@@ -42,6 +42,12 @@
 			"contentSize": "840px",
 			"wideSize": "1200px"
 		},
+		"custom": {
+			"excludedParentStyleVariations": [
+				"Ruby Wine",
+				"Charcoal"
+			]
+		},
 		"color": {
 			"palette": [
 				{

+ 4 - 1
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": {

+ 6 - 1
dorna/theme.json

@@ -34,7 +34,12 @@
                     "default": "#F0F0F0"
                 }
             ]
-        }
+        },
+      "custom": {
+        "excludedParentStyleVariations": [
+          "Ruby Wine"
+        ]
+      }
     },
     "styles": {
         "blocks": {

+ 5 - 1
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": {

+ 3 - 0
heiwa/theme.json

@@ -31,6 +31,9 @@
 			]
 		},
 		"custom": {
+			"excludedParentStyleVariations": [
+				"Ruby Wine"
+			],
 			"body": {
 				"typography": {
 					"lineHeight": 1.56

+ 4 - 1
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": {

+ 4 - 1
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"

+ 5 - 1
russell/theme.json

@@ -34,7 +34,11 @@
         "custom": {
             "separator": {
                 "margin": "var(--wp--custom--gap--vertical) auto"
-            }
+            },
+            "excludedParentStyleVariations": [
+                "Ruby Wine",
+                "Charcoal"
+            ]
         },
         "typography": {
             "customFontSize": true,