Remove redundant font size reset button and update styles to match

WordPress · Aug 16, 2021 · f28510c · f28510c
1 parent 0dab6cf
commit f28510c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/packages/block-editor/src/hooks/font-size.js b/packages/block-editor/src/hooks/font-size.js
@@ -140,7 +140,13 @@ export function FontSizeEdit( props ) {
 	const fontSizeValue =
 		fontSizeObject?.size || style?.typography?.fontSize || fontSize;
 
-	return <FontSizePicker onChange={ onChange } value={ fontSizeValue } />;
+	return (
+		<FontSizePicker
+			onChange={ onChange }
+			value={ fontSizeValue }
+			allowReset={ false }
+		/>
+	);
 }
 
 /**

diff --git a/packages/block-editor/src/hooks/typography.scss b/packages/block-editor/src/hooks/typography.scss
@@ -1,8 +1,19 @@
-.block-editor-block-inspector,
-.edit-site {
-	.typography-controls {
-		.block-editor-line-height-control input {
-			max-width: 100%;
+.typography-controls {
+	.block-editor-line-height-control input {
+		max-width: 100%;
+	}
+
+	.components-font-size-picker__controls {
+		.components-font-size-picker__select {
+			flex: 1;
+
+			> button {
+				width: 100%;
+			}
+		}
+
+		.components-unit-control-wrapper {
+			margin-right: 0;
 		}
 	}
 }
diff --git a/packages/components/src/tools-panel/styles.js b/packages/components/src/tools-panel/styles.js
@@ -61,4 +61,9 @@ export const ToolsPanelItem = css`
 		margin-bottom: 0;
 		max-width: 100%;
 	}
+
+	> .components-base-control,
+	.components-base-control__field {
+		margin-bottom: 0;
+	}
 `;
diff --git a/packages/edit-site/src/components/sidebar/style.scss b/packages/edit-site/src/components/sidebar/style.scss
@@ -38,19 +38,3 @@
 		margin-bottom: 0;
 	}
 }
-
-.edit-site {
-	.components-font-size-picker__controls {
-		.components-font-size-picker__select {
-			flex: 1;
-
-			> button {
-				width: 100%;
-			}
-		}
-
-		.components-unit-control-wrapper {
-			margin-right: 0;
-		}
-	}
-}