Skip to content

Commit 210e95f

Browse files
caseyisonitcaseyisonit
committed
Merge branch 'main' into test-circleci-migration
2 parents d530f8b + 186774d commit 210e95f

File tree

8 files changed

+41
-167
lines changed

8 files changed

+41
-167
lines changed

‎.changeset/warm-ducks-dig.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@spectrum-web-components/link': patch
3+
'@spectrum-web-components/styles': patch
4+
---
5+
6+
Remove unnecessary system theme references to reduce complexity for components that don't need the additional mapping layer.

‎packages/link/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@spectrum-web-components/shared": "1.4.0"
6363
},
6464
"devDependencies": {
65-
"@spectrum-css/link": "6.0.0-s2-foundations.15"
65+
"@spectrum-css/link": "7.1.0"
6666
},
6767
"types": "./src/index.d.ts",
6868
"customElements": "custom-elements.json",

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,3 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
14-
:host {
15-
--spectrum-link-animation-duration: var(--system-link-animation-duration);
16-
--spectrum-link-text-color-primary-default: var(
17-
--system-link-text-color-primary-default
18-
);
19-
--spectrum-link-text-color-primary-hover: var(
20-
--system-link-text-color-primary-hover
21-
);
22-
--spectrum-link-text-color-primary-active: var(
23-
--system-link-text-color-primary-active
24-
);
25-
--spectrum-link-text-color-primary-focus: var(
26-
--system-link-text-color-primary-focus
27-
);
28-
--spectrum-link-text-color-secondary-default: var(
29-
--system-link-text-color-secondary-default
30-
);
31-
--spectrum-link-text-color-secondary-hover: var(
32-
--system-link-text-color-secondary-hover
33-
);
34-
--spectrum-link-text-color-secondary-active: var(
35-
--system-link-text-color-secondary-active
36-
);
37-
--spectrum-link-text-color-secondary-focus: var(
38-
--system-link-text-color-secondary-focus
39-
);
40-
--spectrum-link-text-color-white: var(--system-link-text-color-white);
41-
--spectrum-link-text-color-black: var(--system-link-text-color-black);
42-
}

‎packages/link/src/spectrum-link.css‎

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,91 +13,66 @@ governing permissions and limitations under the License.
1313
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
1414
@media (forced-colors: active) {
1515
:host {
16-
--highcontrast-link-text-color-primary-default: LinkText;
17-
--highcontrast-link-text-color-primary-hover: LinkText;
18-
--highcontrast-link-text-color-primary-active: LinkText;
19-
--highcontrast-link-text-color-primary-focus: LinkText;
20-
--highcontrast-link-text-color-secondary-default: LinkText;
21-
--highcontrast-link-text-color-secondary-hover: LinkText;
22-
--highcontrast-link-text-color-secondary-active: LinkText;
23-
--highcontrast-link-text-color-secondary-focus: LinkText;
24-
--highcontrast-link-text-color-white: LinkText;
25-
--highcontrast-link-text-color-black: LinkText;
16+
--highcontrast-link-text-color: LinkText;
2617
}
2718
}
2819

20+
:host([variant='secondary']) a {
21+
--mod-link-text-color: var(--mod-link-text-color-secondary-default, var(--spectrum-neutral-content-color-default));
22+
--mod-link-text-color-hover: var(--mod-link-text-color-secondary-hover, var(--spectrum-neutral-content-color-hover));
23+
--mod-link-text-color-active: var(--mod-link-text-color-secondary-active, var(--spectrum-neutral-content-color-down));
24+
--mod-link-text-color-focus: var(--mod-link-text-color-secondary-focus, var(--spectrum-neutral-content-color-key-focus));
25+
}
26+
2927
a {
3028
background-color: initial;
3129
-webkit-text-decoration-skip: objects;
3230
text-decoration-skip: objects;
33-
transition: color var(--mod-link-animation-duration, var(--spectrum-link-animation-duration)) ease-in-out;
31+
transition: color var(--mod-link-animation-duration, var(--spectrum-animation-duration-100)) ease-in-out;
3432
cursor: pointer;
35-
color: var(--highcontrast-link-text-color-primary-default, var(--mod-link-text-color-primary-default, var(--spectrum-link-text-color-primary-default)));
33+
color: var(--highcontrast-link-text-color, var(--mod-link-text-color, var(--mod-link-text-color-primary-default, var(--spectrum-accent-content-color-default))));
3634
outline: none;
3735
-webkit-text-decoration: underline;
3836
text-decoration: underline;
3937
}
4038

