Browse Source

Varia: Restore foreground color rules

Kjell Reigstad 5 năm trước cách đây
mục cha
commit
9015877de6

+ 8 - 1
varia/sass/blocks/utilities/_editor.scss

@@ -58,7 +58,6 @@
 // Gutenberg background-color options
 // Gutenberg background-color options
 .has-background {
 .has-background {
 	&:not(.has-background-background-color) a:not(.wp-block-button__link),
 	&:not(.has-background-background-color) a:not(.wp-block-button__link),
-	a:not(.wp-block-button__link),
 	p:not(.has-text-color),
 	p:not(.has-text-color),
 	h1:not(.has-text-color),
 	h1:not(.has-text-color),
 	h2:not(.has-text-color),
 	h2:not(.has-text-color),
@@ -73,41 +72,49 @@
 .wp-block .has-primary-background-color,
 .wp-block .has-primary-background-color,
 .has-primary-background-color {
 .has-primary-background-color {
 	background-color: #{map-deep-get($config-global, "color", "primary", "default")};
 	background-color: #{map-deep-get($config-global, "color", "primary", "default")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .wp-block .has-secondary-background-color,
 .wp-block .has-secondary-background-color,
 .has-secondary-background-color {
 .has-secondary-background-color {
 	background-color: #{map-deep-get($config-global, "color", "secondary", "default")};
 	background-color: #{map-deep-get($config-global, "color", "secondary", "default")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .wp-block .has-foreground-background-color,
 .wp-block .has-foreground-background-color,
 .has-foreground-background-color {
 .has-foreground-background-color {
 	background-color: #{map-deep-get($config-global, "color", "foreground", "default")};
 	background-color: #{map-deep-get($config-global, "color", "foreground", "default")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .wp-block .has-foreground-light-background-color,
 .wp-block .has-foreground-light-background-color,
 .has-foreground-light-background-color {
 .has-foreground-light-background-color {
 	background-color: #{map-deep-get($config-global, "color", "foreground", "light")};
 	background-color: #{map-deep-get($config-global, "color", "foreground", "light")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .wp-block .has-foreground-dark-background-color,
 .wp-block .has-foreground-dark-background-color,
 .has-foreground-dark-background-color {
 .has-foreground-dark-background-color {
 	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")};
 	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .wp-block .has-background-light-background-color,
 .wp-block .has-background-light-background-color,
 .has-background-light-background-color {
 .has-background-light-background-color {
 	background-color: #{map-deep-get($config-global, "color", "background", "light")};
 	background-color: #{map-deep-get($config-global, "color", "background", "light")};
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 }
 
 
 .wp-block .has-background-dark-background-color,
 .wp-block .has-background-dark-background-color,
 .has-background-dark-background-color {
 .has-background-dark-background-color {
 	background-color: #{map-deep-get($config-global, "color", "background", "dark")};
 	background-color: #{map-deep-get($config-global, "color", "background", "dark")};
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 }
 
 
 .wp-block .has-background-background-color,
 .wp-block .has-background-background-color,
 .has-background-background-color {
 .has-background-background-color {
 	background-color: #{map-deep-get($config-global, "color", "background", "default")};
 	background-color: #{map-deep-get($config-global, "color", "background", "default")};
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 }
 
 
 // Gutenberg Font-size utility classes
 // Gutenberg Font-size utility classes

+ 8 - 1
varia/sass/blocks/utilities/_style.scss

@@ -144,7 +144,6 @@
 // Gutenberg background-color options
 // Gutenberg background-color options
 .has-background {
 .has-background {
 	&:not(.has-background-background-color) a:not(.wp-block-button__link),
 	&:not(.has-background-background-color) a:not(.wp-block-button__link),
-	a:not(.wp-block-button__link),
 	p:not(.has-text-color),
 	p:not(.has-text-color),
 	h1:not(.has-text-color),
 	h1:not(.has-text-color),
 	h2:not(.has-text-color),
 	h2:not(.has-text-color),
@@ -159,42 +158,50 @@
 .has-primary-background-color,
 .has-primary-background-color,
 .has-primary-background-color.has-background-dim {
 .has-primary-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "primary", "default")};
 	background-color: #{map-deep-get($config-global, "color", "primary", "default")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .has-secondary-background-color,
 .has-secondary-background-color,
 .has-secondary-background-color.has-background-dim {
 .has-secondary-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "secondary", "default")};
 	background-color: #{map-deep-get($config-global, "color", "secondary", "default")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .has-background-dim,
 .has-background-dim,
 .has-foreground-background-color,
 .has-foreground-background-color,
 .has-foreground-background-color.has-background-dim {
 .has-foreground-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "foreground", "default")};
 	background-color: #{map-deep-get($config-global, "color", "foreground", "default")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .has-foreground-light-background-color,
 .has-foreground-light-background-color,
 .has-foreground-light-background-color.has-background-dim {
 .has-foreground-light-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "foreground", "light")};
 	background-color: #{map-deep-get($config-global, "color", "foreground", "light")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color.has-background-dim {
 .has-foreground-dark-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")};
 	background-color: #{map-deep-get($config-global, "color", "foreground", "dark")};
+	color: #{map-deep-get($config-global, "color", "background", "default")};
 }
 }
 
 
 .has-background-light-background-color,
 .has-background-light-background-color,
 .has-background-light-background-color.has-background-dim {
 .has-background-light-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "background", "light")};
 	background-color: #{map-deep-get($config-global, "color", "background", "light")};
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 }
 
 
 .has-background-dark-background-color,
 .has-background-dark-background-color,
 .has-background-dark-background-color.has-background-dim {
 .has-background-dark-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "background", "dark")};
 	background-color: #{map-deep-get($config-global, "color", "background", "dark")};
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 }
 
 
 .has-background-background-color,
 .has-background-background-color,
 .has-background-background-color.has-background-dim {
 .has-background-background-color.has-background-dim {
 	background-color: #{map-deep-get($config-global, "color", "background", "default")};
 	background-color: #{map-deep-get($config-global, "color", "background", "default")};
+	color: #{map-deep-get($config-global, "color", "foreground", "default")};
 }
 }
 
 
 // Gutenberg Font-size options
 // Gutenberg Font-size options

+ 8 - 1
varia/style-editor.css

@@ -1088,7 +1088,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: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 p:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h2:not(.has-text-color),
 .has-background h2:not(.has-text-color),
@@ -1102,41 +1101,49 @@ table.is-style-stripes tbody tr:nth-child(odd),
 .wp-block .has-primary-background-color,
 .wp-block .has-primary-background-color,
 .has-primary-background-color {
 .has-primary-background-color {
 	background-color: blue;
 	background-color: blue;
+	color: white;
 }
 }
 
 
 .wp-block .has-secondary-background-color,
 .wp-block .has-secondary-background-color,
 .has-secondary-background-color {
 .has-secondary-background-color {
 	background-color: red;
 	background-color: red;
+	color: white;
 }
 }
 
 
 .wp-block .has-foreground-background-color,
 .wp-block .has-foreground-background-color,
 .has-foreground-background-color {
 .has-foreground-background-color {
 	background-color: #444444;
 	background-color: #444444;
+	color: white;
 }
 }
 
 
 .wp-block .has-foreground-light-background-color,
 .wp-block .has-foreground-light-background-color,
 .has-foreground-light-background-color {
 .has-foreground-light-background-color {
 	background-color: #767676;
 	background-color: #767676;
+	color: white;
 }
 }
 
 
 .wp-block .has-foreground-dark-background-color,
 .wp-block .has-foreground-dark-background-color,
 .has-foreground-dark-background-color {
 .has-foreground-dark-background-color {
 	background-color: #111111;
 	background-color: #111111;
+	color: white;
 }
 }
 
 
 .wp-block .has-background-light-background-color,
 .wp-block .has-background-light-background-color,
 .has-background-light-background-color {
 .has-background-light-background-color {
 	background-color: #FAFAFA;
 	background-color: #FAFAFA;
+	color: #444444;
 }
 }
 
 
 .wp-block .has-background-dark-background-color,
 .wp-block .has-background-dark-background-color,
 .has-background-dark-background-color {
 .has-background-dark-background-color {
 	background-color: #DDDDDD;
 	background-color: #DDDDDD;
+	color: #444444;
 }
 }
 
 
 .wp-block .has-background-background-color,
 .wp-block .has-background-background-color,
 .has-background-background-color {
 .has-background-background-color {
 	background-color: white;
 	background-color: white;
+	color: #444444;
 }
 }
 
 
 .is-small-text,
 .is-small-text,

+ 8 - 1
varia/style-rtl.css

@@ -2485,7 +2485,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: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 p:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h2:not(.has-text-color),
 .has-background h2:not(.has-text-color),
@@ -2499,42 +2498,50 @@ table.is-style-stripes tbody tr:nth-child(odd),
 .has-primary-background-color,
 .has-primary-background-color,
 .has-primary-background-color.has-background-dim {
 .has-primary-background-color.has-background-dim {
 	background-color: blue;
 	background-color: blue;
+	color: white;
 }
 }
 
 
 .has-secondary-background-color,
 .has-secondary-background-color,
 .has-secondary-background-color.has-background-dim {
 .has-secondary-background-color.has-background-dim {
 	background-color: red;
 	background-color: red;
+	color: white;
 }
 }
 
 
 .has-background-dim,
 .has-background-dim,
 .has-foreground-background-color,
 .has-foreground-background-color,
 .has-foreground-background-color.has-background-dim {
 .has-foreground-background-color.has-background-dim {
 	background-color: #444444;
 	background-color: #444444;
+	color: white;
 }
 }
 
 
 .has-foreground-light-background-color,
 .has-foreground-light-background-color,
 .has-foreground-light-background-color.has-background-dim {
 .has-foreground-light-background-color.has-background-dim {
 	background-color: #767676;
 	background-color: #767676;
+	color: white;
 }
 }
 
 
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color.has-background-dim {
 .has-foreground-dark-background-color.has-background-dim {
 	background-color: #111111;
 	background-color: #111111;
+	color: white;
 }
 }
 
 
 .has-background-light-background-color,
 .has-background-light-background-color,
 .has-background-light-background-color.has-background-dim {
 .has-background-light-background-color.has-background-dim {
 	background-color: #FAFAFA;
 	background-color: #FAFAFA;
+	color: #444444;
 }
 }
 
 
 .has-background-dark-background-color,
 .has-background-dark-background-color,
 .has-background-dark-background-color.has-background-dim {
 .has-background-dark-background-color.has-background-dim {
 	background-color: #DDDDDD;
 	background-color: #DDDDDD;
+	color: #444444;
 }
 }
 
 
 .has-background-background-color,
 .has-background-background-color,
 .has-background-background-color.has-background-dim {
 .has-background-background-color.has-background-dim {
 	background-color: white;
 	background-color: white;
+	color: #444444;
 }
 }
 
 
 .is-small-text,
 .is-small-text,

+ 8 - 1
varia/style.css

@@ -2490,7 +2490,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: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 p:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h1:not(.has-text-color),
 .has-background h2:not(.has-text-color),
 .has-background h2:not(.has-text-color),
@@ -2504,42 +2503,50 @@ table.is-style-stripes tbody tr:nth-child(odd),
 .has-primary-background-color,
 .has-primary-background-color,
 .has-primary-background-color.has-background-dim {
 .has-primary-background-color.has-background-dim {
 	background-color: blue;
 	background-color: blue;
+	color: white;
 }
 }
 
 
 .has-secondary-background-color,
 .has-secondary-background-color,
 .has-secondary-background-color.has-background-dim {
 .has-secondary-background-color.has-background-dim {
 	background-color: red;
 	background-color: red;
+	color: white;
 }
 }
 
 
 .has-background-dim,
 .has-background-dim,
 .has-foreground-background-color,
 .has-foreground-background-color,
 .has-foreground-background-color.has-background-dim {
 .has-foreground-background-color.has-background-dim {
 	background-color: #444444;
 	background-color: #444444;
+	color: white;
 }
 }
 
 
 .has-foreground-light-background-color,
 .has-foreground-light-background-color,
 .has-foreground-light-background-color.has-background-dim {
 .has-foreground-light-background-color.has-background-dim {
 	background-color: #767676;
 	background-color: #767676;
+	color: white;
 }
 }
 
 
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color,
 .has-foreground-dark-background-color.has-background-dim {
 .has-foreground-dark-background-color.has-background-dim {
 	background-color: #111111;
 	background-color: #111111;
+	color: white;
 }
 }
 
 
 .has-background-light-background-color,
 .has-background-light-background-color,
 .has-background-light-background-color.has-background-dim {
 .has-background-light-background-color.has-background-dim {
 	background-color: #FAFAFA;
 	background-color: #FAFAFA;
+	color: #444444;
 }
 }
 
 
 .has-background-dark-background-color,
 .has-background-dark-background-color,
 .has-background-dark-background-color.has-background-dim {
 .has-background-dark-background-color.has-background-dim {
 	background-color: #DDDDDD;
 	background-color: #DDDDDD;
+	color: #444444;
 }
 }
 
 
 .has-background-background-color,
 .has-background-background-color,
 .has-background-background-color.has-background-dim {
 .has-background-background-color.has-background-dim {
 	background-color: white;
 	background-color: white;
+	color: #444444;
 }
 }
 
 
 .is-small-text,
 .is-small-text,