diff --git a/.changeset/dull-actors-pay.md b/.changeset/dull-actors-pay.md new file mode 100644 index 000000000..fce178450 --- /dev/null +++ b/.changeset/dull-actors-pay.md @@ -0,0 +1,5 @@ +--- +"@primer/primitives": major +--- + +Change `fgColor-onEmphasis` to white in dark high contrast theme diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-accent-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-accent-emphasis-linux.png index 3b1c2b086..61b5413a6 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-accent-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-accent-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-attention-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-attention-emphasis-linux.png index e30ca55ab..3dd7be31b 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-attention-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-attention-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-closed-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-closed-emphasis-linux.png index 7e2e687ae..a7bf2a2cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-closed-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-closed-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-danger-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-danger-emphasis-linux.png index 7e2e687ae..a7bf2a2cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-danger-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-danger-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-done-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-done-emphasis-linux.png index ed2c0771a..766e64da9 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-done-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-done-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-emphasis-linux.png index fd7b10011..d954994cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-neutral-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-neutral-emphasis-linux.png index 1d174807f..d954994cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-neutral-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-neutral-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-open-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-open-emphasis-linux.png index 4b67f8bde..10ce55c44 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-open-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-open-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-severe-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-severe-emphasis-linux.png index ab33f871f..5fc653030 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-severe-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-severe-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-sponsors-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-sponsors-emphasis-linux.png index 06f29c81f..84ffc29a8 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-sponsors-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-sponsors-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-success-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-success-emphasis-linux.png index 4b67f8bde..10ce55c44 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-success-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-success-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-upsell-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-upsell-emphasis-linux.png index ed2c0771a..766e64da9 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-upsell-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-bgColor-upsell-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-active-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-active-linux.png index 507dad522..a93d33954 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-active-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-active-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-hover-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-hover-linux.png index 354ee947f..a7bf2a2cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-hover-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-danger-bgColor-hover-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-fgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-fgColor-disabled-linux.png index 1d174807f..d02724ba5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-fgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-fgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-iconColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-iconColor-disabled-linux.png index 1d174807f..d02724ba5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-iconColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-invisible-iconColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-bgColor-rest-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-bgColor-rest-linux.png index 4b67f8bde..10ce55c44 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-bgColor-rest-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-bgColor-rest-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-disabled-linux.png index 941699267..b83a15acb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-rest-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-rest-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-rest-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-fgColor-rest-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-iconColor-rest-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-iconColor-rest-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-iconColor-rest-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-button-primary-iconColor-rest-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-disabled-linux.png index 1d174807f..d02724ba5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-hover-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-hover-linux.png index ea5cf7e0c..c24385336 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-hover-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-hover-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-rest-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-rest-linux.png index 3b1c2b086..61b5413a6 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-rest-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-bgColor-rest-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-borderColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-borderColor-disabled-linux.png index a73bfccb0..111d8bc10 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-borderColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-borderColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-fgColor-rest-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-fgColor-rest-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-fgColor-rest-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-checked-fgColor-rest-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-active-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-active-linux.png index 8336a8f81..a93d33954 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-active-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-active-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-hover-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-hover-linux.png index 7e2e687ae..a7bf2a2cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-hover-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-bgColor-hover-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-fgColor-hover-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-fgColor-hover-linux.png index 79d166fad..960618126 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-fgColor-hover-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-danger-fgColor-hover-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-fgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-fgColor-disabled-linux.png index 1d174807f..d02724ba5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-fgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-control-fgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlKnob-borderColor-checked-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlKnob-borderColor-checked-linux.png index aedc194c4..df1c9ec34 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlKnob-borderColor-checked-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlKnob-borderColor-checked-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-bgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-bgColor-disabled-linux.png index 1d174807f..d02724ba5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-bgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-bgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-borderColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-borderColor-disabled-linux.png index a73bfccb0..111d8bc10 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-borderColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-borderColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-fgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-fgColor-disabled-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-fgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-controlTrack-fgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-bgColor-word-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-bgColor-word-linux.png index 4b67f8bde..10ce55c44 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-bgColor-word-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-bgColor-word-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-fgColor-text-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-fgColor-text-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-fgColor-text-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-addition-fgColor-text-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-bgColor-word-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-bgColor-word-linux.png index f9fd0606c..a7bf2a2cb 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-bgColor-word-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-bgColor-word-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-fgColor-text-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-fgColor-text-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-fgColor-text-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-diffBlob-deletion-fgColor-text-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-indigo-bgColor-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-indigo-bgColor-emphasis-linux.png index 93e242072..4543fad10 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-indigo-bgColor-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-indigo-bgColor-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-plum-bgColor-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-plum-bgColor-emphasis-linux.png index 7cb65664c..17b9cd334 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-plum-bgColor-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-plum-bgColor-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-purple-bgColor-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-purple-bgColor-emphasis-linux.png index d358b2e53..88458dbe5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-purple-bgColor-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-purple-bgColor-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-red-bgColor-emphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-red-bgColor-emphasis-linux.png index ec24406e3..f79f6f0d1 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-red-bgColor-emphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-display-red-bgColor-emphasis-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-disabled-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-disabled-linux.png index 1d174807f..d02724ba5 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-disabled-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-disabled-linux.png differ diff --git a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-onEmphasis-linux.png b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-onEmphasis-linux.png index 79d166fad..aa6c5e78c 100644 Binary files a/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-onEmphasis-linux.png and b/.playwright/snapshots/storybook.test.ts-snapshots/storybook-all-color-swatches-dark-high-contrast-fgColor-onEmphasis-linux.png differ diff --git a/blob-report/report.zip b/blob-report/report.zip index fbc3f00dd..0da1e6b9b 100644 Binary files a/blob-report/report.zip and b/blob-report/report.zip differ diff --git a/contributor-docs/adrs/adr-002-fgColor-onEmphasis.md b/contributor-docs/adrs/adr-002-fgColor-onEmphasis.md index c03d8f744..071364f2b 100644 --- a/contributor-docs/adrs/adr-002-fgColor-onEmphasis.md +++ b/contributor-docs/adrs/adr-002-fgColor-onEmphasis.md @@ -2,10 +2,10 @@ ## Status -| Stage | Status | -| -------- | ------------- | -| Approved | ✅ | -| Adopted | 🚧 | +| Stage | Status | +| -------- | ------ | +| Approved | ✅ | +| Adopted | ✅ | ## Context diff --git a/contributor-docs/adrs/adr-002-neutral-scales.md b/contributor-docs/adrs/adr-003-neutral-scales.md similarity index 95% rename from contributor-docs/adrs/adr-002-neutral-scales.md rename to contributor-docs/adrs/adr-003-neutral-scales.md index 1dafef90f..d20542eeb 100644 --- a/contributor-docs/adrs/adr-002-neutral-scales.md +++ b/contributor-docs/adrs/adr-003-neutral-scales.md @@ -2,10 +2,10 @@ ## Status -| Stage | Status | -| -------- | ----------- | -| Approved | | -| Adopted | | +| Stage | Status | +| -------- | ------ | +| Approved | ✅ | +| Adopted | ✅ | ## Decision diff --git a/src/tokens/functional/color/dark/overrides/dark.dimmed.json5 b/src/tokens/functional/color/dark/overrides/dark.dimmed.json5 index e9e208d1c..f73436115 100644 --- a/src/tokens/functional/color/dark/overrides/dark.dimmed.json5 +++ b/src/tokens/functional/color/dark/overrides/dark.dimmed.json5 @@ -30,13 +30,18 @@ }, fgColor: { default: { - $value: '{base.color.neutral.9}', + $value: '{base.color.neutral.10}', $type: 'color', }, onEmphasis: { $value: '{base.color.neutral.11}', $type: 'color', }, + disabled: { + $value: '{base.color.neutral.7}', + $type: 'color', + alpha: 1, + }, }, control: { bgColor: { @@ -95,6 +100,22 @@ }, }, }, + controlKnob: { + bgColor: { + rest: { + $value: '{bgColor.inset}', + $type: 'color', + $extensions: { + 'org.primer.figma': { + collection: 'mode', + mode: 'dark', + group: 'component (internal)', + scopes: ['bgColor'], + }, + }, + }, + }, + }, diffBlob: { expander: { iconColor: { diff --git a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 index 251a5d6b0..241f6bbf3 100644 --- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 +++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 @@ -9,10 +9,6 @@ $value: '{base.color.white}', $type: 'color', }, - onEmphasis: { - $value: '{base.color.black}', - $type: 'color', - }, muted: { $value: '{base.color.neutral.9}', $type: 'color', @@ -59,8 +55,8 @@ $value: '{base.color.neutral.1}', $type: 'color', }, - emphasis: { - $value: '{base.color.white}', + disabled: { + $value: '{base.color.neutral.3}', $type: 'color', }, disabled: { @@ -69,7 +65,7 @@ }, neutral: { emphasis: { - $value: '{base.color.neutral.9}', + $value: '{base.color.neutral.6}', $type: 'color', }, }, @@ -80,7 +76,7 @@ alpha: 0.1, }, emphasis: { - $value: '{base.color.blue.4}', + $value: '{base.color.blue.9}', $type: 'color', }, }, @@ -91,7 +87,7 @@ alpha: 0.14, }, emphasis: { - $value: '{base.color.green.4}', + $value: '{base.color.green.9}', $type: 'color', }, }, @@ -109,7 +105,7 @@ alpha: 0.09, }, emphasis: { - $value: '{base.color.red.4}', + $value: '{base.color.red.9}', $type: 'color', }, }, @@ -127,13 +123,13 @@ alpha: 0.088, }, emphasis: { - $value: '{base.color.orange.4}', + $value: '{base.color.orange.9}', $type: 'color', }, }, attention: { emphasis: { - $value: '{base.color.yellow.4}', + $value: '{base.color.yellow.9}', $type: 'color', }, }, @@ -144,7 +140,7 @@ alpha: 0.09, }, emphasis: { - $value: '{base.color.purple.4}', + $value: '{base.color.purple.9}', $type: 'color', }, }, @@ -162,7 +158,7 @@ alpha: 0.09, }, emphasis: { - $value: '{base.color.pink.4}', + $value: '{base.color.pink.9}', $type: 'color', }, }, @@ -181,6 +177,11 @@ $value: '{borderColor.default}', $type: 'color', }, + disabled: { + $value: '{base.color.neutral.8}', + $type: 'color', + alpha: 0.12, + }, translucent: { $value: '{base.color.neutral.5}', $type: 'color', @@ -321,12 +322,6 @@ }, }, danger: { - fgColor: { - hover: { - $value: '{fgColor.onEmphasis}', - $type: 'color', - }, - }, bgColor: { hover: { $value: '{bgColor.danger.emphasis}', @@ -343,6 +338,22 @@ }, }, }, + checked: { + borderColor: { + rest: { + $value: '{base.color.blue.2}', + $type: 'color', + }, + hover: { + $value: '{base.color.blue.2}', + $type: 'color', + }, + active: { + $value: '{base.color.blue.2}', + $type: 'color', + }, + }, + }, }, controlTrack: { fgColor: { @@ -351,6 +362,12 @@ $type: 'color', }, }, + borderColor: { + rest: { + $value: '{borderColor.emphasis}', + $type: 'color', + }, + }, bgColor: { rest: { $value: '{base.color.neutral.4}', @@ -365,32 +382,9 @@ $type: 'color', }, }, - borderColor: { - rest: { - $value: '{borderColor.emphasis}', - $type: 'color', - }, - }, }, button: { primary: { - fgColor: { - rest: { - $value: '{fgColor.onEmphasis}', - $type: 'color', - }, - disabled: { - $value: '{fgColor.onEmphasis}', - $type: 'color', - alpha: 0.5, - }, - }, - iconColor: { - rest: { - $value: '{fgColor.onEmphasis}', - $type: 'color', - }, - }, borderColor: { rest: { $value: '{base.color.green.2}', @@ -467,6 +461,21 @@ alpha: 1, }, }, + bgColor: { + hover: { + $value: '{bgColor.danger.emphasis}', + $type: 'color', + }, + active: { + $value: '{bgColor.danger.emphasis}', + $type: 'color', + alpha: 1, + mix: { + color: '{base.color.red.7}', + weight: 0.4, + }, + }, + }, }, inactive: { bgColor: { @@ -514,7 +523,7 @@ }, bgColor: { word: { - $value: '{base.color.green.4}', + $value: '{bgColor.success.emphasis}', $type: 'color', alpha: 1, }, @@ -529,7 +538,7 @@ }, bgColor: { word: { - $value: '{base.color.red.5}', + $value: '{bgColor.danger.emphasis}', $type: 'color', alpha: 1, }, @@ -578,7 +587,7 @@ blue: { bgColor: { emphasis: { - $value: '{base.display.color.blue.6}', + $value: '{base.display.color.blue.3}', $type: 'color', }, }, @@ -596,7 +605,7 @@ indigo: { bgColor: { emphasis: { - $value: '{base.display.color.indigo.6}', + $value: '{base.display.color.indigo.3}', $type: 'color', }, }, @@ -614,7 +623,7 @@ gray: { bgColor: { emphasis: { - $value: '{base.display.color.gray.6}', + $value: '{base.display.color.gray.3}', $type: 'color', }, }, @@ -632,7 +641,7 @@ cyan: { bgColor: { emphasis: { - $value: '{base.display.color.cyan.6}', + $value: '{base.display.color.cyan.3}', $type: 'color', }, }, @@ -650,7 +659,7 @@ teal: { bgColor: { emphasis: { - $value: '{base.display.color.teal.6}', + $value: '{base.display.color.teal.3}', $type: 'color', }, }, @@ -668,7 +677,7 @@ pine: { bgColor: { emphasis: { - $value: '{base.display.color.pine.6}', + $value: '{base.display.color.pine.3}', $type: 'color', }, }, @@ -686,7 +695,7 @@ green: { bgColor: { emphasis: { - $value: '{base.display.color.green.6}', + $value: '{base.display.color.green.3}', $type: 'color', }, }, @@ -704,7 +713,7 @@ lime: { bgColor: { emphasis: { - $value: '{base.display.color.lime.6}', + $value: '{base.display.color.lime.3}', $type: 'color', }, }, @@ -722,7 +731,7 @@ olive: { bgColor: { emphasis: { - $value: '{base.display.color.olive.6}', + $value: '{base.display.color.olive.3}', $type: 'color', }, }, @@ -740,7 +749,7 @@ lemon: { bgColor: { emphasis: { - $value: '{base.display.color.lemon.6}', + $value: '{base.display.color.lemon.3}', $type: 'color', }, }, @@ -758,7 +767,7 @@ yellow: { bgColor: { emphasis: { - $value: '{base.display.color.yellow.6}', + $value: '{base.display.color.yellow.3}', $type: 'color', }, }, @@ -776,7 +785,7 @@ orange: { bgColor: { emphasis: { - $value: '{base.display.color.orange.6}', + $value: '{base.display.color.orange.3}', $type: 'color', }, }, @@ -794,7 +803,7 @@ red: { bgColor: { emphasis: { - $value: '{base.display.color.red.6}', + $value: '{base.display.color.red.3}', $type: 'color', }, }, @@ -812,7 +821,7 @@ coral: { bgColor: { emphasis: { - $value: '{base.display.color.coral.6}', + $value: '{base.display.color.coral.3}', $type: 'color', }, }, @@ -830,7 +839,7 @@ pink: { bgColor: { emphasis: { - $value: '{base.display.color.pink.6}', + $value: '{base.display.color.pink.3}', $type: 'color', }, }, @@ -848,7 +857,7 @@ plum: { bgColor: { emphasis: { - $value: '{base.display.color.plum.6}', + $value: '{base.display.color.plum.3}', $type: 'color', }, }, @@ -866,7 +875,7 @@ purple: { bgColor: { emphasis: { - $value: '{base.display.color.purple.6}', + $value: '{base.display.color.purple.3}', $type: 'color', }, }, @@ -884,7 +893,7 @@ brown: { bgColor: { emphasis: { - $value: '{base.display.color.brown.6}', + $value: '{base.display.color.brown.3}', $type: 'color', }, }, @@ -902,7 +911,7 @@ auburn: { bgColor: { emphasis: { - $value: '{base.display.color.auburn.6}', + $value: '{base.display.color.auburn.3}', $type: 'color', }, }, diff --git a/src/tokens/functional/color/dark/patterns-dark.json5 b/src/tokens/functional/color/dark/patterns-dark.json5 index b3df7926b..251a00923 100644 --- a/src/tokens/functional/color/dark/patterns-dark.json5 +++ b/src/tokens/functional/color/dark/patterns-dark.json5 @@ -504,7 +504,7 @@ }, borderColor: { rest: { - $value: '{bgColor.accent.emphasis}', + $value: '{control.checked.bgColor.rest}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -516,7 +516,7 @@ }, }, hover: { - $value: '{bgColor.accent.emphasis}', + $value: '{control.checked.bgColor.hover}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -526,13 +526,9 @@ scopes: ['borderColor'], }, }, - mix: { - color: '{base.color.blue.3}', - weight: 0.2, - }, }, active: { - $value: '{bgColor.accent.emphasis}', + $value: '{control.checked.bgColor.active}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -542,13 +538,9 @@ scopes: ['borderColor'], }, }, - mix: { - color: '{base.color.blue.3}', - weight: 0.4, - }, }, disabled: { - $value: '{fgColor.disabled}', + $value: '{control.checked.bgColor.disabled}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -641,7 +633,7 @@ }, borderColor: { rest: { - $value: '{base.color.transparent}', + $value: '{borderColor.default}', $type: 'color', $extensions: { 'org.primer.figma': { diff --git a/src/tokens/functional/color/dark/primitives-dark.json5 b/src/tokens/functional/color/dark/primitives-dark.json5 index d87bd7462..92843011d 100644 --- a/src/tokens/functional/color/dark/primitives-dark.json5 +++ b/src/tokens/functional/color/dark/primitives-dark.json5 @@ -92,6 +92,7 @@ scopes: ['fgColor'], }, }, + alpha: 0.6, }, link: { $value: '{fgColor.accent}', @@ -802,7 +803,7 @@ }, }, disabled: { - $value: '{bgColor.disabled}', + $value: '{base.color.neutral.7}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -812,6 +813,7 @@ scopes: ['borderColor'], }, }, + alpha: 0.1, }, transparent: { $value: '{base.color.transparent}', diff --git a/src/tokens/functional/color/light/overrides/light.high-contrast.json5 b/src/tokens/functional/color/light/overrides/light.high-contrast.json5 index f087eea69..45f22c3e7 100644 --- a/src/tokens/functional/color/light/overrides/light.high-contrast.json5 +++ b/src/tokens/functional/color/light/overrides/light.high-contrast.json5 @@ -97,6 +97,11 @@ $value: '{borderColor.default}', $type: 'color', }, + disabled: { + $value: '{base.color.neutral.8}', + $type: 'color', + alpha: 0.12, + }, translucent: { $value: '{base.color.neutral.8}', $type: 'color', diff --git a/src/tokens/functional/color/light/patterns-light.json5 b/src/tokens/functional/color/light/patterns-light.json5 index 06635896a..f0aef0cda 100644 --- a/src/tokens/functional/color/light/patterns-light.json5 +++ b/src/tokens/functional/color/light/patterns-light.json5 @@ -503,7 +503,7 @@ }, borderColor: { rest: { - $value: '{bgColor.accent.emphasis}', + $value: '{control.checked.bgColor.rest}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -515,7 +515,7 @@ }, }, hover: { - $value: '{bgColor.accent.emphasis}', + $value: '{control.checked.bgColor.hover}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -525,13 +525,9 @@ scopes: ['borderColor'], }, }, - mix: { - color: '{base.color.blue.7}', - weight: 0.2, - }, }, active: { - $value: '{bgColor.accent.emphasis}', + $value: '{control.checked.bgColor.active}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -541,13 +537,9 @@ scopes: ['borderColor'], }, }, - mix: { - color: '{base.color.blue.7}', - weight: 0.4, - }, }, disabled: { - $value: '{fgColor.disabled}', + $value: '{control.checked.bgColor.disabled}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -640,7 +632,7 @@ }, borderColor: { rest: { - $value: '{base.color.transparent}', + $value: '{borderColor.default}', $type: 'color', $extensions: { 'org.primer.figma': { diff --git a/src/tokens/functional/color/light/primitives-light.json5 b/src/tokens/functional/color/light/primitives-light.json5 index 59b3c56a7..3cbf4c0ca 100644 --- a/src/tokens/functional/color/light/primitives-light.json5 +++ b/src/tokens/functional/color/light/primitives-light.json5 @@ -796,7 +796,7 @@ }, }, disabled: { - $value: '{bgColor.disabled}', + $value: '{base.color.neutral.7}', $type: 'color', $extensions: { 'org.primer.figma': { @@ -806,6 +806,7 @@ scopes: ['borderColor'], }, }, + alpha: 0.1 }, transparent: { $value: '{base.color.transparent}', @@ -975,7 +976,7 @@ alpha: 0.4, }, emphasis: { - $value: '{base.color.yellow.4}', + $value: '{base.color.yellow.5}', $type: 'color', $extensions: { 'org.primer.figma': {