Revert "Button: Add opt-in prop for larger isSmall size (#51012)"

This reverts commit 19bcabf. # Conflicts: # packages/components/CHANGELOG.md
WordPress · Jun 22, 2023 · b992cbe · b992cbe
1 parent ee36ebc
commit b992cbe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 24 deletions.
diff --git a/packages/base-styles/_variables.scss b/packages/base-styles/_variables.scss
@@ -48,7 +48,6 @@ $icon-size: 24px;
 $button-size: 36px;
 $button-size-next-default-40px: 40px; // transitionary variable for next default button size
 $button-size-small: 24px;
-$button-size-small-next-default-32px: 32px; // transitionary variable for next small button size
 $header-height: 60px;
 $panel-header-height: $grid-unit-60;
 $nav-sidebar-width: 360px;

diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
@@ -76,7 +76,6 @@ export function UnforwardedButton(
 ) {
 	const {
 		__next40pxDefaultSize,
-		__next32pxSmallSize,
 		isSmall,
 		isPressed,
 		isBusy,
@@ -118,7 +117,6 @@ export function UnforwardedButton(
 
 	const classes = classnames( 'components-button', className, {
 		'is-next-40px-default-size': __next40pxDefaultSize,
-		'is-next-32px-small-size': __next32pxSmallSize,
 		'is-secondary': variant === 'secondary',
 		'is-primary': variant === 'primary',
 		'is-small': isSmall,

diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
@@ -258,24 +258,15 @@
 	}
 
 	&.is-small {
-		height: $button-size-small-next-default-32px;
+		height: $icon-size;
 		line-height: 22px;
 		padding: 0 8px;
 		font-size: 11px;
 
 		&.has-icon:not(.has-text) {
 			padding: 0;
-			width: $button-size-small-next-default-32px;
-			min-width: $button-size-small-next-default-32px;
-		}
-
-		&:not(.is-next-32px-small-size) {
-			height: $button-size-small;
-
-			&.has-icon:not(.has-text) {
-				width: $button-size-small;
-				min-width: $button-size-small;
-			}
+			width: $icon-size;
+			min-width: $icon-size;
 		}
 	}
 

diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
@@ -25,15 +25,6 @@ type BaseButtonProps = {
 	 * @default false
 	 */
 	__next40pxDefaultSize?: boolean;
-	/**
-	 * Start opting into the larger `isSmall` button size that will become the
-	 * default small size in a future version.
-	 *
-	 * Only takes effect when the `isSmall` prop is `true`.
-	 *
-	 * @default false
-	 */
-	__next32pxSmallSize?: boolean;
 	/**
 	 * The button's children.
 	 */