BorderControl: Use __next40pxDefaultSize prop for Reset button

[tyxla]

What?

This PR updates the "Reset" button of the BorderControl component to use the new 40px default size.

Why?

Discovered as I was auditing button sizes as part of reviewing #65018.

How?

We're adding the __next40pxDefaultSize prop to the "Reset" button. The button was already set to 40px through CSS, but we no longer need that style override when we can just opt in with the __next40pxDefaultSize prop.

Testing Instructions

• Open Storybook: /?path=/story/components-experimental-bordercontrol--default
• Pick a color.
• Verify the "Reset" button is still the right size (40px).

Testing Instructions for Keyboard

Same

Screenshots or screencast

[github-actions]

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: tyxla <[email protected]>
Co-authored-by: ciampo <[email protected]>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

[ciampo]

🚀

[github-actions]

There was a conflict while trying to cherry-pick the commit to the wp/6.7 branch. Please resolve the conflict manually and create a PR to the wp/6.7 branch.

PRs to wp/6.7 are similar to PRs to trunk, but you should base your PR on the wp/6.7 branch instead of trunk.

# Checkout the wp/6.7 branch instead of trunk.
git checkout wp/6.7
# Create a new branch for your PR.
git checkout -b my-branch
# Cherry-pick the commit.
git cherry-pick 1cfb0707a0bb4a99d7b53450bd0cf51077db9af3
# Check which files have conflicts.
git status
# Resolve the conflict...
# Add the resolved files to the staging area.
git status
git add .
git cherry-pick --continue
# Push the branch to the repository
git push origin my-branch
# Create a PR and set the base to the wp/6.7 branch.
# See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.

[ciampo]

⬆️ This usually happens when a dependant PR was not cherry-picked . I managed to solve a similar issue by cherry picking the dependendant PR, and then removing+re-adding the cherry-pick label to the current PR

[mirka]

@ciampo Thanks for the hint. Aaandd ugh it's a changelog conflict.

[ciampo]

Aaandd ugh it's a changelog conflict.

Yeah, improving the CHANGELOG is another thing that is never high priority enough but keeps being annoying

[tyxla]

If I understand correctly, this has been backported already, right?

[mirka]

If I understand correctly, this has been backported already, right?

No, I rescinded it from backport because the changelog stuff was too annoying and the formal size deprecation was punted to 6.8 😅

[tyxla]

Ah, got it. Thanks for confirming @mirka 🙇‍♂️