Prefer currentColor over base/contrast color defaults.

jrtashjian · May 24, 2023 · 195979a · 195979a
1 parent d785392
commit 195979a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/packages/block-library/button/style.scss b/packages/block-library/button/style.scss
@@ -7,6 +7,7 @@
 	gap: 0.5em;
 	word-break: normal;
 	box-sizing: border-box;
+	border-color: currentcolor;
 
 	@include focus-styles;
 

diff --git a/packages/block-library/input/style.scss b/packages/block-library/input/style.scss
@@ -55,7 +55,7 @@ input[type="radio"].wp-block-omniform-input:checked {
 			height: auto;
 			width: auto;
 			margin: 0;
-			background-color: #{$contrast-color};
+			background-color: currentcolor;
 		}
 
 		&:checked::before {

diff --git a/packages/block-library/shared/mixins.scss b/packages/block-library/shared/mixins.scss
@@ -1,20 +1,3 @@
-/**
- * Color fallback chain:
- *
- * BASE:
- * 1. --wp--preset--color--base
- * 2. --wp--preset--color--background
- * 3. transparent
- *
- * CONTRAST:
- * 1. --wp--preset--color--contrast
- * 2. --wp--preset--color--foreground
- * 3. currentColor
- */
-
-$base-color: var(--wp--preset--color--base, var(--wp--preset--color--background, transparent));
-$contrast-color: var(--wp--preset--color--contrast, var(--wp--preset--color--foreground, currentColor));
-
 @mixin field-label {
 
 	.omniform-field-label,
@@ -59,7 +42,7 @@ $contrast-color: var(--wp--preset--color--contrast, var(--wp--preset--color--for
 	outline-offset: -2px;
 
 	&:focus {
-		outline: 2px solid #{$contrast-color};
+		outline: 2px solid currentcolor;
 		outline-offset: 2px;
 	}
 
@@ -77,7 +60,7 @@ $contrast-color: var(--wp--preset--color--contrast, var(--wp--preset--color--for
 // Base styles for all fields controls.
 @mixin field-control {
 	appearance: none;
-	background-color: #{$base-color};
+	background-color: transparent;
 	border-radius: 0.25em;
 	border-width: 1px;
 	border-style: solid;
@@ -90,12 +73,7 @@ $contrast-color: var(--wp--preset--color--contrast, var(--wp--preset--color--for
 	min-height: auto;
 	padding: 0.5em 0.75em;
 	margin: 0;
-	color: #{$contrast-color};
+	color: currentcolor;
 
 	@include focus-styles;
-
-	&.is-style-inverted {
-		color: #{$base-color};
-		background-color: #{$contrast-color};
-	}
 }