Skip to content

Commit 64e41c5

Browse files
fixing combobox styles for quiet and invalid (#2067)
Co-authored-by: Robert Snow <[email protected]>
1 parent a169a3c commit 64e41c5

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ governing permissions and limitations under the License.
4444
flex-shrink: 0;
4545
}
4646

47-
&.is-disabled {
47+
/* Quiet or invalid inputgroup field button should always have a border width. */
48+
&.is-disabled:not(.spectrum-InputGroup--invalid):not(.spectrum-InputGroup--quiet) {
4849
.spectrum-FieldButton {
4950
border-width: 0;
5051
}

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,33 @@ governing permissions and limitations under the License.
7272
}
7373

7474
.spectrum-InputGroup--quiet {
75+
/*
76+
specifically for readonly inputgroups that aren't disabled since the button will have the disabled class
77+
but we don't want the border color to be the disabled quiet one
78+
*/
79+
&:not(.is-disabled) {
80+
.spectrum-FieldButton {
81+
&:disabled,
82+
&:disabled:hover {
83+
border-color: var(--spectrum-textfield-quiet-border-color);
84+
}
85+
}
86+
}
87+
7588
.spectrum-FieldButton {
7689
&,
7790
&:hover,
7891
&:focus,
7992
&:active,
8093
&.is-selected,
8194
&:invalid,
82-
&.spectrum-FieldButton--invalid,
95+
&.spectrum-FieldButton--invalid {
96+
border-color: var(--spectrum-textfield-quiet-border-color);
97+
}
98+
8399
&:disabled,
84100
&:disabled:hover {
85-
border-color: var(--spectrum-textfield-quiet-border-color);
101+
border-color: var(--spectrum-textfield-quiet-border-color-disabled);
86102
}
87103
}
88104

0 commit comments

Comments
 (0)