Merge pull request #2153 from Automattic/rivington/fix-foreground-colors

Restore foreground color rules

rivington/inc/wpcom-colors.php

@@ -278,6 +278,11 @@ add_color_rule( 'txt', '#f2f2f2', array(
 	array( '.has-foreground-color[class]', 'color' ),
 	array( '.has-foreground-background-color[class]', 'background-color' ),
 
+	// Text color
+	array( '.has-background-background-color[class],
+			.has-background-light-background-color[class],
+			.has-background-dark-background-color[class]', 'color' ),
+
 	// Text-color darkened
 	array( '.has-foreground-dark-color[class]', 'color', '-1' ),
 	// Background-color darkened

rivington/inc/wpcom-editor-colors.php

@@ -129,7 +129,10 @@ add_editor_color_rule( 'txt', '#f2f2f2', array(
 	 * Utility Classes
 	 */
 	// Text-color
-	array( '#editor .editor-styles-wrapper .has-foreground-color[class]', 'color' ),
+	array( '#editor .editor-styles-wrapper .has-foreground-color[class],
+			#editor .editor-styles-wrapper .has-background-background-color[class],
+			#editor .editor-styles-wrapper .has-background-dark-background-color[class],
+			#editor .editor-styles-wrapper .has-background-light-background-color[class]', 'color' ),
 	// Background-color
 	array( '#editor .editor-styles-wrapper .has-foreground-background-color[class]', 'background-color' ),
 	// Text-color darkened

rivington/style-editor.css

@@ -1082,7 +1082,6 @@ table.is-style-stripes tbody tr:nth-child(odd),
 }
 
 .has-background:not(.has-background-background-color) a:not(.wp-block-button__link),
-.has-background a:not(.wp-block-button__link),
 .has-background p:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h2:not(.has-text-color),
@@ -1096,41 +1095,49 @@ table.is-style-stripes tbody tr:nth-child(odd),
 .wp-block .has-primary-background-color,
 .has-primary-background-color {
 	background-color: #CAAB57;
+	color: #060f29;
 }
 
 .wp-block .has-secondary-background-color,
 .has-secondary-background-color {
 	background-color: #EE4266;
+	color: #060f29;
 }
 
 .wp-block .has-foreground-background-color,
 .has-foreground-background-color {
 	background-color: #f2f2f2;
+	color: #060f29;
 }
 
 .wp-block .has-foreground-light-background-color,
 .has-foreground-light-background-color {
 	background-color: white;
+	color: #060f29;
 }
 
 .wp-block .has-foreground-dark-background-color,
 .has-foreground-dark-background-color {
 	background-color: #8F8F8F;
+	color: #060f29;
 }
 
 .wp-block .has-background-light-background-color,
 .has-background-light-background-color {
 	background-color: #0d1f55;
+	color: #f2f2f2;
 }
 
 .wp-block .has-background-dark-background-color,
 .has-background-dark-background-color {
 	background-color: #030713;
+	color: #f2f2f2;
 }
 
 .wp-block .has-background-background-color,
 .has-background-background-color {
 	background-color: #060f29;
+	color: #f2f2f2;
 }
 
 .is-small-text,

rivington/style-rtl.css

@@ -2452,7 +2452,6 @@ table.is-style-stripes tbody tr:nth-child(odd),
 }
 
 .has-background:not(.has-background-background-color) a:not(.wp-block-button__link),
-.has-background a:not(.wp-block-button__link),
 .has-background p:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h2:not(.has-text-color),
@@ -2466,42 +2465,50 @@ table.is-style-stripes tbody tr:nth-child(odd),
 .has-primary-background-color,
 .has-primary-background-color.has-background-dim {
 	background-color: #CAAB57;
+	color: #060f29;
 }
 
 .has-secondary-background-color,
 .has-secondary-background-color.has-background-dim {
 	background-color: #EE4266;
+	color: #060f29;
 }
 
 .has-background-dim,
 .has-foreground-background-color,
 .has-foreground-background-color.has-background-dim {
 	background-color: #f2f2f2;
+	color: #060f29;
 }
 
 .has-foreground-light-background-color,
 .has-foreground-light-background-color.has-background-dim {
 	background-color: white;
+	color: #060f29;
 }
 
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color.has-background-dim {
 	background-color: #8F8F8F;
+	color: #060f29;
 }
 
 .has-background-light-background-color,
 .has-background-light-background-color.has-background-dim {
 	background-color: #0d1f55;
+	color: #f2f2f2;
 }
 
 .has-background-dark-background-color,
 .has-background-dark-background-color.has-background-dim {
 	background-color: #030713;
+	color: #f2f2f2;
 }
 
 .has-background-background-color,
 .has-background-background-color.has-background-dim {
 	background-color: #060f29;
+	color: #f2f2f2;
 }
 
 .is-small-text,

rivington/style.css

@@ -2457,7 +2457,6 @@ table.is-style-stripes tbody tr:nth-child(odd),
 }
 
 .has-background:not(.has-background-background-color) a:not(.wp-block-button__link),
-.has-background a:not(.wp-block-button__link),
 .has-background p:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h2:not(.has-text-color),
@@ -2471,42 +2470,50 @@ table.is-style-stripes tbody tr:nth-child(odd),
 .has-primary-background-color,
 .has-primary-background-color.has-background-dim {
 	background-color: #CAAB57;
+	color: #060f29;
 }
 
 .has-secondary-background-color,
 .has-secondary-background-color.has-background-dim {
 	background-color: #EE4266;
+	color: #060f29;
 }
 
 .has-background-dim,
 .has-foreground-background-color,
 .has-foreground-background-color.has-background-dim {
 	background-color: #f2f2f2;
+	color: #060f29;
 }
 
 .has-foreground-light-background-color,
 .has-foreground-light-background-color.has-background-dim {
 	background-color: white;
+	color: #060f29;
 }
 
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color.has-background-dim {
 	background-color: #8F8F8F;
+	color: #060f29;
 }
 
 .has-background-light-background-color,
 .has-background-light-background-color.has-background-dim {
 	background-color: #0d1f55;
+	color: #f2f2f2;
 }
 
 .has-background-dark-background-color,
 .has-background-dark-background-color.has-background-dim {
 	background-color: #030713;
+	color: #f2f2f2;
 }
 
 .has-background-background-color,
 .has-background-background-color.has-background-dim {
 	background-color: #060f29;
+	color: #f2f2f2;
 }
 
 .is-small-text,