fix(tooltip): deduplicate high contrast color vars

cdransf · cdransf · commit dfcbd61f46c7 · 2025-04-02T08:18:57.000-07:00
diff --git a/components/tooltip/dist/metadata.json b/components/tooltip/dist/metadata.json
@@ -374,8 +374,6 @@
   "passthroughs": [],
   "high-contrast": [
     "--highcontrast-tooltip-background-color-default",
-    "--highcontrast-tooltip-background-color-informative",
-    "--highcontrast-tooltip-background-color-negative",
     "--highcontrast-tooltip-border-width"
   ]
 }
diff --git a/components/tooltip/index.css b/components/tooltip/index.css
@@ -107,11 +107,11 @@
 
 /****** Variants ******/
 .spectrum-Tooltip--info {
-	background-color: var(--highcontrast-tooltip-background-color-informative, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));
+	background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));
 }
 
 .spectrum-Tooltip--negative {
-	background-color: var(--highcontrast-tooltip-background-color-negative, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));
+	background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));
 }
 
 .spectrum-Tooltip.is-open {
@@ -138,11 +138,11 @@
 	border-radius: 0 0 0 var(--mod-tooltip-tip-corner-radius, var(--spectrum-tooltip-tip-corner-radius));
 
 	.spectrum-Tooltip--info & {
-		background-color: var(--highcontrast-tooltip-background-color-informative, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));
+		background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));
 	}
 
 	.spectrum-Tooltip--negative & {
-		background-color: var(--highcontrast-tooltip-background-color-negative, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));
+		background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));
 	}
 
 	/*** Tip Placement ***/
@@ -602,7 +602,5 @@
 
 	.spectrum-Tooltip-tip {
 		--highcontrast-tooltip-background-color-default: CanvasText;
-		--highcontrast-tooltip-background-color-informative: CanvasText;
-		--highcontrast-tooltip-background-color-negative: CanvasText;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -374,8 +374,6 @@`
`374`	`374`	`"passthroughs": [],`
`375`	`375`	`"high-contrast": [`
`376`	`376`	`"--highcontrast-tooltip-background-color-default",`
`377`		`- "--highcontrast-tooltip-background-color-informative",`
`378`		`- "--highcontrast-tooltip-background-color-negative",`
`379`	`377`	`"--highcontrast-tooltip-border-width"`
`380`	`378`	`]`
`381`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@`
`107`	`107`
`108`	`108`	`/**** Variants ****/`
`109`	`109`	`.spectrum-Tooltip--info {`
`110`		`- background-color: var(--highcontrast-tooltip-background-color-informative, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));`
	`110`	`+ background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`.spectrum-Tooltip--negative {`
`114`		`- background-color: var(--highcontrast-tooltip-background-color-negative, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));`
	`114`	`+ background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`.spectrum-Tooltip.is-open {`
`@@ -138,11 +138,11 @@`
`138`	`138`	`border-radius: 0 0 0 var(--mod-tooltip-tip-corner-radius, var(--spectrum-tooltip-tip-corner-radius));`
`139`	`139`
`140`	`140`	`.spectrum-Tooltip--info & {`
`141`		`- background-color: var(--highcontrast-tooltip-background-color-informative, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));`
	`141`	`+ background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-informative, var(--spectrum-tooltip-background-color-informative)));`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`.spectrum-Tooltip--negative & {`
`145`		`- background-color: var(--highcontrast-tooltip-background-color-negative, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));`
	`145`	`+ background-color: var(--highcontrast-tooltip-background-color-default, var(--mod-tooltip-background-color-negative, var(--spectrum-tooltip-background-color-negative)));`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/* Tip Placement */`
`@@ -602,7 +602,5 @@`
`602`	`602`
`603`	`603`	`.spectrum-Tooltip-tip {`
`604`	`604`	`--highcontrast-tooltip-background-color-default: CanvasText;`
`605`		`- --highcontrast-tooltip-background-color-informative: CanvasText;`
`606`		`- --highcontrast-tooltip-background-color-negative: CanvasText;`
`607`	`605`	`}`
`608`	`606`	`}`