4139
a:active {
42-
color: var(--highcontrast-link-text-color-primary-active, var(--mod-link-text-color-primary-active, var(--spectrum-link-text-color-primary-active)));
40+
--mod-link-text-color: var(--mod-link-text-color-active, var(--mod-link-text-color-primary-active, var(--spectrum-accent-content-color-down)));
4341
}
4442

4543
a:focus-visible {
46-
color: var(--highcontrast-link-text-color-primary-focus, var(--mod-link-text-color-primary-focus, var(--spectrum-link-text-color-primary-focus)));
44+
--mod-link-text-color: var(--mod-link-text-color-focus, var(--mod-link-text-color-primary-focus, var(--spectrum-accent-content-color-key-focus)));
4745
-webkit-text-decoration: underline double;
4846
text-decoration: underline double;
4947
text-decoration-color: inherit;
50-
text-decoration-color: var(--highcontrast-link-focus-color, inherit);
51-
}
52-
53-
:host([variant='secondary']) a {
54-
color: var(--highcontrast-link-text-color-secondary-default, var(--mod-link-text-color-secondary-default, var(--spectrum-link-text-color-secondary-default)));
55-
}
56-
57-
:host([variant='secondary']) a:active {
58-
color: var(--highcontrast-link-text-color-secondary-active, var(--mod-link-text-color-secondary-active, var(--spectrum-link-text-color-secondary-active)));
59-
}
60-
61-
:host([variant='secondary']) a:focus {
62-
color: var(--highcontrast-link-text-color-secondary-focus, var(--mod-link-text-color-secondary-focus, var(--spectrum-link-text-color-secondary-focus)));
6348
}
6449

6550
:host([quiet]) a {
6651
-webkit-text-decoration: none;
6752
text-decoration: none;
6853
}
6954

70-
:host([static-color='white']) a,
71-
:host([static-color='white']) a:active,
72-
:host([static-color='white']) a:focus {
73-
color: var(--highcontrast-link-text-color-white, var(--mod-link-text-color-white, var(--spectrum-link-text-color-white)));
74-
}
75-
76-
:host([static-color='black']) a,
77-
:host([static-color='black']) a:active,
78-
:host([static-color='black']) a:focus {
79-
color: var(--highcontrast-link-text-color-black, var(--mod-link-text-color-black, var(--spectrum-link-text-color-black)));
80-
}
81-
8255
@media (hover: hover) {
8356
a:hover {
84-
color: var(--highcontrast-link-text-color-primary-hover, var(--mod-link-text-color-primary-hover, var(--spectrum-link-text-color-primary-hover)));
85-
}
86-
87-
:host([variant='secondary']) a:hover {
88-
color: var(--highcontrast-link-text-color-secondary-hover, var(--mod-link-text-color-secondary-hover, var(--spectrum-link-text-color-secondary-hover)));
57+
--mod-link-text-color: var(--mod-link-text-color-hover, var(--mod-link-text-color-primary-hover, var(--spectrum-accent-content-color-hover)));
8958
}
9059

9160
:host([quiet]) a:hover {
9261
-webkit-text-decoration: underline;
9362
text-decoration: underline;
9463
}
64+
}
9565

