Skip to content

ToolsPanel: Standardize input control label margin #36387

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 4 commits into from
Dec 7, 2021
Merged

ToolsPanel: Standardize input control label margin #36387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225ab77
Standardize input control label margin within ToolsPanel
aaronrobertshaw Nov 11, 2021
716a3dc
Ensure BaseControl label line-height in ToolsPanel
aaronrobertshaw Nov 16, 2021
6ea10b5
Ensure line-height for CustomSelectControl labels
aaronrobertshaw Nov 17, 2021
ba4e519
Add changelog
aaronrobertshaw Nov 17, 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
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Fixed spacing between `BaseControl` fields and help text within the `ToolsPanel` ([#36334](https://github.com/WordPress/gutenberg/pull/36334))
- Replaced hardcoded blue in `ColorPicker` with UI theme color ([#36153](https://github.com/WordPress/gutenberg/pull/36153)).
- Fixed empty `ToolsPanel` height by correcting menu button line-height ([#36895](https://github.com/WordPress/gutenberg/pull/36895)).
- Normalized label line-height and spacing within the `ToolsPanel` ([36387](https://github.com/WordPress/gutenberg/pull/36387))

### Enhancements

Expand Down
29 changes: 29 additions & 0 deletions packages/components/src/tools-panel/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import { css } from '@emotion/react';
import {
StyledField as BaseControlField,
StyledHelp as BaseControlHelp,
StyledLabel as BaseControlLabel,
Wrapper as BaseControlWrapper,
} from '../base-control/styles/base-control-styles';
import { LabelWrapper } from '../input-control/styles/input-control-styles';
import { COLORS, CONFIG } from '../utils';
import { space } from '../ui/utils/space';

Expand Down Expand Up @@ -118,6 +120,33 @@ export const ToolsPanelItem = css`
${ BaseControlHelp } {
margin-bottom: 0;
}

/**
* Standardize InputControl and BaseControl labels with other labels when
* inside ToolsPanel.
*
* This is a temporary fix until the different control components have their
* labels normalized.
*/
&& ${ LabelWrapper } {
Copy link
Contributor Author

@aaronrobertshaw aaronrobertshaw Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ended up using LabelWrapper from the input control styles here as I couldn't get BaseLabel to work for me. Open to suggestions to improve this.

label {
margin-bottom: ${ space( 2 ) };
padding-bottom: 0;
line-height: 1.4em;
}
}

/**
* The targeting of .components-custom-select-control__label here is a
* temporary measure only.
*
* It should be replaced once CustomSelectControl component has been
* refactored and can be targeted via component interpolation.
*/
.components-custom-select-control__label,
${ BaseControlLabel } {
line-height: 1.4em;
}
`;

export const ToolsPanelItemPlaceholder = css`
Expand Down