Skip to content

Commit e4d9cd6

Browse files
authored
HCM fixes for ComboBox and Statuslight (#4850)
* fix combobox HCM border color * fix quiet border color and hover color for invalid combobox * fix invalid combobox button border color on focus * fix background colors for disabled comboboxes and express combobox button * fixing statuslight color in light themes * fix combobox button hover style for express * fix button fill color when menu is open * fix firefox HCM fieldbutton icon color * remove white outline around fieldbutton icon for HCM express combobox field button
1 parent e5ffb75 commit e4d9cd6

File tree

2 files changed

+25
-7
lines changed
  • packages/@adobe/spectrum-css-temp/components

2 files changed

+25
-7
lines changed

packages/@adobe/spectrum-css-temp/components/inputgroup/skin.css

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
.spectrum-InputGroup {
14+
--spectrum-inputgroup-border-color-focus: var(--spectrum-alias-input-border-color-key-focus);
1415
background: var(--spectrum-textfield-background-color);
1516

1617
.spectrum-FieldButton {
@@ -78,13 +79,13 @@ governing permissions and limitations under the License.
7879
.spectrum-InputGroup.is-focused {
7980
.spectrum-FieldButton:before,
8081
.spectrum-InputGroup-input {
81-
border-color: var(--spectrum-alias-input-border-color-key-focus);
82+
border-color: var(--spectrum-inputgroup-border-color-focus);
8283
}
8384

8485
&.spectrum-InputGroup--invalid {
8586
.spectrum-FieldButton:before,
8687
.spectrum-InputGroup-input {
87-
border-color: var(--spectrum-alias-input-border-color-key-focus);
88+
border-color: var(--spectrum-inputgroup-border-color-focus);
8889
}
8990
}
9091
}
@@ -264,19 +265,36 @@ governing permissions and limitations under the License.
264265
--spectrum-dropdown-border-color-error: Highlight;
265266
--spectrum-dropdown-border-color-key-focus: Highlight;
266267
--spectrum-textfield-border-color-error: Highlight;
268+
--spectrum-textfield-border-color-error-hover: Highlight;
267269
--spectrum-textfield-border-color-hover: Highlight;
268270
--spectrum-textfield-border-color-key-focus: Highlight;
269-
--spectrum-textfield-quiet-border-color: CanvasText;
271+
--spectrum-textfield-quiet-border-color: ButtonText;
270272
--spectrum-textfield-quiet-border-color-disabled: GrayText;
271273
--spectrum-textfield-quiet-border-color-hover: Highlight;
272274
--spectrum-textfield-quiet-border-color-key-focus: Highlight;
273275
--spectrum-textfield-text-color-disabled: GrayText;
276+
--spectrum-inputgroup-border-color-focus: Highlight;
277+
274278
forced-color-adjust: none;
275279
.spectrum-InputGroup-input {
276280
forced-color-adjust: auto;
281+
--spectrum-textfield-border-color: ButtonText;
282+
--spectrum-textfield-background-color-disabled: Canvas;
277283
}
278284
.spectrum-FieldButton {
279285
forced-color-adjust: auto;
286+
--spectrum-fieldbutton-background-color: Canvas;
287+
--spectrum-fieldbutton-quiet-background-color: Canvas;
288+
--spectrum-fieldbutton-icon-color: ButtonText;
289+
--spectrum-fieldbutton-background-color-down: Canvas;
290+
--spectrum-fieldbutton-quiet-background-color-down: Canvas;
291+
--spectrum-fieldbutton-icon-color-down: ButtonText;
292+
--spectrum-fieldbutton-background-color-disabled: Canvas;
293+
--spectrum-fieldbutton-quiet-background-color-disabled: Canvas;
294+
--spectrum-fieldbutton-background-color-hover: Canvas;
295+
--spectrum-fieldbutton-quiet-background-color-hover: Canvas;
296+
--spectrum-fieldbutton-icon-color-hover: ButtonText;
297+
background-clip: unset;
280298
}
281299

282300
&.is-disabled:not(.spectrum-InputGroup--invalid):not(.spectrum-InputGroup--quiet) .spectrum-FieldButton {
@@ -312,8 +330,8 @@ governing permissions and limitations under the License.
312330
.spectrum-InputGroup--invalid {
313331
.spectrum-FieldButton {
314332
&:before {
315-
border-color: Highlight;
316-
}
333+
border-color: Highlight;
334+
}
317335
}
318336
&.is-disabled:not(.spectrum-InputGroup--quiet) .spectrum-InputGroup-input {
319337
border-color: GrayText;
@@ -347,4 +365,3 @@ governing permissions and limitations under the License.
347365
}
348366
}
349367
}
350-

packages/@adobe/spectrum-css-temp/components/statuslight/skin.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,11 @@ governing permissions and limitations under the License.
8383
@media (forced-colors: active) {
8484
.spectrum-StatusLight {
8585
forced-color-adjust: none;
86+
--spectrum-statuslight-text-color: CanvasText;
8687
--spectrum-statuslight-text-color-disabled: GrayText;
8788
--spectrum-statuslight-dot-color-disabled: GrayText;
8889
&:before {
8990
border: 1px solid ButtonText;
9091
}
9192
}
92-
}
93+
}

0 commit comments

Comments
 (0)