Skip to content

S2 fix(swatch): Border color for Swatch on light/dark mode #4857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2024
Merged

S2 fix(swatch): Border color for Swatch on light/dark mode #4857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0ea3d2
chore: updated spectrum css to fix swatch border issue
Oct 24, 2024
9cef379
Merge branch 'feature/SWC-1.0-RC' into bug/swatch-border-issue
Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/swatch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@spectrum-web-components/shared": "^0.49.0"
},
"devDependencies": {
"@spectrum-css/swatch": "^7.0.0-s2-foundations.16",
"@spectrum-css/swatch": "^7.0.0-s2-foundations.17",
"@spectrum-css/swatchgroup": "^4.0.0-s2-foundations.15"
},
"types": "./src/index.d.ts",
Expand Down
80 changes: 40 additions & 40 deletions packages/swatch/src/swatch-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,46 @@
*/

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
:host([size='l']) {
--spectrum-swatch-size: var(--system-swatch-size-l-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-l-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-l-slash-thickness
);
}

:host([size='s']) {
--spectrum-swatch-size: var(--system-swatch-size-s-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-s-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-s-slash-thickness
);
}

:host([size='xs']) {
--spectrum-swatch-size: var(--system-swatch-size-xs-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-xs-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-xs-slash-thickness
);
}

:host {
--spectrum-swatch-size: var(--system-swatch-size-m-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-m-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-m-slash-thickness
);
}

:host {
--spectrum-swatch-border-radius: var(--system-swatch-border-radius);
--spectrum-swatch-focus-indicator-border-radius: var(
Expand Down Expand Up @@ -57,43 +97,3 @@
);
--spectrum-swatch-slash-thickness: var(--system-swatch-slash-thickness);
}

:host([size='xs']) {
--spectrum-swatch-size: var(--system-swatch-size-xs-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-xs-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-xs-slash-thickness
);
}

:host([size='s']) {
--spectrum-swatch-size: var(--system-swatch-size-s-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-s-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-s-slash-thickness
);
}

:host {
--spectrum-swatch-size: var(--system-swatch-size-m-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-m-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-m-slash-thickness
);
}

:host([size='l']) {
--spectrum-swatch-size: var(--system-swatch-size-l-size);
--spectrum-swatch-disabled-icon-size: var(
--system-swatch-size-l-disabled-icon-size
);
--spectrum-swatch-slash-thickness: var(
--system-swatch-size-l-slash-thickness
);
}
2 changes: 1 addition & 1 deletion tools/styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"@spectrum-css/commons": "^11.0.0-s2-foundations.15",
"@spectrum-css/expressvars": "^3.0.9",
"@spectrum-css/tokens": "^@spectrum-css/tokens@14.3.1",
"@spectrum-css/tokens-v2": "npm:@spectrum-css/tokens@15.0.0-s2-foundations.26",
"@spectrum-css/tokens-v2": "npm:@spectrum-css/tokens@15.0.0-s2-foundations.27",
"@spectrum-css/typography": "^7.0.0-s2-foundations.17",
"@spectrum-css/vars": "^9.0.8"
},
Expand Down
8 changes: 5 additions & 3 deletions tools/styles/tokens-v2/global-vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,15 +1043,15 @@

--spectrum-sans-font-family-stack: adobe-clean,
var(--spectrum-sans-serif-font-family), 'Source Sans Pro', -apple-system,
BlinkMacSystemFont, 'Segoe UI', Roboto, Ubuntu, 'Trebuchet MS',
blinkmacsystemfont, 'Segoe UI', roboto, ubuntu, 'Trebuchet MS',
'Lucida Grande', sans-serif;
--spectrum-sans-serif-font: var(--spectrum-sans-font-family-stack);

--spectrum-serif-font-family-stack: adobe-clean-serif,
var(--spectrum-serif-font-family), 'Source Serif Pro', Georgia, serif;
var(--spectrum-serif-font-family), 'Source Serif Pro', georgia, serif;
--spectrum-serif-font: var(--spectrum-serif-font-family-stack);

--spectrum-code-font-family-stack: 'Source Code Pro', Monaco, monospace;
--spectrum-code-font-family-stack: 'Source Code Pro', monaco, monospace;

