Merge pull request #3325 from Automattic/update/multi-theme-json

Seedlet & Spearhead Custom Link Color

seedlet/assets/css/style-editor.css

@@ -315,9 +315,8 @@ a:active {
 	border-bottom-color: transparent;
 }
 
-.has-background:not(.has-background-background-color) .has-link-color a,
-.has-background:not(.has-background-background-color).has-link-color a {
-	color: var(--wp--style--color--link, var(--global--color-primary));
+.has-primary-background-color a:not(.has-link-color):not(.has-text-color) {
+	color: var(--global--color-background);
 }
 
 button,
@@ -541,17 +540,6 @@ object {
 	color: currentColor;
 }
 
-.wp-block-cover .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .block-editor-block-list__block:not(.wp-social-link) a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .block-editor-block-list__block:not(.wp-social-link) a:not(.has-text-color):not(.wp-block-button__link) {
-	color: currentColor;
-}
-
 .wp-block-cover .wp-block-cover__inner-container .has-link-color a,
 .wp-block-cover .wp-block-cover-image-text .has-link-color a,
 .wp-block-cover .wp-block-cover-text .has-link-color a,
@@ -1277,11 +1265,6 @@ pre.wp-block-verse {
 	color: var(--global--color-background);
 }
 
-.has-background:not(.has-background-background-color) a,
-.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
-	color: currentColor;
-}
-
 .has-primary-background-color[class] {
 	background-color: var(--global--color-primary);
 	color: var(--global--color-background);

seedlet/assets/sass/base/_base.scss

@@ -32,14 +32,9 @@ a {
 			border-bottom-color: transparent;
 		}
 	}
