From f706f87eb736b5c5ab208fdd3b72a22815e7e6df Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Tue, 17 Dec 2024 10:37:48 -0800 Subject: [PATCH 1/2] chore: resolve conflict --- yarn.lock | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 09d0829b675..31249682bb7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7216,10 +7216,31 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629, caniuse-lite@npm:^1.0.30001640, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001669": - version: 1.0.30001690 - resolution: "caniuse-lite@npm:1.0.30001690" - checksum: 10c0/646bd469032afa90400a84dec30a2b00a6eda62c03ead358117e3f884cda8aacec02ec058a6dbee5eaf9714f83e483b9b0eb4fb42febb8076569f5ca40f1d347 +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001640": + version: 1.0.30001643 + resolution: "caniuse-lite@npm:1.0.30001643" + checksum: 10c0/7fcd0fd180bbe6764311ad57b0d39c23afdcc3bb1d8f804e7a76752c62a85b1bb7cf74b672d9da2f0afe7ad75336ff811a6fe279eb2a54bc04c272b6b62e57f1 + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001629": + version: 1.0.30001636 + resolution: "caniuse-lite@npm:1.0.30001636" + checksum: 10c0/e5f965b4da7bae1531fd9f93477d015729ff9e3fa12670ead39a9e6cdc4c43e62c272d47857c5cc332e7b02d697cb3f2f965a1030870ac7476da60c2fc81ee94 + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001646": + version: 1.0.30001660 + resolution: "caniuse-lite@npm:1.0.30001660" + checksum: 10c0/d28900b56c597176d515c3175ca75c454f2d30cb2c09a44d7bdb009bb0c4d8a2557905adb77642889bbe9feb85fbfe9d974c8b8e53521fb4b50ee16ab246104e + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001669": + version: 1.0.30001673 + resolution: "caniuse-lite@npm:1.0.30001673" + checksum: 10c0/0e73a2b0f06973052e563dec9990a6fd440d510fa2ff54fa50310e736abb86e96c96b43c10e609fc22f2109f98fe76428b70441baf6b1a49f69ccf50c1879f6b languageName: node linkType: hard From 078ba811c31a1f5549b054d23fb4bc62342b52ce Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Wed, 13 Nov 2024 11:51:07 -0800 Subject: [PATCH 2/2] fix: conflict --- .changeset/clever-otters-mix.md | 25 ++++++++++++++++ .github/workflows/lint.yml | 2 +- components/assetcard/index.css | 2 +- components/assetcard/themes/express.css | 2 +- components/assetcard/themes/spectrum.css | 2 +- components/calendar/index.css | 2 -- components/calendar/metadata/metadata.json | 2 -- components/card/index.css | 2 +- components/card/metadata/metadata.json | 1 - components/checkbox/index.css | 3 +- components/colorarea/index.css | 2 +- components/infieldbutton/index.css | 2 +- .../infieldbutton/metadata/metadata.json | 2 +- components/logicbutton/index.css | 2 +- components/modal/index.css | 2 +- components/modal/metadata/metadata.json | 1 - components/progressbar/index.css | 2 +- components/radio/index.css | 2 +- components/radio/metadata/metadata.json | 2 +- components/stepper/index.css | 24 +++++---------- components/stepper/metadata/metadata.json | 8 +---- components/stepper/themes/spectrum.css | 5 ++++ components/table/index.css | 6 ++-- components/table/metadata/metadata.json | 3 -- components/tooltip/index.css | 3 +- components/underlay/index.css | 1 - stylelint.config.js | 2 +- yarn.lock | 29 +++---------------- 28 files changed, 63 insertions(+), 78 deletions(-) create mode 100644 .changeset/clever-otters-mix.md diff --git a/.changeset/clever-otters-mix.md b/.changeset/clever-otters-mix.md new file mode 100644 index 00000000000..c7eb9394ea4 --- /dev/null +++ b/.changeset/clever-otters-mix.md @@ -0,0 +1,25 @@ +--- +"@spectrum-css/infieldbutton": minor +"@spectrum-css/logicbutton": minor +"@spectrum-css/progressbar": minor +"@spectrum-css/colorwheel": minor +"@spectrum-css/assetcard": minor +"@spectrum-css/colorarea": minor +"@spectrum-css/calendar": minor +"@spectrum-css/checkbox": minor +"@spectrum-css/underlay": minor +"@spectrum-css/stepper": minor +"@spectrum-css/button": minor +"@spectrum-css/modal": minor +"@spectrum-css/radio": minor +"@spectrum-css/table": minor +"@spectrum-css/card": minor +"@spectrum-css/site": minor +"@spectrum-css/tokens": minor +--- + +This resolves our remaining stylelint issues around undefined tokens, rule order, unused values and color syntax. + +- Updates invalid color syntax from `rgba(N, N, N, N)` to `rgba(N N N / N)`. +- In cases of duplicate properties, preserves the property that would be applied given current code structure. +- Updates misnamed tokens to use valid tokens (`table/index.css`). diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c3ff97a0b33..5a4fce6d2fc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -86,7 +86,7 @@ jobs: filter_mode: diff_context # stylelint_input: "components/*/index.css components/*/themes/*.css" stylelint_input: "${{ inputs.styles_added_files }} ${{ inputs.styles_modified_files }}" - stylelint_config: stylelint.config.js + stylelint_config: "${{ github.workspace }}/stylelint.config.js" - name: Run eslint on packages and stories uses: reviewdog/action-eslint@v1.31.0 diff --git a/components/assetcard/index.css b/components/assetcard/index.css index 3664978d933..6b7d0f9a4e6 100644 --- a/components/assetcard/index.css +++ b/components/assetcard/index.css @@ -272,7 +272,7 @@ border-radius: var(--mod-assetcard-selectionindicator-border-radius, var(--spectrum-assetcard-selectionindicator-border-radius)); - box-shadow: 0 var(--spectrum-assetcard-selectionindicator-offset-y) var(--spectrum-assetcard-selectionindicator-blur) rgb(0, 0, 0, 15%); + box-shadow: 0 var(--spectrum-assetcard-selectionindicator-offset-y) var(--spectrum-assetcard-selectionindicator-blur) rgb(0 0 0 / 15%); color: var(--highcontrast-assetcard-selectionindicator-color, var(--mod-assetcard-selectionindicator-color, var(--spectrum-assetcard-selectionindicator-color))); font-weight: var(--mod-assetcard-selectionindicator-font-weight, var(--spectrum-assetcard-selectionindicator-font-weight)); diff --git a/components/assetcard/themes/express.css b/components/assetcard/themes/express.css index f208227f90e..42a72f70700 100644 --- a/components/assetcard/themes/express.css +++ b/components/assetcard/themes/express.css @@ -15,6 +15,6 @@ @container (--system: express) { .spectrum-AssetCard { - --spectrum-assetcard-overlay-background-color: rgba(109, 115, 246, 20%); + --spectrum-assetcard-overlay-background-color: rgba(109 115 246 / 20%); } } diff --git a/components/assetcard/themes/spectrum.css b/components/assetcard/themes/spectrum.css index 6104113334b..d3b3caf11c2 100644 --- a/components/assetcard/themes/spectrum.css +++ b/components/assetcard/themes/spectrum.css @@ -13,6 +13,6 @@ @container (--system: spectrum) { .spectrum-AssetCard { - --spectrum-assetcard-overlay-background-color: rgba(27, 127, 245, 10%); + --spectrum-assetcard-overlay-background-color: rgba(27 127 245 / 10%); } } diff --git a/components/calendar/index.css b/components/calendar/index.css index 095530088c8..2e063508df9 100644 --- a/components/calendar/index.css +++ b/components/calendar/index.css @@ -413,7 +413,6 @@ @media (forced-colors: active) { .spectrum-Calendar-prevMonth, .spectrum-Calendar-nextMonth { - --highcontrast-calendar-button-icon-color-disabled: GrayText; --highcontrast-calendar-button-icon-color: ButtonText; } @@ -429,7 +428,6 @@ --highcontrast-calendar-day-text-color-disabled: GrayText; --highcontrast-calendar-day-text-color-hover: ButtonText; --highcontrast-calendar-day-text-color-key-focus: ButtonText; - --highcontrast-calendar-day-text-color-selected-hover: HighlightText; --highcontrast-calendar-day-text-color-selected: HighlightText; --highcontrast-calendar-day-title-text-color: CanvasText; --highcontrast-calendar-day-today-background-color-selected-hover: Highlight; diff --git a/components/calendar/metadata/metadata.json b/components/calendar/metadata/metadata.json index be6710fa5c1..f4998b63803 100644 --- a/components/calendar/metadata/metadata.json +++ b/components/calendar/metadata/metadata.json @@ -170,7 +170,6 @@ "passthroughs": [], "high-contrast": [ "--highcontrast-calendar-button-icon-color", - "--highcontrast-calendar-button-icon-color-disabled", "--highcontrast-calendar-day-background-color-cap-selected", "--highcontrast-calendar-day-background-color-down", "--highcontrast-calendar-day-background-color-hover", @@ -183,7 +182,6 @@ "--highcontrast-calendar-day-text-color-hover", "--highcontrast-calendar-day-text-color-key-focus", "--highcontrast-calendar-day-text-color-selected", - "--highcontrast-calendar-day-text-color-selected-hover", "--highcontrast-calendar-day-title-text-color", "--highcontrast-calendar-day-today-background-color-selected-hover", "--highcontrast-calendar-day-today-border-color", diff --git a/components/card/index.css b/components/card/index.css index a39a9e85340..06bbb3a48a7 100644 --- a/components/card/index.css +++ b/components/card/index.css @@ -158,7 +158,7 @@ } &.is-drop-target { - --mod-card-background-color: var(--spectrum-card-background-color-quiet, var(--spectrum-background-base-color)); + --mod-card-background-color: var(--spectrum-background-base-color); border-color: var(--highcontrast-card-border-color-selected, var(--mod-card-border-color-selected, var(--spectrum-card-border-color-selected))); box-shadow: 0 0 0 1px var(--highcontrast-card-border-color-selected, var(--mod-card-border-color-selected, var(--spectrum-card-border-color-selected))); diff --git a/components/card/metadata/metadata.json b/components/card/metadata/metadata.json index 51b2fb5cabe..64cece37b44 100644 --- a/components/card/metadata/metadata.json +++ b/components/card/metadata/metadata.json @@ -148,7 +148,6 @@ "--spectrum-card-actions-size", "--spectrum-card-actions-spacing", "--spectrum-card-background-color", - "--spectrum-card-background-color-quiet", "--spectrum-card-body-font-color", "--spectrum-card-body-font-family", "--spectrum-card-body-font-size", diff --git a/components/checkbox/index.css b/components/checkbox/index.css index f2c87f2c4db..24f627cb065 100644 --- a/components/checkbox/index.css +++ b/components/checkbox/index.css @@ -442,6 +442,8 @@ } .spectrum-Checkbox-box { + --spectrum-checkbox-spacing: calc(var(--mod-checkbox-height, var(--spectrum-checkbox-height)) - var(--mod-checkbox-control-size, var(--spectrum-checkbox-control-size))); + display: flex; align-items: center; justify-content: center; @@ -452,7 +454,6 @@ block-size: var(--mod-checkbox-control-size, var(--spectrum-checkbox-control-size)); /* Fix vertical alignment when not wrapping since we're flex-start */ - --spectrum-checkbox-spacing: calc(var(--mod-checkbox-height, var(--spectrum-checkbox-height)) - var(--mod-checkbox-control-size, var(--spectrum-checkbox-control-size))); margin: calc(var(--mod-checkbox-spacing, var(--spectrum-checkbox-spacing)) / 2) 0; flex-grow: 0; diff --git a/components/colorarea/index.css b/components/colorarea/index.css index 3c83d4b484d..46dfff23137 100644 --- a/components/colorarea/index.css +++ b/components/colorarea/index.css @@ -15,7 +15,7 @@ .spectrum-ColorArea { --spectrum-colorarea-border-radius: var(--spectrum-color-area-border-rounding); - --spectrum-colorarea-border-color: rgb(0 0 0 / 10%); /* TODO replace with token --spectrum-color-area-border-color and --spectrum-color-area-border-opacity using RGBA function */ + --spectrum-colorarea-border-color: rgba(0 0 0 / 10%); /* TODO replace with token --spectrum-color-area-border-color and --spectrum-color-area-border-opacity using RGBA function */ --spectrum-colorarea-disabled-background-color: var(--spectrum-disabled-background-color); --spectrum-colorarea-border-width: var(--spectrum-color-area-border-width); --spectrum-colorarea-height: var(--spectrum-color-area-height); diff --git a/components/infieldbutton/index.css b/components/infieldbutton/index.css index 2cf8eb7c715..37cf5f8b8f6 100644 --- a/components/infieldbutton/index.css +++ b/components/infieldbutton/index.css @@ -202,7 +202,7 @@ align-items: center; justify-content: var(--mod-infield-button-fill-justify-content, var(--spectrum-infield-button-fill-justify-content)); - transition: border-color var(--spectrum-global-animation-duration-100) ease-in-out; + transition: border-color var(--spectrum-animation-duration-100) ease-in-out; } /* Stacked in-field buttons */ diff --git a/components/infieldbutton/metadata/metadata.json b/components/infieldbutton/metadata/metadata.json index 1b524213f41..c2b3804b3f6 100644 --- a/components/infieldbutton/metadata/metadata.json +++ b/components/infieldbutton/metadata/metadata.json @@ -129,6 +129,7 @@ "--spectrum-infield-button-width" ], "global": [ + "--spectrum-animation-duration-100", "--spectrum-border-width-100", "--spectrum-component-height-100", "--spectrum-component-height-200", @@ -138,7 +139,6 @@ "--spectrum-corner-radius-75", "--spectrum-disabled-background-color", "--spectrum-disabled-content-color", - "--spectrum-global-animation-duration-100", "--spectrum-gray-200", "--spectrum-gray-300", "--spectrum-gray-400", diff --git a/components/logicbutton/index.css b/components/logicbutton/index.css index c2f85821aac..739e201a3ca 100644 --- a/components/logicbutton/index.css +++ b/components/logicbutton/index.css @@ -108,7 +108,6 @@ } .spectrum-LogicButton { - --highcontrast-logic-button-and-background-color: ButtonFace; --highcontrast-logic-button-and-background-color-hover: ButtonFace; --highcontrast-logic-button-and-border-color: ButtonText; @@ -119,6 +118,7 @@ --highcontrast-logic-button-or-border-color: ButtonText; --highcontrast-logic-button-or-border-color-hover: Highlight; --highcontrast-logic-button-or-text-color: ButtonText; + forced-color-adjust: none; &:disabled, diff --git a/components/modal/index.css b/components/modal/index.css index fb6b22c0ef8..a24991179e5 100644 --- a/components/modal/index.css +++ b/components/modal/index.css @@ -75,7 +75,7 @@ @extend %spectrum-overlay; /* Start offset by the animation distance */ - transform: translateY(var(--mod-modal-confirm-entry-animation-distance, var(--spectrum-modal-confirm-entry-animation-distance))); + transform: translateY(var(--mod-modal-confirm-entry-animation-distance)); /* Appear above underlay */ z-index: 2; diff --git a/components/modal/metadata/metadata.json b/components/modal/metadata/metadata.json index 0fcba109eea..8c056a66149 100644 --- a/components/modal/metadata/metadata.json +++ b/components/modal/metadata/metadata.json @@ -30,7 +30,6 @@ "--spectrum-modal-background-color", "--spectrum-modal-confirm-border-radius", "--spectrum-modal-confirm-entry-animation-delay", - "--spectrum-modal-confirm-entry-animation-distance", "--spectrum-modal-confirm-entry-animation-duration", "--spectrum-modal-confirm-exit-animation-delay", "--spectrum-modal-confirm-exit-animation-duration", diff --git a/components/progressbar/index.css b/components/progressbar/index.css index 970c7adf162..02a2aaf1786 100644 --- a/components/progressbar/index.css +++ b/components/progressbar/index.css @@ -273,7 +273,7 @@ .spectrum-ProgressBar-track { --highcontrast-progressbar-fill-color: ButtonText; --highcontrast-progressbar-track-color: ButtonFace; - forced-color-adjust: none; border: 1px solid ButtonText; + forced-color-adjust: none; } } diff --git a/components/radio/index.css b/components/radio/index.css index 37e128bdb45..9a8372635c5 100644 --- a/components/radio/index.css +++ b/components/radio/index.css @@ -49,7 +49,7 @@ --spectrum-radio-button-checked-border-color-default: var(--spectrum-neutral-background-color-selected-default); --spectrum-radio-button-checked-border-color-hover: var(--spectrum-neutral-background-color-selected-hover); --spectrum-radio-button-checked-border-color-down: var(--spectrum-neutral-background-color-selected-down); - --spectrum-radio-button-checked-border-color-focus: var(--spectrum-neutral-background-color-selected-focus); + --spectrum-radio-button-checked-border-color-focus: var(--spectrum-neutral-background-color-selected-key-focus); /* spacing all themes */ --spectrum-radio-text-to-control: var(--spectrum-text-to-control-100); diff --git a/components/radio/metadata/metadata.json b/components/radio/metadata/metadata.json index 9fd6219975e..a37bbf5dbfe 100644 --- a/components/radio/metadata/metadata.json +++ b/components/radio/metadata/metadata.json @@ -158,8 +158,8 @@ "--spectrum-line-height-100", "--spectrum-neutral-background-color-selected-default", "--spectrum-neutral-background-color-selected-down", - "--spectrum-neutral-background-color-selected-focus", "--spectrum-neutral-background-color-selected-hover", + "--spectrum-neutral-background-color-selected-key-focus", "--spectrum-neutral-content-color-default", "--spectrum-neutral-content-color-down", "--spectrum-neutral-content-color-hover", diff --git a/components/stepper/index.css b/components/stepper/index.css index 23e913843d7..0b667482ce8 100644 --- a/components/stepper/index.css +++ b/components/stepper/index.css @@ -89,10 +89,6 @@ } } -.x { - border-radius: var(--spectrum-stepper-button-border-radius-reset); -} - .spectrum-Stepper { position: relative; display: inline-flex; @@ -173,6 +169,13 @@ } /*** Quiet ***/ + +/* stylelint-disable-next-line selector-class-pattern -- .hide-stepper class is deprecated for S2 */ +.spectrum-Stepper.spectrum-Stepper--quiet.hide-stepper .spectrum-Stepper-input { + border-inline-end-width: 0; + border-end-end-radius: 0; +} + .spectrum-Stepper.spectrum-Stepper--quiet { --mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color, var(--spectrum-stepper-border-color))); @@ -182,11 +185,6 @@ border-end-start-radius: 0; border-end-end-radius: 0; - &.hide-stepper .spectrum-Stepper-input { - border-inline-end-width: 0; - border-end-end-radius: 0; - } - &::after { content: ""; position: absolute; @@ -279,7 +277,7 @@ transition: border-color var(--mod-stepper-animation-duration, var(--spectrum-stepper-animation-duration)) ease-in-out; } -/* hide-stepper */ +/* stylelint-disable-next-line selector-class-pattern -- .hide-stepper class is deprecated for S2 */ .spectrum-Stepper.hide-stepper .spectrum-Stepper-input { border-start-end-radius: var(--mod-stepper-border-radius, var(--spectrum-stepper-border-radius)); border-end-end-radius: var(--mod-stepper-border-radius, var(--spectrum-stepper-border-radius)); @@ -293,10 +291,6 @@ --highcontrast-stepper-border-color-focus: Highlight; --highcontrast-stepper-border-color-focus-hover: Highlight; --highcontrast-stepper-border-color-keyboard-focus: CanvasText; - --highcontrast-stepper-button-background-color-default: Canvas; - --highcontrast-stepper-button-background-color-hover: Canvas; - --highcontrast-stepper-button-background-color-focus: Canvas; - --highcontrast-stepper-button-background-color-keyboard-focus: Canvas; --highcontrast-stepper-focus-indicator-color: Highlight; &.is-invalid { @@ -305,12 +299,10 @@ --highcontrast-stepper-border-color-focus: Highlight; --highcontrast-stepper-border-color-focus-hover: Highlight; --highcontrast-stepper-border-color-keyboard-focus: Highlight; - --highcontrast-infield-button-border-color: Highlight; } &.is-disabled { --highcontrast-stepper-border-color: GrayText; - --highcontrast-infield-button-border-color: GrayText; --highcontrast-stepper-buttons-border-width: var(--mod-stepper-border-width, var(--spectrum-stepper-border-width)); } } diff --git a/components/stepper/metadata/metadata.json b/components/stepper/metadata/metadata.json index 7d2ac4ad7cf..bcb70b78484 100644 --- a/components/stepper/metadata/metadata.json +++ b/components/stepper/metadata/metadata.json @@ -56,8 +56,7 @@ ".spectrum-Stepper:focus:not(.is-disabled) .spectrum-Stepper-input", ".spectrum-Stepper:hover:not(.is-disabled) .spectrum-Stepper-buttons", ".spectrum-Stepper:hover:not(.is-disabled) .spectrum-Stepper-input", - ".spectrum-Stepper:hover:not(.is-invalid)", - ".x" + ".spectrum-Stepper:hover:not(.is-invalid)" ], "modifiers": [ "--mod-stepper-animation-duration", @@ -197,16 +196,11 @@ "--mod-textfield-icon-spacing-inline-start-invalid" ], "high-contrast": [ - "--highcontrast-infield-button-border-color", "--highcontrast-stepper-border-color", "--highcontrast-stepper-border-color-focus", "--highcontrast-stepper-border-color-focus-hover", "--highcontrast-stepper-border-color-hover", "--highcontrast-stepper-border-color-keyboard-focus", - "--highcontrast-stepper-button-background-color-default", - "--highcontrast-stepper-button-background-color-focus", - "--highcontrast-stepper-button-background-color-hover", - "--highcontrast-stepper-button-background-color-keyboard-focus", "--highcontrast-stepper-buttons-background-color", "--highcontrast-stepper-buttons-border-width", "--highcontrast-stepper-focus-indicator-color" diff --git a/components/stepper/themes/spectrum.css b/components/stepper/themes/spectrum.css index 17bb6158b38..8d9c9c44854 100644 --- a/components/stepper/themes/spectrum.css +++ b/components/stepper/themes/spectrum.css @@ -39,5 +39,10 @@ --spectrum-stepper-button-background-color-focus: var(--spectrum-gray-300); --spectrum-stepper-button-background-color-keyboard-focus: var(--spectrum-gray-200); + + &.is-disabled { + --spectrum-stepper-buttons-background-color: var(--spectrum-gray-50); + --spectrum-stepper-buttons-border-width: 0; + } } } diff --git a/components/table/index.css b/components/table/index.css index 9f58a1b3265..dbbb99d0b57 100644 --- a/components/table/index.css +++ b/components/table/index.css @@ -68,8 +68,8 @@ --spectrum-table-icon-color-default: var(--spectrum-neutral-subdued-content-color-default); --spectrum-table-icon-color-hover: var(--spectrum-neutral-subdued-content-color-hover); --spectrum-table-icon-color-active: var(--spectrum-neutral-subdued-content-color-down); - --spectrum-table-icon-color-focus: var(--spectrum-neutral-subdued-content-color-focus); - --spectrum-table-icon-color-focus-hover: var(--spectrum-neutral-subdued-content-focus-hover); + --spectrum-table-icon-color-focus: var(--spectrum-neutral-subdued-content-color-key-focus); + --spectrum-table-icon-color-focus-hover: var(--spectrum-neutral-subdued-content-color-hover); --spectrum-table-icon-color-key-focus: var(--spectrum-neutral-subdued-content-color-key-focus); /* Row Selection */ @@ -353,12 +353,10 @@ --highcontrast-table-selected-row-background-color: Highlight; --highcontrast-table-selected-row-text-color: HighlightText; - --highcontrast-table-selected-row-text-color-default: HighlightText; @supports (color: SelectedItem) { --highcontrast-table-selected-row-background-color: SelectedItem; --highcontrast-table-selected-row-text-color: SelectedItemText; - --highcontrast-table-selected-row-text-color-default: SelectedItemText; } --highcontrast-table-selected-row-background-color-focus: Highlight; diff --git a/components/table/metadata/metadata.json b/components/table/metadata/metadata.json index 4b33650d334..11b5b870409 100644 --- a/components/table/metadata/metadata.json +++ b/components/table/metadata/metadata.json @@ -415,10 +415,8 @@ "--spectrum-neutral-content-color-default", "--spectrum-neutral-subdued-content-color-default", "--spectrum-neutral-subdued-content-color-down", - "--spectrum-neutral-subdued-content-color-focus", "--spectrum-neutral-subdued-content-color-hover", "--spectrum-neutral-subdued-content-color-key-focus", - "--spectrum-neutral-subdued-content-focus-hover", "--spectrum-regular-font-weight", "--spectrum-sans-font-family-stack", "--spectrum-spacing-300", @@ -452,7 +450,6 @@ "--highcontrast-table-selected-row-background-color", "--highcontrast-table-selected-row-background-color-focus", "--highcontrast-table-selected-row-text-color", - "--highcontrast-table-selected-row-text-color-default", "--highcontrast-table-selected-row-text-color-focus", "--highcontrast-table-transition-duration" ] diff --git a/components/tooltip/index.css b/components/tooltip/index.css index 52cc8832746..57715aefd8f 100644 --- a/components/tooltip/index.css +++ b/components/tooltip/index.css @@ -77,11 +77,12 @@ } .spectrum-Tooltip-tip { - forced-color-adjust: none; --highcontrast-tooltip-background-color-default: CanvasText; --highcontrast-tooltip-background-color-informative: CanvasText; --highcontrast-tooltip-background-color-positive: CanvasText; --highcontrast-tooltip-background-color-negative: CanvasText; + + forced-color-adjust: none; } } diff --git a/components/underlay/index.css b/components/underlay/index.css index 48814e0d705..45e556bca6e 100644 --- a/components/underlay/index.css +++ b/components/underlay/index.css @@ -18,7 +18,6 @@ --spectrum-underlay-background-entry-animation-delay: var(--spectrum-animation-duration-0); --spectrum-underlay-background-exit-animation-ease: var(--spectrum-animation-ease-in); --spectrum-underlay-background-entry-animation-ease: var(--spectrum-animation-ease-out); - --spectrum-underlay-background-exit-animation-duration: var(--spectrum-animation-duration-100); --spectrum-underlay-background-entry-animation-duration: var(--spectrum-animation-duration-600); --spectrum-underlay-background-exit-animation-duration: var(--spectrum-animation-duration-300); --spectrum-underlay-background-exit-animation-delay: var(--spectrum-animation-duration-200); diff --git a/stylelint.config.js b/stylelint.config.js index d0a7e213194..52c749cceaa 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -197,7 +197,7 @@ module.exports = { files: ["components/*/themes/express.css", "!components/*/themes/spectrum.css"], rules: { "spectrum-tools/theme-alignment": [true, { - baseFilename: "spectrum.css", + baseFilename: "spectrum", }], }, }, diff --git a/yarn.lock b/yarn.lock index 31249682bb7..09d0829b675 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7216,31 +7216,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001640": - version: 1.0.30001643 - resolution: "caniuse-lite@npm:1.0.30001643" - checksum: 10c0/7fcd0fd180bbe6764311ad57b0d39c23afdcc3bb1d8f804e7a76752c62a85b1bb7cf74b672d9da2f0afe7ad75336ff811a6fe279eb2a54bc04c272b6b62e57f1 - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001629": - version: 1.0.30001636 - resolution: "caniuse-lite@npm:1.0.30001636" - checksum: 10c0/e5f965b4da7bae1531fd9f93477d015729ff9e3fa12670ead39a9e6cdc4c43e62c272d47857c5cc332e7b02d697cb3f2f965a1030870ac7476da60c2fc81ee94 - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001646": - version: 1.0.30001660 - resolution: "caniuse-lite@npm:1.0.30001660" - checksum: 10c0/d28900b56c597176d515c3175ca75c454f2d30cb2c09a44d7bdb009bb0c4d8a2557905adb77642889bbe9feb85fbfe9d974c8b8e53521fb4b50ee16ab246104e - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001669": - version: 1.0.30001673 - resolution: "caniuse-lite@npm:1.0.30001673" - checksum: 10c0/0e73a2b0f06973052e563dec9990a6fd440d510fa2ff54fa50310e736abb86e96c96b43c10e609fc22f2109f98fe76428b70441baf6b1a49f69ccf50c1879f6b +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629, caniuse-lite@npm:^1.0.30001640, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001669": + version: 1.0.30001690 + resolution: "caniuse-lite@npm:1.0.30001690" + checksum: 10c0/646bd469032afa90400a84dec30a2b00a6eda62c03ead358117e3f884cda8aacec02ec058a6dbee5eaf9714f83e483b9b0eb4fb42febb8076569f5ca40f1d347 languageName: node linkType: hard