96-
:host([static-color='white']) a:hover {
97-
color: var(--highcontrast-link-text-color-white, var(--mod-link-text-color-white, var(--spectrum-link-text-color-white)));
98-
}
66+
:host([static-color='white']) a {
67+
--mod-link-text-color: var(--mod-link-text-color-white, var(--spectrum-white));
68+
--mod-link-text-color-hover: var(--mod-link-text-color-white, var(--spectrum-white));
69+
--mod-link-text-color-active: var(--mod-link-text-color-white, var(--spectrum-white));
70+
--mod-link-text-color-focus: var(--mod-link-text-color-white, var(--spectrum-white));
71+
}
9972

100-
:host([static-color='black']) a:hover {
101-
color: var(--highcontrast-link-text-color-black, var(--mod-link-text-color-black, var(--spectrum-link-text-color-black)));
102-
}
73+
:host([static-color='black']) a {
74+
--mod-link-text-color: var(--mod-link-text-color-black, var(--spectrum-black));
75+
--mod-link-text-color-hover: var(--mod-link-text-color-black, var(--spectrum-black));
76+
--mod-link-text-color-active: var(--mod-link-text-color-black, var(--spectrum-black));
77+
--mod-link-text-color-focus: var(--mod-link-text-color-black, var(--spectrum-black));
10378
}

