Skip to content

Commit b68a42b

Browse files
ciampomanzoorwanijkaduth
authored
Revert "Components: Complete WPDS token migration for remaining borders (#79003)" (#79243)
This reverts commit dbe78ce. --- Co-authored-by: ciampo <mciampini@git.wordpress.org> Co-authored-by: manzoorwanijk <manzoorwanijk@git.wordpress.org> Co-authored-by: aduth <aduth@git.wordpress.org>
1 parent cccd656 commit b68a42b

12 files changed

Lines changed: 8 additions & 13 deletions

File tree

packages/components/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
### Enhancements
66

77
- `BaseControl`: Apply `text-wrap: pretty` to help text to avoid typographic widows ([#79112](https://github.com/WordPress/gutenberg/pull/79112)).
8-
- `Button`, `DropdownMenu`, `FormToggle`, `Modal`, `Panel`, `RadioControl`, `Toolbar`: Migrate hardcoded border and stroke colors to WPDS tokens ([#79003](https://github.com/WordPress/gutenberg/pull/79003)).
98

109
### Bug Fixes
1110

packages/components/src/border-control/styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export const colorIndicatorBorder = ( border?: Border ) => {
8484
const { color, style } = border || {};
8585

8686
const fallbackColor =
87-
// TODO: should use the `--wpds-color-stroke-interactive-neutral` token when refactored to SCSS modules
8887
!! style && style !== 'none' ? COLORS.gray[ 300 ] : undefined;
8988

9089
return css`

packages/components/src/button/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
&:disabled:not(:focus),
154154
&[aria-disabled="true"]:not(:focus),
155155
&[aria-disabled="true"]:hover:not(:focus) {
156-
box-shadow: inset 0 0 0 $border-width var(--wpds-color-stroke-interactive-neutral-disabled);
156+
box-shadow: inset 0 0 0 $border-width $gray-300;
157157
}
158158

159159
&:focus:not(:active) {

packages/components/src/dropdown-menu/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
display: block;
3131
content: "";
3232
box-sizing: content-box;
33-
background-color: var(--wpds-color-stroke-surface-neutral);
33+
background-color: $gray-300;
3434
position: absolute;
3535
top: -3px;
3636
left: 0;

packages/components/src/form-toggle/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ $transition-duration: 0.2s;
106106
.components-disabled & {
107107
.components-form-toggle__track {
108108
background-color: $components-color-gray-100;
109-
border-color: var(--wpds-color-stroke-interactive-neutral-disabled);
109+
border-color: $components-color-gray-300;
110110

111111
@media ( forced-colors: active ) {
112112
border-color: GrayText;

packages/components/src/menu/styles.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ const ITEM_PADDING_INLINE = space( 3 );
2222
// - border color and divider color are different from COLORS.theme variables
2323
// - lighter text color is not defined in COLORS.theme, should it be?
2424
// - lighter background color is not defined in COLORS.theme, should it be?
25-
// TODO: should use the `--wpds-color-stroke-surface-neutral` token when refactored to SCSS modules
2625
const DEFAULT_BORDER_COLOR = COLORS.theme.gray[ 300 ];
27-
// TODO: should use the `--wpds-color-stroke-surface-neutral-weak` token when refactored to SCSS modules
2826
const DIVIDER_COLOR = COLORS.theme.gray[ 200 ];
2927
const LIGHTER_TEXT_COLOR = COLORS.theme.gray[ 700 ];
3028
const LIGHT_BACKGROUND_COLOR = COLORS.theme.gray[ 100 ];

packages/components/src/modal/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
}
218218

219219
.components-modal__content.has-scrolled-content:not(.hide-header) & {
220-
border-bottom-color: var(--wpds-color-stroke-surface-neutral);
220+
border-bottom-color: $gray-300;
221221
}
222222

223223
& + p {

packages/components/src/panel/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
justify-content: space-between;
4141
align-items: center;
4242
padding: 0 $grid-unit-20;
43-
border-bottom: $border-width solid var(--wpds-color-stroke-surface-neutral);
43+
border-bottom: $border-width solid $gray-300;
4444

4545
// This helps ensure the correct panel height, including the border, avoiding subpixel rounding issues.
4646
box-sizing: content-box;

packages/components/src/radio-control/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
&:disabled {
5858
background: $components-color-gray-100;
59-
border: 1px solid var(--wpds-color-stroke-interactive-neutral-disabled);
59+
border: 1px solid $components-color-gray-300;
6060
opacity: 1; // Override style from wp-admin forms.css.
6161

6262
&:checked::before {

packages/components/src/spinner/styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ const commonPathProps = css`
3535
stroke-width: 1.5px;
3636
`;
3737

38-
// TODO: should use the `--wpds-color-stroke-surface-neutral` token when refactored to SCSS modules
3938
export const SpinnerTrack = styled.circle`
4039
${ commonPathProps };
4140
stroke: ${ COLORS.gray[ 300 ] };

0 commit comments

Comments
 (0)