-}
-// Enforce the custom link color even if a custom background color has been set.
-// The extra specificity here is required to override the background color styles.
-.has-background:not(.has-background-background-color) {
-	// Target both current level and nested block.
-	.has-link-color a,
-	&.has-link-color a {
-		color: var( --wp--style--color--link, var(--global--color-primary) );
+
+	.has-primary-background-color &:not(.has-link-color):not(.has-text-color) {
+		color: var(--global--color-background);
 	}
 }
 

seedlet/assets/sass/blocks/cover/_editor.scss

@@ -12,9 +12,6 @@
 	.block-editor-block-list__block:not(.wp-social-link) {
 		color: currentColor; // uses text color specified with background-color options in /blocks/utilities/_style.scss
 
-		a:not(.has-text-color):not(.wp-block-button__link) {
-			color: currentColor;
-		}
 		.has-link-color a {
 			color: var( --wp--style--color--link, var(--global--color-primary) );
 		}

seedlet/assets/sass/blocks/cover/_style.scss

@@ -13,9 +13,6 @@
 		margin-top: var(--global--spacing-vertical);
 		margin-bottom: var(--global--spacing-vertical);
 
-		a:not(.has-text-color):not(.wp-block-button__link) {
-			color: currentColor;
-		}
 		.has-link-color a {
 			color: var( --wp--style--color--link, var(--global--color-primary) );
 		}

seedlet/assets/sass/blocks/utilities/_editor.scss

@@ -39,14 +39,6 @@
 	color: var(--global--color-background);
 }
 
-// Gutenberg background-color options
-.has-background {
-	&:not(.has-background-background-color) a,
-	p, h1, h2, h3, h4, h5, h6 {
-		color: currentColor;
-	}
-}
-
 .has-primary-background-color[class] {
 	background-color: var(--global--color-primary);
 	color: var(--global--color-background);

seedlet/assets/sass/blocks/utilities/_style.scss

@@ -178,14 +178,6 @@
 	color: var(--global--color-black);
 }
 
-// Gutenberg background-color options
-.has-background {
-	&:not(.has-background-background-color) a:not(.has-text-color):not(.wp-block-button__link),
-	p, h1, h2, h3, h4, h5, h6 {
-		color: currentColor;
-	}
-}
-
 .has-primary-background-color[class] {
 	background-color: var(--global--color-primary);
 

seedlet/assets/sass/style.scss

@@ -7,7 +7,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
 Requires at least: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
-Version: 1.1.13-wpcom
+Version: 1.1.14-wpcom
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: seedlet

seedlet/experimental-theme.json

@@ -0,0 +1,9 @@
+{
+	"styles": {
+		"root": {
+			"color": {
+				"link": "var( --global--color-primary )"
+			}
+		}
+	}
+}

seedlet/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "seedlet",
-  "version": "1.1.11-wpcom",
+  "version": "1.1.14-wpcom",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

seedlet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "seedlet",
-  "version": "1.1.13-wpcom",
+  "version": "1.1.14-wpcom",
   "description": "Seedlet",
   "bugs": {
     "url": "https://github.com/Automattic/seedlet/issues"

seedlet/style-rtl.css

@@ -8,7 +8,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
 Requires at least: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
-Version: 1.1.13-wpcom
+Version: 1.1.14-wpcom
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: seedlet
@@ -949,9 +949,8 @@ a:active {
 	border-bottom-color: transparent;
 }
 
-.has-background:not(.has-background-background-color) .has-link-color a,
-.has-background:not(.has-background-background-color).has-link-color a {
-	color: var(--wp--style--color--link, var(--global--color-primary));
+.has-primary-background-color a:not(.has-link-color):not(.has-text-color) {
+	color: var(--global--color-background);
 }
 
 button,
@@ -1412,15 +1411,6 @@ object {
 	margin-bottom: var(--global--spacing-vertical);
 }
 
-.wp-block-cover .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link) {
-	color: currentColor;
-}
-
 .wp-block-cover .wp-block-cover__inner-container .has-link-color a,
 .wp-block-cover .wp-block-cover-image-text .has-link-color a,
 .wp-block-cover .wp-block-cover-text .has-link-color a,
@@ -2653,11 +2643,6 @@ pre.wp-block-verse {
 	color: var(--global--color-black);
 }
 
-.has-background:not(.has-background-background-color) a:not(.has-text-color):not(.wp-block-button__link),
-.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
-	color: currentColor;
-}
-
 .has-primary-background-color[class] {
 	background-color: var(--global--color-primary);
 }

seedlet/style.css

@@ -8,7 +8,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
 Requires at least: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
-Version: 1.1.13-wpcom
+Version: 1.1.14-wpcom
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: seedlet
@@ -949,9 +949,8 @@ a:active {
 	border-bottom-color: transparent;
 }
 
-.has-background:not(.has-background-background-color) .has-link-color a,
-.has-background:not(.has-background-background-color).has-link-color a {
-	color: var(--wp--style--color--link, var(--global--color-primary));
+.has-primary-background-color a:not(.has-link-color):not(.has-text-color) {
+	color: var(--global--color-background);
 }
 
 button,
@@ -1412,15 +1411,6 @@ object {
 	margin-bottom: var(--global--spacing-vertical);
 }
 
-.wp-block-cover .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
-.wp-block-cover-image .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link) {
-	color: currentColor;
-}
-
 .wp-block-cover .wp-block-cover__inner-container .has-link-color a,
 .wp-block-cover .wp-block-cover-image-text .has-link-color a,
 .wp-block-cover .wp-block-cover-text .has-link-color a,
@@ -2662,11 +2652,6 @@ pre.wp-block-verse {
 	color: var(--global--color-black);
 }
 
-.has-background:not(.has-background-background-color) a:not(.has-text-color):not(.wp-block-button__link),
-.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
-	color: currentColor;
-}
-
 .has-primary-background-color[class] {
 	background-color: var(--global--color-primary);
 }

spearhead/assets/sass/style.scss

@@ -7,7 +7,7 @@ Description: Share your podcast with the world using Spearhead.
 Requires at least: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
-Version: 1.3.2
+Version: 1.3.3
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: seedlet

spearhead/experimental-theme.json

@@ -1,14 +1,15 @@
-
 {
-	"global": {
-        "styles": {
-            "color": {
-                "link": "var( --global--color-primary )"
-            }
-        },
-		"settings": {
+	"styles": {
+		"root": {
+			"color": {
+				"link": "var( --global--color-primary )"
+			}
+		}
+	},
+	"settings": {
+		"defaults": {
 			"border": {
-        		"customRadius": true
+				"customRadius": true
 			}
 		}
 	}

spearhead/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spearhead",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "a podcast theme",
   "keywords": [
     "gutenberg",

spearhead/style-rtl.css

@@ -7,7 +7,7 @@ Description: Share your podcast with the world using Spearhead.
 Requires at least: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
-Version: 1.3.2
+Version: 1.3.3
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: seedlet

spearhead/style.css

@@ -7,7 +7,7 @@ Description: Share your podcast with the world using Spearhead.
 Requires at least: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
-Version: 1.3.2
+Version: 1.3.3
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: seedlet