‎tools/styles/tokens-v2/system-theme-bridge.css‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,33 +1939,6 @@
19391939
--system-infield-button-quiet-border-width: 0;
19401940
--system-infield-button-quiet-disabled-background-color: transparent;
19411941
--system-infield-button-quiet-disabled-border-color: transparent;
1942-
--system-link-animation-duration: var(--spectrum-animation-duration-100);
1943-
--system-link-text-color-primary-default: var(
1944-
--spectrum-accent-content-color-default
1945-
);
1946-
--system-link-text-color-primary-hover: var(
1947-
--spectrum-accent-content-color-hover
1948-
);
1949-
--system-link-text-color-primary-active: var(
1950-
--spectrum-accent-content-color-down
1951-
);
1952-
--system-link-text-color-primary-focus: var(
1953-
--spectrum-accent-content-color-key-focus
1954-
);
1955-
--system-link-text-color-secondary-default: var(
1956-
--spectrum-neutral-content-color-default
1957-
);
1958-
--system-link-text-color-secondary-hover: var(
1959-
--spectrum-neutral-content-color-hover
1960-
);
1961-
--system-link-text-color-secondary-active: var(
1962-
--spectrum-neutral-content-color-down
1963-
);
1964-
--system-link-text-color-secondary-focus: var(
1965-
--spectrum-neutral-content-color-key-focus
1966-
);
1967-
--system-link-text-color-white: var(--spectrum-white);
1968-
--system-link-text-color-black: var(--spectrum-black);
19691942
--system-menu-item-background-color-hover: rgba(
19701943
var(--spectrum-gray-1000-rgb),
19711944
var(--spectrum-transparent-black-200-opacity)

‎tools/styles/tokens/express/system-theme-bridge.css‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,33 +1961,6 @@
19611961
--system-infield-button-quiet-border-width: 0;
19621962
--system-infield-button-quiet-disabled-background-color: transparent;
19631963
--system-infield-button-quiet-disabled-border-color: transparent;
1964-
--system-link-animation-duration: var(--spectrum-animation-duration-100);
1965-
--system-link-text-color-primary-default: var(
1966-
--spectrum-accent-content-color-default
1967-
);
1968-
--system-link-text-color-primary-hover: var(
1969-
--spectrum-accent-content-color-hover
1970-
);
1971-
--system-link-text-color-primary-active: var(
1972-
--spectrum-accent-content-color-down
1973-
);
1974-
--system-link-text-color-primary-focus: var(
1975-
--spectrum-accent-content-color-key-focus
1976-
);
1977-
--system-link-text-color-secondary-default: var(
1978-
--spectrum-neutral-content-color-default
1979-
);
1980-
--system-link-text-color-secondary-hover: var(
1981-
--spectrum-neutral-content-color-hover
1982-
);
1983-
--system-link-text-color-secondary-active: var(
1984-
--spectrum-neutral-content-color-down
1985-
);
1986-
--system-link-text-color-secondary-focus: var(
1987-
--spectrum-neutral-content-color-key-focus
1988-
);
1989-
--system-link-text-color-white: var(--spectrum-white);
1990-
--system-link-text-color-black: var(--spectrum-black);
19911964
--system-menu-item-background-color-hover: rgba(
19921965
var(--spectrum-gray-900-rgb),
19931966
var(--spectrum-transparent-black-200-opacity)

‎tools/styles/tokens/spectrum/system-theme-bridge.css‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,33 +1965,6 @@
19651965
--system-infield-button-quiet-border-width: 0;
19661966
--system-infield-button-quiet-disabled-background-color: transparent;
19671967
--system-infield-button-quiet-disabled-border-color: transparent;
1968-
--system-link-animation-duration: var(--spectrum-animation-duration-100);
1969-
--system-link-text-color-primary-default: var(
1970-
--spectrum-accent-content-color-default
1971-
);
1972-
--system-link-text-color-primary-hover: var(
1973-
--spectrum-accent-content-color-hover
1974-
);
1975-
--system-link-text-color-primary-active: var(
1976-
--spectrum-accent-content-color-down
1977-
);
1978-
--system-link-text-color-primary-focus: var(
1979-
--spectrum-accent-content-color-key-focus
1980-
);
1981-
--system-link-text-color-secondary-default: var(
1982-
--spectrum-neutral-content-color-default
1983-
);
1984-
--system-link-text-color-secondary-hover: var(
1985-
--spectrum-neutral-content-color-hover
1986-
);
1987-
--system-link-text-color-secondary-active: var(
1988-
--spectrum-neutral-content-color-down
1989-
);
1990-
--system-link-text-color-secondary-focus: var(
1991-
--spectrum-neutral-content-color-key-focus
1992-
);
1993-
--system-link-text-color-white: var(--spectrum-white);
1994-
--system-link-text-color-black: var(--spectrum-black);
19951968
--system-menu-item-background-color-hover: rgba(
19961969
var(--spectrum-gray-900-rgb),
19971970
var(--spectrum-transparent-black-200-opacity)

‎yarn.lock‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7258,12 +7258,15 @@ __metadata:
72587258
languageName: node
72597259
linkType: hard
72607260

7261-
"@spectrum-css/link@npm:6.0.0-s2-foundations.15":
7262-
version: 6.0.0-s2-foundations.15
7263-
resolution: "@spectrum-css/link@npm:6.0.0-s2-foundations.15"
7261+
"@spectrum-css/link@npm:7.1.0":
7262+
version: 7.1.0
7263+
resolution: "@spectrum-css/link@npm:7.1.0"
72647264
peerDependencies:
7265-
"@spectrum-css/tokens": ">=14"
7266-
checksum: 10c0/afc52ff8eadfe54f226ffd484879e4933f29351e81782942b14e1d463aa86ba9d315158088499520e044b3425b8c5b4ac2daee230871021908b65f072ece2542
7265+
"@spectrum-css/tokens": ">=16.0.1"
7266+
peerDependenciesMeta:
7267+
"@spectrum-css/tokens":
7268+
optional: true
7269+
checksum: 10c0/f83e6392de126d82970808c749caaec6300cc0b371d0c1d8ce64c21c5e659c2740bd5bf9581f4578822bf52e0b1e7d717ab5a15c90c452ec89f534e355734d93
72677270
languageName: node
72687271
linkType: hard
72697272

@@ -8317,7 +8320,7 @@ __metadata:
83178320
version: 0.0.0-use.local
83188321
resolution: "@spectrum-web-components/link@workspace:packages/link"
83198322
dependencies:
8320-
"@spectrum-css/link": "npm:6.0.0-s2-foundations.15"
8323+
"@spectrum-css/link": "npm:7.1.0"
83218324
"@spectrum-web-components/base": "npm:1.4.0"
83228325
"@spectrum-web-components/shared": "npm:1.4.0"
83238326
languageName: unknown

0 commit comments

Comments
 (0)