fix: undefined and duplicated variable after merging main

fix(slider): remove duplicated values

Remove a large number of duplicate values causing stylelint
"Unexpected duplicate" warnings. It looks like things got doubled up
somehow in a previous rebase or merge. This included duplicate t-shirt
size classes.

Also moves root styles block under the custom property definitions to be
consistent with other components.

fix(combobox): fixes undefined and duplicated values

Author: jawinn

components/combobox/index.css

@@ -12,14 +12,6 @@
  */
 
 .spectrum-Combobox {
-	--spectrum-combobox-border-color-default: var(--spectrum-gray-500);
-	--spectrum-combobox-border-color-hover: var(--spectrum-gray-600);
-	--spectrum-combobox-border-color-focus: var(--spectrum-gray-800);
-	--spectrum-combobox-border-color-focus-hover: var(--spectrum-gray-900);
-	--spectrum-combobox-border-color-key-focus: var(--spectrum-gray-800);
-
-	--spectrum-combobox-background-color-disabled: var(--spectrum-gray-25);
-
 	--spectrum-combobox-block-size: var(--spectrum-component-height-100);
 	--spectrum-combobox-icon-size: var(--spectrum-workflow-icon-size-100);
 	--spectrum-combobox-font-size: var(--spectrum-font-size-100);
@@ -56,6 +48,7 @@
 	--spectrum-combobox-border-color-focus: var(--spectrum-gray-800);
 	--spectrum-combobox-border-color-focus-hover: var(--spectrum-gray-900);
 	--spectrum-combobox-border-color-key-focus: var(--spectrum-gray-800);
+	--spectrum-combobox-border-color-disabled: var(--spectrum-disabled-border-color);
 
 	--spectrum-combobox-border-color-invalid-default: var(--spectrum-negative-border-color-default);
 	--spectrum-combobox-border-color-invalid-hover: var(--spectrum-negative-border-color-hover);

components/slider/dist/metadata.json

@@ -84,9 +84,6 @@
     ".spectrum-Slider.is-disabled.spectrum-Slider--filled .spectrum-Slider-track:first-child:before",
     ".spectrum-Slider.is-disabled.spectrum-Slider--range .spectrum-Slider-track:not(:first-of-type, :last-of-type):before",
     ".spectrum-Slider.spectrum-Slider--ramp .spectrum-Slider-handle",
-    ".spectrum-Slider.spectrum-Slider--sizeL",
-    ".spectrum-Slider.spectrum-Slider--sizeS",
-    ".spectrum-Slider.spectrum-Slider--sizeXL",
     ".spectrum-Slider:dir(rtl)",
     ".spectrum-Slider:dir(rtl) .spectrum-Slider-handle:before",
     ".spectrum-Slider:not(.is-disabled, .spectrum-Slider--filled, .spectrum-Slider--range) .spectrum-Slider-controls.is-focused",

components/slider/index.css

@@ -12,42 +12,6 @@
  */
 
 .spectrum-Slider {
-	--spectrum-slider-track-color: var(--spectrum-gray-200);
-	--spectrum-slider-track-fill-color: var(--spectrum-gray-700);
-	--spectrum-slider-ramp-track-color: var(--spectrum-gray-400);
-	--spectrum-slider-ramp-track-color-disabled: var(--spectrum-gray-100);
-
-	--spectrum-slider-handle-background-color: transparent;
-	--spectrum-slider-handle-background-color-disabled: transparent;
-	--spectrum-slider-ramp-handle-background-color: var(--spectrum-gray-75);
-	--spectrum-slider-ticks-handle-background-color: var(--spectrum-gray-75);
-	--spectrum-slider-handle-border-color: var(--spectrum-gray-700);
-	--spectrum-slider-handle-disabled-background-color: var(--spectrum-gray-75);
-
-	--spectrum-slider-tick-mark-color: var(--spectrum-gray-200);
-
-	--spectrum-slider-handle-border-color-hover: var(--spectrum-gray-800);
-	--spectrum-slider-handle-border-color-down: var(--spectrum-gray-800);
-	--spectrum-slider-handle-border-color-key-focus: var(--spectrum-gray-800);
-	--spectrum-slider-handle-focus-ring-color-key-focus: var(--spectrum-focus-indicator-color);
-
-	--spectrum-slider-track-corner-radius: 2px;
-
-	--spectrum-slider-handle-border-radius: var(--spectrum-corner-radius-500);
-
-	&.spectrum-Slider--sizeS {
-		--spectrum-slider-handle-border-radius: var(--spectrum-corner-radius-500);
-	}
-
-	&.spectrum-Slider--sizeL {
-		--spectrum-slider-handle-border-radius: calc(var(--spectrum-corner-radius-500) * 4);
-	}
-
-	&.spectrum-Slider--sizeXL {
-		--spectrum-slider-handle-border-radius: calc(var(--spectrum-corner-radius-500) * 4);
-	}
-
-	/* default sizing, matches t-shirt size M */
 	--spectrum-slider-font-size: var(--spectrum-font-size-75);
 	--spectrum-slider-handle-size: var(--spectrum-slider-handle-size-medium);
 	--spectrum-slider-control-height: var(--spectrum-component-height-100);
@@ -104,30 +68,9 @@
 	/* values */
 	--spectrum-slider-input-left: calc(var(--spectrum-slider-handle-margin-left) / 4);
 	--spectrum-slider-track-handleoffset: var(--spectrum-slider-handle-gap);
-
 	--spectrum-slider-range-track-reset: 0;
-
 	--spectrum-slider-track-corner-radius: 2px;
-
 	--spectrum-slider-handle-border-radius: var(--spectrum-corner-radius-500);
-
-	position: relative;
-
-	/* Don't let z-index'd child elements float above other things on the page */
-	z-index: 0;
-	display: block;
-	min-inline-size: var(--mod-slider-min-size, var(--spectrum-slider-min-size));
-
-	user-select: none;
-
-	&:dir(rtl),
-	&:dir(rtl) {
-		--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
-	}
-
-	&:not(.spectrum-Slider--sideLabel) .spectrum-Slider-labelContainer + .spectrum-Slider-controls:has(.spectrum-Slider-ramp) {
-		margin-block-start: calc(var(--mod-slider-ramp-track-height, var(--spectrum-slider-ramp-track-height)) / 2);
-	}
 }
 
 .spectrum-Slider--sizeS {
@@ -169,6 +112,26 @@
 	--spectrum-slider-value-inline-size: 22px;
 }
 
+.spectrum-Slider {
+	position: relative;
+
+	/* Don't let z-index'd child elements float above other things on the page */
+	z-index: 0;
+	display: block;
+	min-inline-size: var(--mod-slider-min-size, var(--spectrum-slider-min-size));
+
+	user-select: none;
+
+	&:dir(rtl),
+	&:dir(rtl) {
+		--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
+	}
+
+	&:not(.spectrum-Slider--sideLabel) .spectrum-Slider-labelContainer + .spectrum-Slider-controls:has(.spectrum-Slider-ramp) {
+		margin-block-start: calc(var(--mod-slider-ramp-track-height, var(--spectrum-slider-ramp-track-height)) / 2);
+	}
+}
+
 .spectrum-Slider--sideLabel {
 	display: flex;
 	align-items: center;