Skip to content

Commit 8d77956

Browse files
RajdeepcRajdeepc
authored
Merge dcb5b17 into 851e31b 
2 parents 851e31b + dcb5b17 commit 8d77956

File tree

9 files changed

+386
-846
lines changed

9 files changed

+386
-846
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# 3. Commit this change to the PR branch where the changes exist.
1515
current_golden_images_hash:
1616
type: string
17-
default: a1ca10710680ff347ed0a873d376e4f821a6d493
17+
default: b2ba0ee6dcde27c136be2afb14a68bec20c6d925
1818
wireit_cache_name:
1919
type: string
2020
default: wireit

‎packages/color-wheel/test/color-wheel.test.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -594,11 +594,9 @@ describe('ColorWheel', () => {
594594
expect(el.color).to.equal(hsva);
595595
});
596596
it('should flip orientation with dir="rtl"', async () => {
597-
const el = await fixture<ColorWheel>(
598-
html`
599-
<sp-color-wheel></sp-color-wheel>
600-
`
601-
);
597+
const el = await fixture<ColorWheel>(html`
598+
<sp-color-wheel></sp-color-wheel>
599+
`);
602600

603601
await elementUpdated(el);
604602

‎packages/combobox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@spectrum-web-components/textfield": "1.1.2"
7171
},
7272
"devDependencies": {
73-
"@spectrum-css/combobox": "4.0.0-s2-foundations.18"
73+
"@spectrum-css/combobox": "4.0.0-s2-foundations.21"
7474
},
7575
"types": "./src/index.d.ts",
7676
"customElements": "custom-elements.json",

‎packages/combobox/src/combobox-overrides.css‎

Lines changed: 2 additions & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -27,225 +27,7 @@ governing permissions and limitations under the License.
2727
--spectrum-combobox-border-color-key-focus: var(
2828
--system-combobox-border-color-key-focus
2929
);
30-
--spectrum-combobox-inline-size: var(--system-combobox-inline-size);
31-
--spectrum-combobox-minimum-width-multiplier: var(
32-
--system-combobox-minimum-width-multiplier
33-
);
34-
--spectrum-combobox-focus-indicator-thickness: var(
35-
--system-combobox-focus-indicator-thickness
36-
);
37-
--spectrum-combobox-focus-indicator-gap: var(
38-
--system-combobox-focus-indicator-gap
39-
);
40-
--spectrum-combobox-focus-indicator-color: var(
41-
--system-combobox-focus-indicator-color
42-
);
43-
--spectrum-combobox-border-radius: var(--system-combobox-border-radius);
44-
--spectrum-combobox-border-width: var(--system-combobox-border-width);
45-
--spectrum-combobox-spacing-label-to-combobox: var(
46-
--system-combobox-spacing-label-to
47-
);
48-
--spectrum-combobox-font-style: var(--system-combobox-font-style);
49-
--spectrum-combobox-line-height: var(--system-combobox-line-height);
50-
--spectrum-combobox-border-color-invalid-default: var(
51-
--system-combobox-border-color-invalid-default
52-
);
53-
--spectrum-combobox-border-color-invalid-hover: var(
54-
--system-combobox-border-color-invalid-hover
55-
);
56-
--spectrum-combobox-border-color-invalid-focus: var(
57-
--system-combobox-border-color-invalid-focus
58-
);
59-
--spectrum-combobox-border-color-invalid-focus-hover: var(
60-
--system-combobox-border-color-invalid-focus-hover
61-
);
62-
--spectrum-combobox-border-color-invalid-key-focus: var(
63-
--system-combobox-border-color-invalid-key-focus
64-
);
65-
--spectrum-combobox-block-size: var(--system-combobox-block-size);
66-
--spectrum-combobox-icon-size: var(--system-combobox-icon-size);
67-
--spectrum-combobox-font-size: var(--system-combobox-font-size);
68-
--spectrum-combobox-spacing-inline-icon-to-button: var(
69-
--system-combobox-spacing-inline-icon-to-button
70-
);
71-
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
72-
--system-combobox-block-spacing-edge-to-progress-circle
73-
);
74-
--spectrum-combobox-block-spacing-edge-to-alert: var(
75-
--system-combobox-block-spacing-edge-to-alert
76-
);
77-
--spectrum-combobox-spacing-edge-to-menu: var(
78-
--system-combobox-spacing-edge-to-menu
79-
);
80-
--spectrum-combobox-spacing-block-start-edge-to-text: var(
81-
--system-combobox-spacing-block-start-edge-to-text
82-
);
83-
--spectrum-combobox-spacing-block-end-edge-to-text: var(
84-
--system-combobox-spacing-block-end-edge-to-text
85-
);
86-
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
87-
--system-combobox-spacing-inline-start-edge-to-text
88-
);
89-
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
90-
--system-combobox-spacing-inline-end-edge-to-text
91-
);
92-
}
93-
94-
:host([size='s']) {
95-
--spectrum-combobox-block-size: var(--system-combobox-size-s-block-size);
96-
--spectrum-combobox-icon-size: var(--system-combobox-size-s-icon-size);
97-
--spectrum-combobox-font-size: var(--system-combobox-size-s-font-size);
98-
--spectrum-combobox-spacing-inline-icon-to-button: var(
99-
--system-combobox-size-s-spacing-inline-icon-to-button
100-
);
101-
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
102-
--system-combobox-size-s-block-spacing-edge-to-progress-circle
103-
);
104-
--spectrum-combobox-block-spacing-edge-to-alert: var(
105-
--system-combobox-size-s-block-spacing-edge-to-alert
106-
);
107-
--spectrum-combobox-spacing-edge-to-menu: var(
108-
--system-combobox-size-s-spacing-edge-to-menu
109-
);
110-
--spectrum-combobox-spacing-block-start-edge-to-text: var(
111-
--system-combobox-size-s-spacing-block-start-edge-to-text
112-
);
113-
--spectrum-combobox-spacing-block-end-edge-to-text: var(
114-
--system-combobox-size-s-spacing-block-end-edge-to-text
115-
);
116-
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
117-
--system-combobox-size-s-spacing-inline-start-edge-to-text
118-
);
119-
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
120-
--system-combobox-size-s-spacing-inline-end-edge-to-text
121-
);
122-
}
123-
124-
:host {
125-
--spectrum-combobox-block-size: var(--system-combobox-size-m-block-size);
126-
--spectrum-combobox-icon-size: var(--system-combobox-size-m-icon-size);
127-
--spectrum-combobox-font-size: var(--system-combobox-size-m-font-size);
128-
--spectrum-combobox-spacing-inline-icon-to-button: var(
129-
--system-combobox-size-m-spacing-inline-icon-to-button
130-
);
131-
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
132-
--system-combobox-size-m-block-spacing-edge-to-progress-circle
133-
);
134-
--spectrum-combobox-block-spacing-edge-to-alert: var(
135-
--system-combobox-size-m-block-spacing-edge-to-alert
136-
);
137-
--spectrum-combobox-spacing-edge-to-menu: var(
138-
--system-combobox-size-m-spacing-edge-to-menu
139-
);
140-
--spectrum-combobox-spacing-block-start-edge-to-text: var(
141-
--system-combobox-size-m-spacing-block-start-edge-to-text
142-
);
143-
--spectrum-combobox-spacing-block-end-edge-to-text: var(
144-
--system-combobox-size-m-spacing-block-end-edge-to-text
145-
);
146-
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
147-
--system-combobox-size-m-spacing-inline-start-edge-to-text
148-
);
149-
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
150-
--system-combobox-size-m-spacing-inline-end-edge-to-text
151-
);
152-
}
153-
154-
:host([size='l']) {
155-
--spectrum-combobox-block-size: var(--system-combobox-size-l-block-size);
156-
--spectrum-combobox-icon-size: var(--system-combobox-size-l-icon-size);
157-
--spectrum-combobox-font-size: var(--system-combobox-size-l-font-size);
158-
--spectrum-combobox-spacing-inline-icon-to-button: var(
159-
--system-combobox-size-l-spacing-inline-icon-to-button
160-
);
161-
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
162-
--system-combobox-size-l-block-spacing-edge-to-progress-circle
163-
);
164-
--spectrum-combobox-block-spacing-edge-to-alert: var(
165-
--system-combobox-size-l-block-spacing-edge-to-alert
166-
);
167-
--spectrum-combobox-spacing-edge-to-menu: var(
168-
--system-combobox-size-l-spacing-edge-to-menu
169-
);
170-
--spectrum-combobox-spacing-block-start-edge-to-text: var(
171-
--system-combobox-size-l-spacing-block-start-edge-to-text
172-
);
173-
--spectrum-combobox-spacing-block-end-edge-to-text: var(
174-
--system-combobox-size-l-spacing-block-end-edge-to-text
175-
);
176-
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
177-
--system-combobox-size-l-spacing-inline-start-edge-to-text
178-
);
179-
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
180-
--system-combobox-size-l-spacing-inline-end-edge-to-text
181-
);
182-
}
183-
184-
:host([size='xl']) {
185-
--spectrum-combobox-block-size: var(--system-combobox-size-xl-block-size);
186-
--spectrum-combobox-icon-size: var(--system-combobox-size-xl-icon-size);
187-
--spectrum-combobox-font-size: var(--system-combobox-size-xl-font-size);
188-
--spectrum-combobox-spacing-inline-icon-to-button: var(
189-
--system-combobox-size-xl-spacing-inline-icon-to-button
190-
);
191-
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
192-
--system-combobox-size-xl-block-spacing-edge-to-progress-circle
193-
);
194-
--spectrum-combobox-block-spacing-edge-to-alert: var(
195-
--system-combobox-size-xl-block-spacing-edge-to-alert
196-
);
197-
--spectrum-combobox-spacing-edge-to-menu: var(
198-
--system-combobox-size-xl-spacing-edge-to-menu
199-
);
200-
--spectrum-combobox-spacing-block-start-edge-to-text: var(
201-
--system-combobox-size-xl-spacing-block-start-edge-to-text
202-
);
203-
--spectrum-combobox-spacing-block-end-edge-to-text: var(
204-
--system-combobox-size-xl-spacing-block-end-edge-to-text
205-
);
206-
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
207-
--system-combobox-size-xl-spacing-inline-start-edge-to-text
208-
);
209-
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
210-
--system-combobox-size-xl-spacing-inline-end-edge-to-text
211-
);
212-
}
213-
214-
:host([quiet]) {
215-
--spectrum-combobox-minimum-width-multiplier: var(
216-
--system-combobox-quiet-minimum-width-multiplier
217-
);
218-
--spectrum-combobox-spacing-inline-icon-to-button: var(
219-
--system-combobox-quiet-spacing-inline-icon-to-button
220-
);
221-
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
222-
--system-combobox-quiet-spacing-inline-start-edge-to-text
223-
);
224-
--spectrum-combobox-spacing-label-to-combobox: var(
225-
--system-combobox-quiet-spacing-label-to
226-
);
227-
}
228-
229-
:host([quiet][size='s']) {
230-
--spectrum-combobox-spacing-label-to-combobox: var(
231-
--system-combobox-quiet-size-s-spacing-label-to
232-
);
233-
}
234-
235-
:host([quiet]) {
236-
--spectrum-combobox-spacing-label-to-combobox: var(
237-
--system-combobox-quiet-size-m-spacing-label-to
238-
);
239-
}
240-
241-
:host([quiet][size='l']) {
242-
--spectrum-combobox-spacing-label-to-combobox: var(
243-
--system-combobox-quiet-size-l-spacing-label-to
244-
);
245-
}
246-
247-
:host([quiet][size='xl']) {
248-
--spectrum-combobox-spacing-label-to-combobox: var(
249-
--system-combobox-quiet-size-xl-spacing-label-to
30+
--spectrum-combobox-background-color-disabled: var(
31+
--system-combobox-background-color-disabled
25032
);
25133
}

0 commit comments

Comments
 (0)