--spectrum-font-family-ar: myriad-arabic, adobe-clean, 'Source Sans Pro',
-apple-system, blinkmacsystemfont, 'Segoe UI', roboto, ubuntu,
Expand All @@ -1075,4 +1075,6 @@
--spectrum-docs-static-black-background-color: rgba(
var(--spectrum-docs-static-black-background-color-rgb)
);

--spectrum-coach-indicator-ring-static-white-color: var(--spectrum-white);
}
2 changes: 2 additions & 0 deletions tools/styles/tokens-v2/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,6 +2107,8 @@
--spectrum-docs-static-black-background-color: rgba(
var(--spectrum-docs-static-black-background-color-rgb)
);

--spectrum-coach-indicator-ring-static-white-color: var(--spectrum-white);
}

:host,
Expand Down
21 changes: 9 additions & 12 deletions tools/styles/tokens-v2/spectrum/global-vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,8 +2338,6 @@
--system-clear-button-background-color-hover: transparent;
--system-clear-button-background-color-down: transparent;
--system-clear-button-background-color-key-focus: transparent;
--system-clear-button-height: var(--spectrum-component-height-100);
--system-clear-button-width: var(--spectrum-component-height-100);
--system-clear-button-padding: var(--spectrum-in-field-button-edge-to-fill);
--system-clear-button-icon-color: var(
--spectrum-neutral-content-color-default
Expand All @@ -2353,6 +2351,10 @@
--system-clear-button-icon-color-key-focus: var(
--spectrum-neutral-content-color-key-focus
);
--system-clear-button-height: var(--spectrum-component-height-100);
--system-clear-button-size-m-height: var(--spectrum-component-height-100);
--system-clear-button-width: var(--spectrum-component-height-100);
--system-clear-button-size-m-width: var(--spectrum-component-height-100);
--system-clear-button-size-s-height: var(--spectrum-component-height-75);
--system-clear-button-size-s-width: var(--spectrum-component-height-75);
--system-clear-button-size-l-height: var(--spectrum-component-height-200);
Expand Down Expand Up @@ -3622,9 +3624,6 @@
--system-infield-button-stacked-fill-padding-inner: var(
--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-medium
);
--system-infield-button-animation-duration: var(
--spectrum-animation-duration-100
);
--system-infield-button-icon-color: var(
--spectrum-neutral-content-color-default
);
Expand Down Expand Up @@ -4111,15 +4110,9 @@
:root {
--system-meter-min-width: var(--spectrum-meter-minimum-width);
--system-meter-max-width: var(--spectrum-meter-maximum-width);
--system-meter-inline-size: var(--spectrum-meter-width);
--system-meter-top-to-text: var(--spectrum-component-top-to-text);
--system-meter-fill-color-positive: var(--spectrum-positive-visual-color);
--system-meter-fill-color-notice: var(--spectrum-notice-visual-color);
--system-meter-fill-color-negative: var(--spectrum-negative-visual-color);
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
--system-meter-thickness: var(--spectrum-meter-thickness-large);
--system-meter-size-l-thickness: var(--spectrum-meter-thickness-large);
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
Expand All @@ -4130,6 +4123,10 @@
--system-meter-size-l-top-to-text: var(
--spectrum-component-top-to-text-200
);
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
}

:host,
Expand Down Expand Up @@ -5461,7 +5458,7 @@
--system-swatch-border-color-opacity: 0.51;
--system-swatch-border-color-light-opacity: 0.2;
--system-swatch-border-color: rgba(
var(--spectrum-black-rgb),
var(--spectrum-gray-1000-rgb),
var(--system-swatch-border-color-opacity)
);
--system-swatch-icon-border-color: rgba(
Expand Down
23 changes: 11 additions & 12 deletions tools/styles/tokens/express/global-vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2386,8 +2386,6 @@
--system-clear-button-background-color-hover: var(--spectrum-gray-300);
--system-clear-button-background-color-down: var(--spectrum-gray-400);
--system-clear-button-background-color-key-focus: var(--spectrum-gray-300);
--system-clear-button-height: var(--spectrum-component-height-100);
--system-clear-button-width: var(--spectrum-component-height-100);
--system-clear-button-padding: var(--spectrum-in-field-button-edge-to-fill);
--system-clear-button-icon-color: var(
--spectrum-neutral-content-color-default
Expand All @@ -2401,6 +2399,10 @@
--system-clear-button-icon-color-key-focus: var(
--spectrum-neutral-content-color-key-focus
);
--system-clear-button-height: var(--spectrum-component-height-100);
--system-clear-button-size-m-height: var(--spectrum-component-height-100);
--system-clear-button-width: var(--spectrum-component-height-100);
--system-clear-button-size-m-width: var(--spectrum-component-height-100);
--system-clear-button-size-s-height: var(--spectrum-component-height-75);
--system-clear-button-size-s-width: var(--spectrum-component-height-75);
--system-clear-button-size-l-height: var(--spectrum-component-height-200);
Expand Down Expand Up @@ -3672,9 +3674,6 @@
--system-infield-button-stacked-fill-padding-inner: var(
--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-medium
);
--system-infield-button-animation-duration: var(
--spectrum-animation-duration-100
);
--system-infield-button-icon-color: var(
--spectrum-neutral-content-color-default
);
Expand Down Expand Up @@ -4161,23 +4160,23 @@
:root {
--system-meter-min-width: var(--spectrum-meter-minimum-width);
--system-meter-max-width: var(--spectrum-meter-maximum-width);
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
--system-meter-fill-color-positive: var(--spectrum-positive-visual-color);
--system-meter-fill-color-notice: var(--spectrum-notice-visual-color);
--system-meter-fill-color-negative: var(--spectrum-negative-visual-color);
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
--system-meter-thickness: var(--spectrum-meter-thickness-large);
--system-meter-size-l-thickness: var(--spectrum-meter-thickness-large);
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
--system-meter-size-l-inline-size: var(--spectrum-progressbar-size-2500);
--system-meter-font-size: var(--spectrum-font-size-100);
--system-meter-size-l-font-size: var(--spectrum-font-size-100);
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
--system-meter-size-l-top-to-text: var(
--spectrum-component-top-to-text-200
);
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
}

:host,
Expand Down Expand Up @@ -5517,7 +5516,7 @@
--system-swatch-border-color-opacity: 0.51;
--system-swatch-border-color-light-opacity: 0.2;
--system-swatch-border-color: rgba(
var(--spectrum-black-rgb),
var(--spectrum-gray-900-rgb),
var(--system-swatch-border-color-opacity)
);
--system-swatch-icon-border-color: rgba(
Expand Down
23 changes: 11 additions & 12 deletions tools/styles/tokens/spectrum/global-vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,8 +2445,6 @@
--system-clear-button-background-color-hover: transparent;
--system-clear-button-background-color-down: transparent;
--system-clear-button-background-color-key-focus: transparent;
--system-clear-button-height: var(--spectrum-component-height-100);
--system-clear-button-width: var(--spectrum-component-height-100);
--system-clear-button-padding: var(--spectrum-in-field-button-edge-to-fill);
--system-clear-button-icon-color: var(
--spectrum-neutral-content-color-default
Expand All @@ -2460,6 +2458,10 @@
--system-clear-button-icon-color-key-focus: var(
--spectrum-neutral-content-color-key-focus
);
--system-clear-button-height: var(--spectrum-component-height-100);
--system-clear-button-size-m-height: var(--spectrum-component-height-100);
--system-clear-button-width: var(--spectrum-component-height-100);
--system-clear-button-size-m-width: var(--spectrum-component-height-100);
--system-clear-button-size-s-height: var(--spectrum-component-height-75);
--system-clear-button-size-s-width: var(--spectrum-component-height-75);
--system-clear-button-size-l-height: var(--spectrum-component-height-200);
Expand Down Expand Up @@ -3729,9 +3731,6 @@
--system-infield-button-stacked-fill-padding-inner: var(
--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-medium
);
--system-infield-button-animation-duration: var(
--spectrum-animation-duration-100
);
--system-infield-button-icon-color: var(
--spectrum-neutral-content-color-default
);
Expand Down Expand Up @@ -4218,23 +4217,23 @@
:root {
--system-meter-min-width: var(--spectrum-meter-minimum-width);
--system-meter-max-width: var(--spectrum-meter-maximum-width);
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
--system-meter-fill-color-positive: var(--spectrum-positive-visual-color);
--system-meter-fill-color-notice: var(--spectrum-notice-visual-color);
--system-meter-fill-color-negative: var(--spectrum-negative-visual-color);
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
--system-meter-thickness: var(--spectrum-meter-thickness-large);
--system-meter-size-l-thickness: var(--spectrum-meter-thickness-large);
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
--system-meter-size-l-inline-size: var(--spectrum-progressbar-size-2500);
--system-meter-font-size: var(--spectrum-font-size-100);
--system-meter-size-l-font-size: var(--spectrum-font-size-100);
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
--system-meter-size-l-top-to-text: var(
--spectrum-component-top-to-text-200
);
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
}

:host,
Expand Down Expand Up @@ -5571,7 +5570,7 @@
--system-swatch-border-color-opacity: 0.51;
--system-swatch-border-color-light-opacity: 0.2;
--system-swatch-border-color: rgba(
var(--spectrum-black-rgb),
var(--spectrum-gray-900-rgb),
var(--system-swatch-border-color-opacity)
);
--system-swatch-icon-border-color: rgba(
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5273,10 +5273,10 @@
resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-7.0.0-s2-foundations.18.tgz#d1492449d778739dce14074569a280957fb264d3"
integrity sha512-D4PUgy81VpLRdd5IDB4hXWmekdfLF29aaGI2Kvt5ny9gSK/qeNGd90srG+SBUBwSfLKvE8Cc6kov7KVwFDnCdw==

"@spectrum-css/swatch@^7.0.0-s2-foundations.16":
version "7.0.0-s2-foundations.16"
resolved "https://registry.yarnpkg.com/@spectrum-css/swatch/-/swatch-7.0.0-s2-foundations.16.tgz#49d4e370912220775ea7ffb4172d832b821764f9"
integrity sha512-iwM0BiR2k1sqVa3N3MB1W8FvK3wVhulzQG1G5prKVC/C8qGl9YlymAFUDdHBFTX16+OB1ObSCDidI8mxAVPDkg==
"@spectrum-css/swatch@^7.0.0-s2-foundations.17":
version "7.0.0-s2-foundations.17"
resolved "https://registry.yarnpkg.com/@spectrum-css/swatch/-/swatch-7.0.0-s2-foundations.17.tgz#ac9ce4d0c98d89bdc7b901c7aaf0c8b4bd15d5bc"
integrity sha512-5/EodsO+jVozkeJV99zaXNjaX/3Bk6Xl5qUi2INEiMTHkJg+vPNejdWyEaFxqOhD0vE37nwYIhGYHcElA60OBg==

"@spectrum-css/swatchgroup@^4.0.0-s2-foundations.15":
version "4.0.0-s2-foundations.15"
Expand Down Expand Up @@ -5323,10 +5323,10 @@
resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-11.0.0-s2-foundations.15.tgz#2ef09e24a68a1f8f30eb208f07eac009e9673a3a"
integrity sha512-xID5vAl6bwVkBqZJ3OTsI0dE5RtSz9DY4Dnsz9IPqoF3S+Ur4vTPetcLPsqLa8qtceLo+y/aoxGIsOxuq1yw5g==

"@spectrum-css/tokens-v2@npm:@spectrum-css/tokens@15.0.0-s2-foundations.26":
version "15.0.0-s2-foundations.26"
resolved "https://registry.yarnpkg.com/@spectrum-css/tokens/-/tokens-15.0.0-s2-foundations.26.tgz#cbc3aec06d86d8a9ef4ce1a949aeddc211482d9e"
integrity sha512-dFFKUnvEjbQY4HjQ2N6BOindZMXLyOkTkV08KzBpIUtszOF029vZxighh3MX8illE2waI3Vy/V1cUwhQqxXj3g==
"@spectrum-css/tokens-v2@npm:@spectrum-css/tokens@15.0.0-s2-foundations.27":
version "15.0.0-s2-foundations.27"
resolved "https://registry.yarnpkg.com/@spectrum-css/tokens/-/tokens-15.0.0-s2-foundations.27.tgz#f2c3a9fac5417a4c69aa004eaab8599a816f1d42"
integrity sha512-FxL/DUTRXu337mMfcOykfucxzfoKvkraU55iRE8jsbpdpivvfM1ks7r6bapDq9nD9d22mGbDHqCF6Dq9Junshg==

"@spectrum-css/tokens@^@spectrum-css/tokens@14.3.1":
version "14.3.1"
Expand Down
Loading