Skip to content

Border Support: Add support for custom border units #33315

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
aaronrobertshaw merged 3 commits into from
Jul 14, 2021
Merged

Border Support: Add support for custom border units #33315

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41712fa
Add support for border units
aaronrobertshaw Jul 9, 2021
289a064
Switch to spacing.units
aaronrobertshaw Jul 12, 2021
e16527c
Handle empty units config
aaronrobertshaw Jul 13, 2021
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
Prev Previous commit
Next Next commit
Switch to spacing.units
  • Loading branch information
@aaronrobertshaw
aaronrobertshaw committed Jul 12, 2021
commit 289a0644c7f6dcfe292827c89adfccb0b2d95f34
1 change: 0 additions & 1 deletion lib/class-wp-theme-json-gutenberg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ class WP_Theme_JSON_Gutenberg {
'customRadius' => null,
'customStyle' => null,
'customWidth' => null,
'units' => null,
),
'color' => array(
'custom' => null,
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/border-radius-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default function BorderRadiusControl( { onChange, values } ) {
);

const units = useCustomUnits( {
availableUnits: useSetting( 'border.units' ) || [ 'px', 'em', 'rem' ],
availableUnits: useSetting( 'spacing.units' ) || [ 'px', 'em', 'rem' ],
} );
const unit = getAllUnit( values );
const unitConfig = units.find( ( item ) => item.value === unit );
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/hooks/border-width.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const BorderWidthEdit = ( props ) => {
};

const units = useCustomUnits( {
availableUnits: useSetting( 'border.units' ) || [ 'px', 'em', 'rem' ],
availableUnits: useSetting( 'spacing.units' ) || [ 'px', 'em', 'rem' ],
} );

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/sidebar/border-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default function BorderPanel( {
setStyle,
} ) {
const units = useCustomUnits( {
availableUnits: [ 'px', 'em', 'rem' ],
availableUnits: useSetting( 'spacing.units' ) || [ 'px', 'em', 'rem' ],
} );

// Border width.
Expand Down