Skip to content

Commit d14fc94

Browse files
committed
fix(action-button,styles): border-radius modifier patch
1 parent 273a232 commit d14fc94

File tree

6 files changed

+34
-27
lines changed

6 files changed

+34
-27
lines changed

.changeset/nine-geese-behave.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@spectrum-web-components/action-button': patch
3+
'@spectrum-web-components/styles': patch
4+
---
5+
6+
[#​3644](https://github.com/adobe/spectrum-css/pull/3644) Thanks [@​marissahuysentruyt](https://github.com/marissahuysentruyt)!
7+
8+
This patch update fixes support for `--mod-actionbutton-border-radius` to make sure it is accessible by consumers and overwrites the default border radius setting when used.

packages/action-button/src/action-button-overrides.css

+10-10
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,32 @@ governing permissions and limitations under the License.
6363
}
6464

6565
:host {
66-
--spectrum-actionbutton-border-radius: var(
67-
--system-action-button-size-m-border-radius
66+
--spectrum-actionbutton-border-radius-default: var(
67+
--system-action-button-size-m-border-radius-default
6868
);
6969
}
7070

7171
:host([size='xs']) {
72-
--spectrum-actionbutton-border-radius: var(
73-
--system-action-button-size-xs-border-radius
72+
--spectrum-actionbutton-border-radius-default: var(
73+
--system-action-button-size-xs-border-radius-default
7474
);
7575
}
7676

7777
:host([size='s']) {
78-
--spectrum-actionbutton-border-radius: var(
79-
--system-action-button-size-s-border-radius
78+
--spectrum-actionbutton-border-radius-default: var(
79+
--system-action-button-size-s-border-radius-default
8080
);
8181
}
8282

8383
:host([size='l']) {
84-
--spectrum-actionbutton-border-radius: var(
85-
--system-action-button-size-l-border-radius
84+
--spectrum-actionbutton-border-radius-default: var(
85+
--system-action-button-size-l-border-radius-default
8686
);
8787
}
8888

8989
:host([size='xl']) {
90-
--spectrum-actionbutton-border-radius: var(
91-
--system-action-button-size-xl-border-radius
90+
--spectrum-actionbutton-border-radius-default: var(
91+
--system-action-button-size-xl-border-radius-default
9292
);
9393
}
9494

packages/action-button/src/spectrum-action-button.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ governing permissions and limitations under the License.
9595
--spectrum-actionbutton-background-color: var(--highcontrast-actionbutton-background-color, var(--mod-actionbutton-background-color-default, var(--spectrum-actionbutton-background-color-default)));
9696
--spectrum-actionbutton-border-color: var(--highcontrast-actionbutton-border-color, var(--mod-actionbutton-border-color-default, var(--spectrum-actionbutton-border-color-default)));
9797
--spectrum-actionbutton-content-color: var(--highcontrast-actionbutton-content-color, var(--mod-actionbutton-content-color-default, var(--spectrum-neutral-content-color-default)));
98-
--spectrum-actionbutton-border-radius: var(--mod-actionbutton-border-radius, var(--spectrum-actionbutton-border-radius));
98+
--spectrum-actionbutton-border-radius: var(--mod-actionbutton-border-radius, var(--spectrum-actionbutton-border-radius-default));
9999
--spectrum-actionbutton-border-width: var(--mod-actionbutton-border-width, var(--spectrum-border-width-100));
100100
--spectrum-actionbutton-focus-indicator-gap: var(--mod-actionbutton-focus-indicator-gap, var(--spectrum-focus-indicator-gap));
101101
--spectrum-actionbutton-focus-indicator-thickness: var(--mod-actionbutton-focus-indicator-thickness, var(--spectrum-focus-indicator-thickness));
@@ -315,7 +315,6 @@ governing permissions and limitations under the License.
315315
line-height: var(--spectrum-actionbutton-height);
316316
font-size: var(--spectrum-actionbutton-font-size);
317317
white-space: nowrap;
318-
color: inherit;
319318
color: var(--mod-actionbutton-label-color, inherit);
320319
text-overflow: ellipsis;
321320
overflow: hidden;

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232
--system-action-button-border-color-focus: transparent;
3333
--system-action-button-border-color-disabled: transparent;
3434
--system-action-button-content-color-selected: var(--spectrum-gray-50);
35-
--system-action-button-size-m-border-radius: var(
35+
--system-action-button-size-m-border-radius-default: var(
3636
--spectrum-corner-radius-medium-size-medium
3737
);
38-
--system-action-button-size-xs-border-radius: var(
38+
--system-action-button-size-xs-border-radius-default: var(
3939
--spectrum-corner-radius-medium-size-extra-small
4040
);
41-
--system-action-button-size-s-border-radius: var(
41+
--system-action-button-size-s-border-radius-default: var(
4242
--spectrum-corner-radius-medium-size-small
4343
);
44-
--system-action-button-size-l-border-radius: var(
44+
--system-action-button-size-l-border-radius-default: var(
4545
--spectrum-corner-radius-medium-size-large
4646
);
47-
--system-action-button-size-xl-border-radius: var(
47+
--system-action-button-size-xl-border-radius-default: var(
4848
--spectrum-corner-radius-medium-size-extra-large
4949
);
5050
--system-action-button-quiet-background-color-default: transparent;

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
--system-action-button-border-color-focus: transparent;
2929
--system-action-button-border-color-disabled: transparent;
3030
--system-action-button-content-color-selected: var(--spectrum-gray-75);
31-
--system-action-button-size-m-border-radius: var(
31+
--system-action-button-size-m-border-radius-default: var(
3232
--spectrum-corner-radius-100
3333
);
34-
--system-action-button-size-xs-border-radius: var(
34+
--system-action-button-size-xs-border-radius-default: var(
3535
--spectrum-corner-radius-100
3636
);
37-
--system-action-button-size-s-border-radius: var(
37+
--system-action-button-size-s-border-radius-default: var(
3838
--spectrum-corner-radius-100
3939
);
40-
--system-action-button-size-l-border-radius: var(
40+
--system-action-button-size-l-border-radius-default: var(
4141
--spectrum-corner-radius-100
4242
);
43-
--system-action-button-size-xl-border-radius: var(
43+
--system-action-button-size-xl-border-radius-default: var(
4444
--spectrum-corner-radius-100
4545
);
4646
--system-action-button-quiet-background-color-default: transparent;

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
--spectrum-disabled-border-color
3131
);
3232
--system-action-button-content-color-selected: var(--spectrum-gray-75);
33-
--system-action-button-size-m-border-radius: var(
33+
--system-action-button-size-m-border-radius-default: var(
3434
--spectrum-corner-radius-100
3535
);
36-
--system-action-button-size-xs-border-radius: var(
36+
--system-action-button-size-xs-border-radius-default: var(
3737
--spectrum-corner-radius-100
3838
);
39-
--system-action-button-size-s-border-radius: var(
39+
--system-action-button-size-s-border-radius-default: var(
4040
--spectrum-corner-radius-100
4141
);
42-
--system-action-button-size-l-border-radius: var(
42+
--system-action-button-size-l-border-radius-default: var(
4343
--spectrum-corner-radius-100
4444
);
45-
--system-action-button-size-xl-border-radius: var(
45+
--system-action-button-size-xl-border-radius-default: var(
4646
--spectrum-corner-radius-100
4747
);
4848
--system-action-button-quiet-background-color-default: transparent;

0 commit comments

Comments
 (0)