Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Enhancements

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

### Bug Fixes

Expand Down
1 change: 1 addition & 0 deletions packages/components/src/border-control/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export const colorIndicatorBorder = ( border?: Border ) => {
const { color, style } = border || {};

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

return css`
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/button/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
&:disabled:not(:focus),
&[aria-disabled="true"]:not(:focus),
&[aria-disabled="true"]:hover:not(:focus) {
box-shadow: inset 0 0 0 $border-width $gray-300;
box-shadow: inset 0 0 0 $border-width var(--wpds-color-stroke-interactive-neutral-disabled);
}

&:focus:not(:active) {
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dropdown-menu/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
display: block;
content: "";
box-sizing: content-box;
background-color: $gray-300;
background-color: var(--wpds-color-stroke-surface-neutral);
position: absolute;
top: -3px;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/form-toggle/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $transition-duration: 0.2s;
.components-disabled & {
.components-form-toggle__track {
background-color: $components-color-gray-100;
border-color: $components-color-gray-300;
border-color: var(--wpds-color-stroke-interactive-neutral-disabled);

@media ( forced-colors: active ) {
border-color: GrayText;
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/menu/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ const ITEM_PADDING_INLINE = space( 3 );
// - border color and divider color are different from COLORS.theme variables
// - lighter text color is not defined in COLORS.theme, should it be?
// - lighter background color is not defined in COLORS.theme, should it be?
// TODO: should use the `--wpds-color-stroke-surface-neutral` token when refactored to SCSS modules
const DEFAULT_BORDER_COLOR = COLORS.theme.gray[ 300 ];
// TODO: should use the `--wpds-color-stroke-surface-neutral-weak` token when refactored to SCSS modules
const DIVIDER_COLOR = COLORS.theme.gray[ 200 ];
const LIGHTER_TEXT_COLOR = COLORS.theme.gray[ 700 ];
const LIGHT_BACKGROUND_COLOR = COLORS.theme.gray[ 100 ];
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/modal/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
}

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

& + p {
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/panel/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
justify-content: space-between;
align-items: center;
padding: 0 $grid-unit-20;
border-bottom: $border-width solid $gray-300;
border-bottom: $border-width solid var(--wpds-color-stroke-surface-neutral);

// This helps ensure the correct panel height, including the border, avoiding subpixel rounding issues.
box-sizing: content-box;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/radio-control/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

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

&:checked::before {
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/spinner/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const commonPathProps = css`
stroke-width: 1.5px;
`;

// TODO: should use the `--wpds-color-stroke-surface-neutral` token when refactored to SCSS modules
export const SpinnerTrack = styled.circle`
${ commonPathProps };
stroke: ${ COLORS.gray[ 300 ] };
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/toolbar/toolbar-group/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ div.components-toolbar {
display: inline-block;
content: "";
box-sizing: content-box;
background-color: $gray-300;
background-color: var(--wpds-color-stroke-surface-neutral);
position: absolute;
top: 8px;
left: -3px;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/tools-panel/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ const toolsPanelGrid = {
},
};

// TODO: should use the `--wpds-color-stroke-surface-neutral` token when refactored to SCSS modules
export const ToolsPanel = ( columns: number ) => css`
${ toolsPanelGrid.columns( columns ) }
${ toolsPanelGrid.spacing }

border-top: ${ CONFIG.borderWidth } solid ${ COLORS.gray[ 300 ] };
margin-top: -1px;
padding: ${ space( 4 ) };
Expand Down
Loading