Skip to content
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

Fix Global styles panel header buttons text overlap for 'Show button text labels' #63243

Merged
merged 6 commits into from
Oct 22, 2024
Merged

Fix Global styles panel header buttons text overlap for 'Show button text labels' #63243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
150a197
Use compact variant for close butotn in complementary area.
afercia Jul 8, 2024
c8af9d2
Fix global styles header buttons when they show text.
afercia Jul 8, 2024
6b5aa67
Improve flexbox layout.
afercia Oct 18, 2024
245176e
Adjust gap.
afercia Oct 18, 2024
df77d50
Set button size to small.
afercia Oct 21, 2024
8727746
Remove no longer necessary margins.
afercia Oct 21, 2024
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
66 changes: 37 additions & 29 deletions packages/edit-site/src/components/global-styles-sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
import { FlexItem, FlexBlock, Flex, Button } from '@wordpress/components';
import { FlexItem, Flex, Button } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { styles, seen, backup } from '@wordpress/icons';
import { useSelect, useDispatch } from '@wordpress/data';
Expand Down Expand Up @@ -130,38 +130,46 @@ export default function GlobalStylesSidebar() {
className="edit-site-global-styles-sidebar__header"
gap={ 1 }
>
<FlexBlock style={ { minWidth: 'min-content' } }>
<FlexItem>
<h2 className="edit-site-global-styles-sidebar__header-title">
{ __( 'Styles' ) }
</h2>
</FlexBlock>
<FlexItem>
<Button
icon={ seen }
label={ __( 'Style Book' ) }
isPressed={
isStyleBookOpened || isRevisionsStyleBookOpened
}
accessibleWhenDisabled
disabled={ shouldClearCanvasContainerView }
onClick={ toggleStyleBook }
size="compact"
/>
</FlexItem>
<FlexItem>
<Button
label={ __( 'Revisions' ) }
icon={ backup }
onClick={ toggleRevisions }
accessibleWhenDisabled
disabled={ ! hasRevisions }
isPressed={
isRevisionsOpened || isRevisionsStyleBookOpened
}
size="compact"
/>
</FlexItem>
<GlobalStylesMenuSlot />
<Flex
justify="flex-end"
gap={ 1 }
className="edit-site-global-styles-sidebar__header-actions"
>
<FlexItem>
<Button
icon={ seen }
label={ __( 'Style Book' ) }
isPressed={
isStyleBookOpened ||
isRevisionsStyleBookOpened
}
accessibleWhenDisabled
disabled={ shouldClearCanvasContainerView }
onClick={ toggleStyleBook }
size="compact"
/>
</FlexItem>
<FlexItem>
<Button
label={ __( 'Revisions' ) }
icon={ backup }
onClick={ toggleRevisions }
accessibleWhenDisabled
disabled={ ! hasRevisions }
isPressed={
isRevisionsOpened ||
isRevisionsStyleBookOpened
}
size="compact"
/>
</FlexItem>
<GlobalStylesMenuSlot />
</Flex>
</Flex>
}
>
Expand Down
6 changes: 6 additions & 0 deletions packages/edit-site/src/components/global-styles-sidebar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
margin: 0;
}

.edit-site-global-styles-sidebar .edit-site-global-styles-sidebar__header-actions {
flex: 1;
}

.edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
font-size: $default-font-size * 1.2;
font-weight: 500;
Expand Down Expand Up @@ -75,6 +79,8 @@
.show-icon-labels {
.edit-site-global-styles-sidebar__header {
.components-button.has-icon {
width: auto;

// Hide the button icons when labels are set to display...
svg {
display: none;
Expand Down
5 changes: 0 additions & 5 deletions packages/interface/src/components/complementary-area-header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@

.components-button.has-icon {
display: none;
margin-left: auto;

~ .components-button {
margin-left: 0;
}

@include break-medium() {
display: flex;
Expand Down
Loading