spectrum-web-components
spectrum-web-components copied to clipboard
chore: updated spectrum-css dependencies
Description
updated the spectrum-css dependencies.
How has this been tested?
- [ ] Test case 1
- Go here
- Do this
- [ ] Test case 2
- Go here
- Do this
Screenshots (if appropriate)
Types of changes
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Chore (minor updates related to the tooling or maintenance of the repository, does not impact compiled assets)
Checklist
- [ ] I have signed the Adobe Open Source CLA.
- [ ] My code follows the code style of this project.
- [ ] If my change required a change to the documentation, I have updated the documentation in this pull request.
- [ ] I have read the CONTRIBUTING document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] I have reviewed at the Accessibility Practices for this feature, see: Aria Practices
Best practices
This repository uses conventional commit syntax for each commit message; note that the GitHub UI does not use this by default so be cautious when accepting suggested changes. Avoid the "Update branch" button on the pull request and opt instead for rebasing your branch against main.
Branch preview
Visual regression test results
When a visual regression test fails (or has previously failed while working on this branch), its results can be found in the following URLs:
- High Contrast Mode | Medium | LTR
- Classic | Lightest | Medium | LTR
- Classic | Lightest | Medium | RTL
- Classic | Lightest | Large | LTR
- Classic | Lightest | Large | RTL
- Classic | Light | Medium | LTR
- Classic | Light | Medium | RTL
- Classic | Light | Large | LTR
- Classic | Light | Large | RTL
- Classic | Dark | Medium | LTR
- Classic | Dark | Medium | RTL
- Classic | Dark | Large | LTR
- Classic | Dark | Large | RTL
- Classic | Darkest | Medium | LTR
- Classic | Darkest | Medium | RTL
- Classic | Darkest | Large | LTR
- Classic | Darkest | Large | RTL
- Express | Lightest | Medium | LTR
- Express | Lightest | Medium | RTL
- Express | Lightest | Large | LTR
- Express | Lightest | Large | RTL
- Express | Light | Medium | LTR
- Express | Light | Medium | RTL
- Express | Light | Large | LTR
- Express | Light | Large | RTL
- Express | Dark | Medium | LTR
- Express | Dark | Medium | RTL
- Express | Dark | Large | LTR
- Express | Dark | Large | RTL
- Express | Darkest | Medium | LTR
- Express | Darkest | Medium | RTL
- Express | Darkest | Large | LTR
- Express | Darkest | Large | RTL
Lighthouse scores
| Category | Latest (report) | Main (report) | Branch (report) |
|---|---|---|---|
| Performance | 0.97 | 0.97 | 0.97 |
| Accessibility | 1 | 1 | 1 |
| Best Practices | 1 | 1 | 1 |
| SEO | 1 | 0.92 | 0.92 |
| PWA | 1 | 1 | 1 |
What is this?
Lighthouse scores comparing the documentation site built from the PR ("Branch") to that of the production documentation site ("Latest") and the build currently on main ("Main"). Higher scores are better, but note that the SEO scores on Netlify URLs are artifically constrained to 0.92.
Transfer Size
| Category | Latest | Main | Branch |
|---|---|---|---|
| Total | 242.512 kB | 226.80 kB | 226.547 kB 🏆 |
| Scripts | 59.177 kB | 53.65 kB | 53.422 kB 🏆 |
| Stylesheet | 50.835 kB | 41.261 kB | 41.255 kB 🏆 |
| Document | 5.758 kB | 5.147 kB | 5.128 kB 🏆 |
| Third Party | 126.742 kB | 126.742 kB | 126.742 kB |
Request Count
| Category | Latest | Main | Branch |
|---|---|---|---|
| Total | 42 🏆 | 43 | 43 |
| Scripts | 34 🏆 | 35 | 35 |
| Stylesheet | 5 | 5 | 5 |
| Document | 1 | 1 | 1 |
| Third Party | 2 | 2 | 2 |
Tachometer results
Chrome
accordion permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 420 kB | 145.43ms - 150.22ms | - | unsure 🔍 -1% - +3% -1.34ms - +4.11ms |
| branch | 406 kB | 145.14ms - 147.75ms | unsure 🔍 -3% - +1% -4.11ms - +1.34ms |
- |
action-bar permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 489 kB | 75.76ms - 78.80ms | - | unsure 🔍 -5% - +1% -3.73ms - +1.05ms |
| branch | 474 kB | 76.77ms - 80.46ms | unsure 🔍 -1% - +5% -1.05ms - +3.73ms |
- |
action-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 521 kB | 103.77ms - 106.58ms | - | unsure 🔍 -2% - +2% -1.87ms - +2.16ms |
| branch | 503 kB | 103.58ms - 106.47ms | unsure 🔍 -2% - +2% -2.16ms - +1.87ms |
- |
action-group permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 543 kB | 64.90ms - 66.12ms | - | unsure 🔍 -2% - +1% -1.06ms - +0.83ms |
| branch | 524 kB | 64.90ms - 66.35ms | unsure 🔍 -1% - +2% -0.83ms - +1.06ms |
- |
action-menu permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 655 kB | 159.95ms - 165.42ms | - | unsure 🔍 -0% - +4% -0.43ms - +5.99ms |
| branch | 633 kB | 158.23ms - 161.60ms | unsure 🔍 -4% - +0% -5.99ms - +0.43ms |
- |
alert-dialog permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 460 kB | 96.80ms - 97.68ms | - | slower ❌ 1% - 2% 0.81ms - 2.02ms |
| branch | 445 kB | 95.41ms - 96.24ms | faster ✔ 1% - 2% 0.81ms - 2.02ms |
- |
asset permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 364 kB | 12.21ms - 12.65ms | - | unsure 🔍 -0% - +4% -0.02ms - +0.45ms |
| branch | 351 kB | 12.15ms - 12.29ms | unsure 🔍 -4% - +0% -0.45ms - +0.02ms |
- |
avatar permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 402 kB | 24.18ms - 24.75ms | - | unsure 🔍 -1% - +2% -0.16ms - +0.46ms |
| branch | 388 kB | 24.19ms - 24.43ms | unsure 🔍 -2% - +1% -0.46ms - +0.16ms |
- |
badge permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 401 kB | 32.54ms - 33.02ms | - | slower ❌ 1% - 3% 0.35ms - 0.97ms |
| branch | 388 kB | 31.93ms - 32.31ms | faster ✔ 1% - 3% 0.35ms - 0.97ms |
- |
button-group permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 447 kB | 58.36ms - 59.61ms | - | unsure 🔍 -1% - +2% -0.35ms - +1.40ms |
| branch | 432 kB | 57.85ms - 59.07ms | unsure 🔍 -2% - +1% -1.40ms - +0.35ms |
- |
button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 453 kB | 68.54ms - 69.52ms | - | unsure 🔍 -1% - +1% -0.85ms - +0.71ms |
| branch | 438 kB | 68.50ms - 69.71ms | unsure 🔍 -1% - +1% -0.71ms - +0.85ms |
- |
card permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 510 kB | 58.79ms - 59.52ms | - | slower ❌ 0% - 2% 0.12ms - 1.13ms |
| branch | 493 kB | 58.18ms - 58.87ms | faster ✔ 0% - 2% 0.12ms - 1.13ms |
- |
checkbox permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 421 kB | 70.11ms - 72.70ms | - | slower ❌ 1% - 5% 0.92ms - 3.67ms |
| branch | 405 kB | 68.64ms - 69.57ms | faster ✔ 1% - 5% 0.92ms - 3.67ms |
- |
coachmark permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 626 kB | 144.71ms - 147.78ms | - | slower ❌ 0% - 3% 0.24ms - 3.92ms |
| branch | 611 kB | 143.15ms - 145.19ms | faster ✔ 0% - 3% 0.24ms - 3.92ms |
- |
color-area permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 457 kB | 130.06ms - 130.80ms | - | slower ❌ 1% - 1% 0.86ms - 1.85ms |
| branch | 443 kB | 128.74ms - 129.41ms | faster ✔ 1% - 1% 0.86ms - 1.85ms |
- |
color-handle permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 377 kB | 39.45ms - 39.76ms | - | unsure 🔍 -0% - +1% -0.14ms - +0.33ms |
| branch | 363 kB | 39.34ms - 39.68ms | unsure 🔍 -1% - +0% -0.33ms - +0.14ms |
- |
color-loupe permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 368 kB | 27.27ms - 27.54ms | - | slower ❌ 1% - 2% 0.16ms - 0.50ms |
| branch | 355 kB | 26.98ms - 27.18ms | faster ✔ 1% - 2% 0.16ms - 0.50ms |
- |
color-slider permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 459 kB | 108.94ms - 109.63ms | - | slower ❌ 1% - 1% 0.71ms - 1.59ms |
| branch | 445 kB | 107.85ms - 108.41ms | faster ✔ 1% - 1% 0.71ms - 1.59ms |
- |
color-wheel permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 460 kB | 107.43ms - 108.59ms | - | unsure 🔍 -0% - +1% +0.00ms - +1.55ms |
| branch | 446 kB | 106.72ms - 107.74ms | faster ✔ 0% - 1% 0.00ms - 1.55ms |
- |
combobox permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 706 kB | 37.34ms - 37.78ms | - | slower ❌ 0% - 2% 0.12ms - 0.72ms |
| branch | 692 kB | 36.93ms - 37.34ms | faster ✔ 0% - 2% 0.12ms - 0.72ms |
- |
dialog permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 514 kB | 70.25ms - 71.25ms | - | unsure 🔍 -0% - +2% -0.21ms - +1.06ms |
| branch | 497 kB | 69.94ms - 70.71ms | unsure 🔍 -1% - +0% -1.06ms - +0.21ms |
- |
divider permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 365 kB | 12.27ms - 12.36ms | - | slower ❌ 1% - 2% 0.13ms - 0.26ms |
| branch | 352 kB | 12.08ms - 12.16ms | faster ✔ 1% - 2% 0.13ms - 0.26ms |
- |
dropzone permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 373 kB | 31.23ms - 31.58ms | - | unsure 🔍 -0% - +1% -0.00ms - +0.39ms |
| branch | 360 kB | 31.11ms - 31.31ms | unsure 🔍 -1% - -0% -0.39ms - +0.00ms |
- |
field-group permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 427 kB | 82.54ms - 83.66ms | - | slower ❌ 1% - 3% 0.92ms - 2.62ms |
| branch | 411 kB | 80.69ms - 81.97ms | faster ✔ 1% - 3% 0.92ms - 2.62ms |
- |
field-label permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 394 kB | 24.74ms - 24.97ms | - | unsure 🔍 -1% - +1% -0.23ms - +0.27ms |
| branch | 381 kB | 24.62ms - 25.06ms | unsure 🔍 -1% - +1% -0.27ms - +0.23ms |
- |
help-text permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 390 kB | 14.59ms - 14.72ms | - | slower ❌ 1% - 2% 0.15ms - 0.32ms |
| branch | 377 kB | 14.36ms - 14.47ms | faster ✔ 1% - 2% 0.15ms - 0.32ms |
- |
icon permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 398 kB | 17.81ms - 17.99ms | - | slower ❌ 1% - 2% 0.10ms - 0.33ms |
| branch | 385 kB | 17.62ms - 17.75ms | faster ✔ 1% - 2% 0.10ms - 0.33ms |
- |
illustrated-message permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 408 kB | 31.73ms - 31.95ms | - | unsure 🔍 -4% - +1% -1.14ms - +0.47ms |
| branch | 395 kB | 31.38ms - 32.97ms | unsure 🔍 -1% - +4% -0.47ms - +1.14ms |
- |
infield-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 406 kB | 19.23ms - 19.47ms | - | unsure 🔍 -1% - +3% -0.16ms - +0.54ms |
| branch | 393 kB | 18.84ms - 19.49ms | unsure 🔍 -3% - +1% -0.54ms - +0.16ms |
- |
link permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 388 kB | 19.56ms - 20.30ms | - | unsure 🔍 -0% - +4% -0.04ms - +0.78ms |
| branch | 374 kB | 19.39ms - 19.73ms | unsure 🔍 -4% - +0% -0.78ms - +0.04ms |
- |
menu permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 480 kB | 205.63ms - 209.81ms | - | slower ❌ 0% - 3% 0.95ms - 6.15ms |
| branch | 465 kB | 202.63ms - 205.72ms | faster ✔ 0% - 3% 0.95ms - 6.15ms |
- |
meter permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 409 kB | 55.83ms - 60.92ms | - | unsure 🔍 -6% - +7% -3.34ms - +4.12ms |
| branch | 397 kB | 55.26ms - 60.71ms | unsure 🔍 -7% - +6% -4.12ms - +3.34ms |
- |
number-field permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 527 kB | 94.61ms - 97.38ms | - | unsure 🔍 -0% - +3% -0.30ms - +3.24ms |
| branch | 513 kB | 93.43ms - 95.63ms | unsure 🔍 -3% - +0% -3.24ms - +0.30ms |
- |
overlay permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 505 kB | 55.72ms - 57.36ms | - | unsure 🔍 -2% - +2% -0.91ms - +1.39ms |
| branch | 495 kB | 55.49ms - 57.11ms | unsure 🔍 -2% - +2% -1.39ms - +0.91ms |
- |
picker-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 418 kB | 39.28ms - 40.28ms | - | unsure 🔍 -2% - +2% -0.65ms - +0.81ms |
| branch | 404 kB | 39.16ms - 40.23ms | unsure 🔍 -2% - +2% -0.81ms - +0.65ms |
- |
picker permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 518 kB | 559.23ms - 571.72ms | - | unsure 🔍 -1% - +2% -7.52ms - +9.09ms |
| branch | 501 kB | 559.22ms - 570.16ms | unsure 🔍 -2% - +1% -9.09ms - +7.52ms |
- |
popover permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 386 kB | 21.19ms - 21.36ms | - | slower ❌ 0% - 1% 0.04ms - 0.29ms |
| branch | 373 kB | 21.01ms - 21.20ms | faster ✔ 0% - 1% 0.04ms - 0.29ms |
- |
progress-bar permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 410 kB | 45.59ms - 46.43ms | - | unsure 🔍 -0% - +2% -0.15ms - +0.95ms |
| branch | 397 kB | 45.25ms - 45.97ms | unsure 🔍 -2% - +0% -0.95ms - +0.15ms |
- |
progress-circle permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 387 kB | 48.09ms - 48.54ms | - | unsure 🔍 -0% - +1% -0.21ms - +0.46ms |
| branch | 374 kB | 47.94ms - 48.44ms | unsure 🔍 -1% - +0% -0.46ms - +0.21ms |
- |
radio permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 410 kB | 59.39ms - 61.31ms | - | unsure 🔍 -0% - +5% -0.05ms - +2.71ms |
| branch | 396 kB | 58.03ms - 60.01ms | unsure 🔍 -4% - +0% -2.71ms - +0.05ms |
- |
search permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 475 kB | 57.37ms - 58.23ms | - | unsure 🔍 -1% - +2% -0.29ms - +0.94ms |
| branch | 462 kB | 57.04ms - 57.92ms | unsure 🔍 -2% - +1% -0.94ms - +0.29ms |
- |
sidenav permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 432 kB | 263.94ms - 268.24ms | - | unsure 🔍 -0% - +2% -0.35ms - +5.90ms |
| branch | 418 kB | 261.04ms - 265.59ms | unsure 🔍 -2% - +0% -5.90ms - +0.35ms |
- |
slider permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 481 kB | 102.08ms - 104.08ms | - | unsure 🔍 -1% - +2% -0.63ms - +2.01ms |
| branch | 468 kB | 101.52ms - 103.26ms | unsure 🔍 -2% - +1% -2.01ms - +0.63ms |
- |
split-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 721 kB | 1859.44ms - 1862.21ms | - | unsure 🔍 -0% - +0% -2.35ms - +1.65ms |
| branch | 702 kB | 1859.73ms - 1862.62ms | unsure 🔍 -0% - +0% -1.65ms - +2.35ms |
- |
split-view permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 399 kB | 33.32ms - 37.32ms | - | unsure 🔍 -5% - +9% -1.85ms - +3.15ms |
| branch | 385 kB | 33.18ms - 36.16ms | unsure 🔍 -9% - +5% -3.15ms - +1.85ms |
- |
swatch permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 411 kB | 23.45ms - 24.08ms | - | unsure 🔍 -0% - +3% -0.05ms - +0.66ms |
| branch | 398 kB | 23.30ms - 23.62ms | unsure 🔍 -3% - +0% -0.66ms - +0.05ms |
- |
switch permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 405 kB | 24.93ms - 25.42ms | - | unsure 🔍 -1% - +2% -0.29ms - +0.50ms |
| branch | 390 kB | 24.76ms - 25.37ms | unsure 🔍 -2% - +1% -0.50ms - +0.29ms |
- |
table permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 539 kB | 242.70ms - 272.33ms | - | unsure 🔍 -1% - +11% -3.57ms - +26.39ms |
| branch | 497 kB | 243.87ms - 248.33ms | unsure 🔍 -10% - +1% -26.39ms - +3.57ms |
- |
tabs permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 428 kB | 101.13ms - 102.61ms | - | unsure 🔍 -1% - +1% -0.86ms - +1.26ms |
| branch | 414 kB | 100.92ms - 102.43ms | unsure 🔍 -1% - +1% -1.26ms - +0.86ms |
- |
tags permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 457 kB | 20.48ms - 20.63ms | - | unsure 🔍 -0% - +2% -0.02ms - +0.34ms |
| branch | 440 kB | 20.23ms - 20.56ms | unsure 🔍 -2% - +0% -0.34ms - +0.02ms |
- |
textfield permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 435 kB | 36.68ms - 37.27ms | - | unsure 🔍 -1% - +1% -0.50ms - +0.37ms |
| branch | 423 kB | 36.72ms - 37.35ms | unsure 🔍 -1% - +1% -0.37ms - +0.50ms |
- |
thumbnail permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 764 kB | 29.78ms - 29.93ms | - | unsure 🔍 -3% - +1% -0.77ms - +0.29ms |
| branch | 751 kB | 29.57ms - 30.62ms | unsure 🔍 -1% - +3% -0.29ms - +0.77ms |
- |
toast permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 437 kB | 42.05ms - 42.58ms | - | slower ❌ 1% - 3% 0.60ms - 1.33ms |
| branch | 422 kB | 41.10ms - 41.60ms | faster ✔ 1% - 3% 0.60ms - 1.33ms |
- |
tooltip permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 570 kB | 42.58ms - 43.22ms | - | unsure 🔍 -1% - +1% -0.26ms - +0.63ms |
| branch | 547 kB | 42.41ms - 43.02ms | unsure 🔍 -1% - +1% -0.63ms - +0.26ms |
- |
top-nav permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 435 kB | 75.06ms - 76.32ms | - | unsure 🔍 -0% - +2% -0.11ms - +1.65ms |
| branch | 420 kB | 74.30ms - 75.53ms | unsure 🔍 -2% - +0% -1.65ms - +0.11ms |
- |
tray permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 528 kB | 92.56ms - 93.28ms | - | unsure 🔍 -1% - +0% -0.85ms - +0.14ms |
| branch | 511 kB | 92.94ms - 93.61ms | unsure 🔍 -0% - +1% -0.14ms - +0.85ms |
- |
underlay permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 364 kB | 13.17ms - 13.28ms | - | slower ❌ 0% - 2% 0.02ms - 0.29ms |
| branch | 351 kB | 12.94ms - 13.19ms | faster ✔ 0% - 2% 0.02ms - 0.29ms |
- |
Firefox
accordion permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 420 kB | 270.21ms - 281.47ms | - | unsure 🔍 -2% - +4% -4.09ms - +11.49ms |
| branch | 406 kB | 266.76ms - 277.52ms | unsure 🔍 -4% - +1% -11.49ms - +4.09ms |
- |
action-bar permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 489 kB | 145.80ms - 152.16ms | - | unsure 🔍 -4% - +2% -5.28ms - +3.20ms |
| branch | 474 kB | 147.21ms - 152.83ms | unsure 🔍 -2% - +4% -3.20ms - +5.28ms |
- |
action-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 521 kB | 224.71ms - 234.77ms | - | unsure 🔍 -4% - +3% -8.50ms - +6.94ms |
| branch | 503 kB | 224.66ms - 236.38ms | unsure 🔍 -3% - +4% -6.94ms - +8.50ms |
- |
action-group permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 543 kB | 161.55ms - 169.85ms | - | unsure 🔍 -2% - +4% -3.36ms - +7.16ms |
| branch | 524 kB | 160.56ms - 167.04ms | unsure 🔍 -4% - +2% -7.16ms - +3.36ms |
- |
action-menu permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 655 kB | 321.08ms - 330.04ms | - | unsure 🔍 -3% - +1% -10.05ms - +4.33ms |
| branch | 633 kB | 322.80ms - 334.04ms | unsure 🔍 -1% - +3% -4.33ms - +10.05ms |
- |
alert-dialog permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 460 kB | 206.27ms - 213.13ms | - | unsure 🔍 -3% - +2% -5.96ms - +4.08ms |
| branch | 445 kB | 206.98ms - 214.30ms | unsure 🔍 -2% - +3% -4.08ms - +5.96ms |
- |
asset permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 364 kB | 27.58ms - 30.42ms | - | unsure 🔍 -4% - +8% -1.24ms - +2.40ms |
| branch | 351 kB | 27.28ms - 29.56ms | unsure 🔍 -8% - +4% -2.40ms - +1.24ms |
- |
avatar permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 402 kB | 53.44ms - 56.92ms | - | unsure 🔍 -3% - +6% -1.60ms - +3.08ms |
| branch | 388 kB | 52.88ms - 56.00ms | unsure 🔍 -6% - +3% -3.08ms - +1.60ms |
- |
badge permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 401 kB | 73.32ms - 77.88ms | - | unsure 🔍 -4% - +4% -3.41ms - +3.25ms |
| branch | 388 kB | 73.26ms - 78.10ms | unsure 🔍 -4% - +5% -3.25ms - +3.41ms |
- |
button-group permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 447 kB | 139.99ms - 150.09ms | - | unsure 🔍 -3% - +6% -4.84ms - +8.16ms |
| branch | 432 kB | 139.28ms - 147.48ms | unsure 🔍 -6% - +3% -8.16ms - +4.84ms |
- |
button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 453 kB | 158.50ms - 168.50ms | - | unsure 🔍 -2% - +6% -3.26ms - +9.66ms |
| branch | 438 kB | 156.20ms - 164.40ms | unsure 🔍 -6% - +2% -9.66ms - +3.26ms |
- |
card permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 510 kB | 105.18ms - 108.90ms | - | unsure 🔍 -1% - +3% -1.33ms - +3.45ms |
| branch | 493 kB | 104.48ms - 107.48ms | unsure 🔍 -3% - +1% -3.45ms - +1.33ms |
- |
checkbox permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 421 kB | 168.26ms - 176.66ms | - | unsure 🔍 -1% - +6% -0.93ms - +9.25ms |
| branch | 405 kB | 165.43ms - 171.17ms | unsure 🔍 -5% - +0% -9.25ms - +0.93ms |
- |
coachmark permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 626 kB | 414.14ms - 424.90ms | - | slower ❌ 1% - 4% 3.96ms - 15.28ms |
| branch | 611 kB | 408.12ms - 411.68ms | faster ✔ 1% - 4% 3.96ms - 15.28ms |
- |
color-area permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 457 kB | 222.68ms - 230.60ms | - | unsure 🔍 -1% - +4% -2.82ms - +8.06ms |
| branch | 443 kB | 220.28ms - 227.76ms | unsure 🔍 -4% - +1% -8.06ms - +2.82ms |
- |
color-handle permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 377 kB | 92.70ms - 100.10ms | - | unsure 🔍 -2% - +8% -1.78ms - +7.22ms |
| branch | 363 kB | 91.13ms - 96.23ms | unsure 🔍 -7% - +2% -7.22ms - +1.78ms |
- |
color-loupe permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 368 kB | 48.08ms - 49.08ms | - | unsure 🔍 -0% - +3% -0.22ms - +1.26ms |
| branch | 355 kB | 47.51ms - 48.61ms | unsure 🔍 -3% - +0% -1.26ms - +0.22ms |
- |
color-slider permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 459 kB | 210.37ms - 217.39ms | - | unsure 🔍 -1% - +4% -1.06ms - +8.38ms |
| branch | 445 kB | 207.06ms - 213.38ms | unsure 🔍 -4% - +0% -8.38ms - +1.06ms |
- |
color-wheel permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 460 kB | 199.18ms - 208.02ms | - | unsure 🔍 -1% - +4% -2.23ms - +8.35ms |
| branch | 446 kB | 197.64ms - 203.44ms | unsure 🔍 -4% - +1% -8.35ms - +2.23ms |
- |
combobox permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 706 kB | 70.80ms - 77.20ms | - | slower ❌ 10% - 21% 6.41ms - 13.23ms |
| branch | 692 kB | 62.99ms - 65.37ms | faster ✔ 9% - 17% 6.41ms - 13.23ms |
- |
dialog permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 514 kB | 117.95ms - 128.65ms | - | unsure 🔍 -4% - +6% -5.37ms - +7.37ms |
| branch | 497 kB | 118.85ms - 125.75ms | unsure 🔍 -6% - +4% -7.37ms - +5.37ms |
- |
divider permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 365 kB | 28.98ms - 31.26ms | - | unsure 🔍 -9% - +4% -2.85ms - +1.29ms |
| branch | 352 kB | 29.17ms - 32.63ms | unsure 🔍 -4% - +10% -1.29ms - +2.85ms |
- |
dropzone permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 373 kB | 49.62ms - 54.54ms | - | unsure 🔍 -6% - +8% -3.17ms - +4.09ms |
| branch | 360 kB | 48.95ms - 54.29ms | unsure 🔍 -8% - +6% -4.09ms - +3.17ms |
- |
field-group permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 427 kB | 195.48ms - 204.96ms | - | unsure 🔍 -0% - +6% +0.03ms - +11.01ms |
| branch | 411 kB | 191.93ms - 197.47ms | faster ✔ 0% - 5% 0.03ms - 11.01ms |
- |
field-label permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 394 kB | 60.51ms - 64.41ms | - | unsure 🔍 -4% - +6% -2.14ms - +3.86ms |
| branch | 381 kB | 59.32ms - 63.88ms | unsure 🔍 -6% - +3% -3.86ms - +2.14ms |
- |
help-text permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 390 kB | 30.67ms - 33.09ms | - | unsure 🔍 -2% - +7% -0.50ms - +2.14ms |
| branch | 377 kB | 30.53ms - 31.59ms | unsure 🔍 -7% - +1% -2.14ms - +0.50ms |
- |
icon permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 398 kB | 36.43ms - 38.89ms | - | unsure 🔍 -2% - +7% -0.54ms - +2.46ms |
| branch | 385 kB | 35.84ms - 37.56ms | unsure 🔍 -6% - +1% -2.46ms - +0.54ms |
- |
illustrated-message permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 408 kB | 47.02ms - 48.98ms | - | unsure 🔍 -3% - +3% -1.28ms - +1.32ms |
| branch | 395 kB | 47.13ms - 48.83ms | unsure 🔍 -3% - +3% -1.32ms - +1.28ms |
- |
infield-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 406 kB | 47.34ms - 50.34ms | - | unsure 🔍 -3% - +5% -1.57ms - +2.53ms |
| branch | 393 kB | 46.96ms - 49.76ms | unsure 🔍 -5% - +3% -2.53ms - +1.57ms |
- |
link permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 388 kB | 37.13ms - 39.67ms | - | unsure 🔍 -2% - +6% -0.71ms - +2.23ms |
| branch | 374 kB | 36.90ms - 38.38ms | unsure 🔍 -6% - +2% -2.23ms - +0.71ms |
- |
menu permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 480 kB | 440.81ms - 451.75ms | - | unsure 🔍 -1% - +2% -5.06ms - +8.94ms |
| branch | 465 kB | 439.98ms - 448.70ms | unsure 🔍 -2% - +1% -8.94ms - +5.06ms |
- |
meter permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 409 kB | 98.96ms - 103.76ms | - | unsure 🔍 -4% - +3% -4.49ms - +3.57ms |
| branch | 397 kB | 98.58ms - 105.06ms | unsure 🔍 -4% - +4% -3.57ms - +4.49ms |
- |
number-field permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 527 kB | 202.43ms - 209.33ms | - | unsure 🔍 -2% - +4% -4.47ms - +7.91ms |
| branch | 513 kB | 199.02ms - 209.30ms | unsure 🔍 -4% - +2% -7.91ms - +4.47ms |
- |
overlay permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 588 kB | 112.93ms - 115.67ms | - | unsure 🔍 -2% - +1% -2.84ms - +1.68ms |
| branch | 574 kB | 113.08ms - 116.68ms | unsure 🔍 -1% - +2% -1.68ms - +2.84ms |
- |
picker-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 418 kB | 80.36ms - 84.76ms | - | unsure 🔍 -5% - +4% -3.95ms - +3.07ms |
| branch | 404 kB | 80.26ms - 85.74ms | unsure 🔍 -4% - +5% -3.07ms - +3.95ms |
- |
picker permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 518 kB | 1026.99ms - 1048.13ms | - | unsure 🔍 -0% - +2% -4.08ms - +21.20ms |
| branch | 501 kB | 1022.08ms - 1035.92ms | unsure 🔍 -2% - +0% -21.20ms - +4.08ms |
- |
popover permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 386 kB | 41.48ms - 44.56ms | - | unsure 🔍 -6% - +5% -2.53ms - +2.37ms |
| branch | 373 kB | 41.19ms - 45.01ms | unsure 🔍 -6% - +6% -2.37ms - +2.53ms |
- |
progress-bar permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 410 kB | 81.42ms - 86.66ms | - | unsure 🔍 -3% - +6% -2.20ms - +4.84ms |
| branch | 397 kB | 80.37ms - 85.07ms | unsure 🔍 -6% - +3% -4.84ms - +2.20ms |
- |
progress-circle permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 387 kB | 69.59ms - 75.13ms | - | unsure 🔍 -4% - +7% -2.71ms - +5.15ms |
| branch | 374 kB | 68.36ms - 73.92ms | unsure 🔍 -7% - +4% -5.15ms - +2.71ms |
- |
radio permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 410 kB | 124.89ms - 131.03ms | - | unsure 🔍 -4% - +4% -4.54ms - +5.30ms |
| branch | 396 kB | 123.74ms - 131.42ms | unsure 🔍 -4% - +4% -5.30ms - +4.54ms |
- |
search permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 475 kB | 107.06ms - 114.02ms | - | unsure 🔍 -5% - +5% -4.98ms - +5.70ms |
| branch | 462 kB | 106.13ms - 114.23ms | unsure 🔍 -5% - +5% -5.70ms - +4.98ms |
- |
sidenav permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 432 kB | 523.58ms - 531.90ms | - | unsure 🔍 -1% - +2% -5.52ms - +12.20ms |
| branch | 418 kB | 516.58ms - 532.22ms | unsure 🔍 -2% - +1% -12.20ms - +5.52ms |
- |
slider permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 481 kB | 202.94ms - 211.18ms | - | unsure 🔍 -1% - +4% -2.73ms - +8.25ms |
| branch | 468 kB | 200.68ms - 207.92ms | unsure 🔍 -4% - +1% -8.25ms - +2.73ms |
- |
split-button permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 721 kB | 1651.87ms - 1658.21ms | - | unsure 🔍 -0% - +0% -4.16ms - +6.76ms |
| branch | 702 kB | 1649.29ms - 1658.19ms | unsure 🔍 -0% - +0% -6.76ms - +4.16ms |
- |
split-view permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 399 kB | 84.89ms - 91.03ms | - | unsure 🔍 -6% - +4% -4.97ms - +3.77ms |
| branch | 385 kB | 85.45ms - 91.67ms | unsure 🔍 -4% - +6% -3.77ms - +4.97ms |
- |
swatch permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 411 kB | 57.17ms - 61.47ms | - | unsure 🔍 -6% - +6% -3.67ms - +3.47ms |
| branch | 398 kB | 56.57ms - 62.27ms | unsure 🔍 -6% - +6% -3.47ms - +3.67ms |
- |
switch permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 405 kB | 59.79ms - 63.25ms | - | unsure 🔍 -5% - +4% -3.39ms - +2.27ms |
| branch | 390 kB | 59.84ms - 64.32ms | unsure 🔍 -4% - +6% -2.27ms - +3.39ms |
- |
table permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 539 kB | 442.80ms - 455.44ms | - | unsure 🔍 -2% - +2% -9.57ms - +9.89ms |
| branch | 497 kB | 441.57ms - 456.35ms | unsure 🔍 -2% - +2% -9.89ms - +9.57ms |
- |
tabs permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 428 kB | 203.25ms - 209.71ms | - | unsure 🔍 -3% - +3% -5.18ms - +5.26ms |
| branch | 414 kB | 202.33ms - 210.55ms | unsure 🔍 -3% - +3% -5.26ms - +5.18ms |
- |
tags permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 457 kB | 42.52ms - 46.04ms | - | unsure 🔍 -4% - +7% -1.58ms - +3.22ms |
| branch | 440 kB | 41.83ms - 45.09ms | unsure 🔍 -7% - +4% -3.22ms - +1.58ms |
- |
textfield permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 435 kB | 80.36ms - 86.80ms | - | unsure 🔍 -2% - +9% -1.71ms - +7.11ms |
| branch | 423 kB | 77.87ms - 83.89ms | unsure 🔍 -8% - +2% -7.11ms - +1.71ms |
- |
thumbnail permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 764 kB | 67.14ms - 68.10ms | - | unsure 🔍 -1% - +2% -0.50ms - +1.46ms |
| branch | 751 kB | 66.28ms - 68.00ms | unsure 🔍 -2% - +1% -1.46ms - +0.50ms |
- |
toast permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 437 kB | 90.02ms - 95.74ms | - | unsure 🔍 -5% - +5% -4.42ms - +4.74ms |
| branch | 422 kB | 89.15ms - 96.29ms | unsure 🔍 -5% - +5% -4.74ms - +4.42ms |
- |
tooltip permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 653 kB | 97.76ms - 106.80ms | - | slower ❌ 8% - 19% 7.44ms - 16.84ms |
| branch | 635 kB | 88.87ms - 91.41ms | faster ✔ 8% - 16% 7.44ms - 16.84ms |
- |
top-nav permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 435 kB | 148.18ms - 159.46ms | - | unsure 🔍 -3% - +6% -4.57ms - +9.33ms |
| branch | 420 kB | 147.39ms - 155.49ms | unsure 🔍 -6% - +3% -9.33ms - +4.57ms |
- |
tray permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 528 kB | 172.64ms - 180.92ms | - | unsure 🔍 -4% - +2% -7.25ms - +3.53ms |
| branch | 511 kB | 175.19ms - 182.09ms | unsure 🔍 -2% - +4% -3.53ms - +7.25ms |
- |
underlay permalink
| Version | Bytes | Avg Time | vs remote | vs branch |
|---|---|---|---|---|
| npm latest | 364 kB | 34.95ms - 38.21ms | - | unsure 🔍 -5% - +9% -1.84ms - +3.24ms |
| branch | 351 kB | 33.94ms - 37.82ms | unsure 🔍 -9% - +5% -3.24ms - +1.84ms |
- |
@TarunAdobe There are lint failures on some generated CSS files which needs to be pushed. Can you push it up and re-run the build?
These pending Buttons no longer show their text: https://1f63a3a8b3196261ee5c5581502af9a1--spectrum-web-components.netlify.app/review/
This seems wrong: https://1f63a3a8b3196261ee5c5581502af9a1--spectrum-web-components.netlify.app/review/#ProgressCircleStories/inButton.png Maybe it's just that we previously applied size="s" to the Progress Circle, but not sure if we want to control for if a users places a wrong sized Progress Circle in this location.
This change breaks Split Button delivery: https://1f63a3a8b3196261ee5c5581502af9a1--spectrum-web-components.netlify.app/review/#SplitButtonPrimaryMoreStories/m.png
This appears incorrect: https://545b05c0bd295f2de052b57383f8c16f--spectrum-web-components.netlify.app/review/#TrayStories/Default.png
See the updated CSS version here: https://opensource.adobe.com/spectrum-css/preview/?path=/story/components-tray--default
Checkout this video if you need help turning on High Contrast Mode locally: https://developer.chrome.com/docs/devtools/rendering/emulate-css
@westbrook can you confirm if this is the expected tray or am i still missing something? (if yes then I'll update the golden image hash)
This seems right to me. Is there something specific about it has you unsure?
This seems right to me. Is there something specific about it has you unsure?
Nope! I just wanted to double check before updating the golden image hash.
There are conflicts in this branch... 😢
There are conflicts in this branch... 😢
If it's a perfect world, i'd have fixed the conflicts correctly! Did I mess something up?