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

Jump to bottom

Font Library Modal: enhance pagination appearance #63210

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Font Library Modal: enhance pagination appearance #63210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4696cd4
Font Library Modal: enhance pagination appearance
t-hamano Jul 6, 2024
5f210da
Remove first/last page buttons
t-hamano Jul 9, 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
43 changes: 14 additions & 29 deletions packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
} from '@wordpress/components';
import { debounce } from '@wordpress/compose';
import { sprintf, __, _x } from '@wordpress/i18n';
import { moreVertical, chevronLeft } from '@wordpress/icons';
import { moreVertical, chevronLeft, chevronRight } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -429,7 +429,7 @@ function FontCollection( { slug } ) {
{ selectedFont && (
<Flex
justify="flex-end"
className="font-library-modal__tabpanel-layout__footer"
className="font-library-modal__footer"
>
<Button
variant="primary"
Expand All @@ -446,32 +446,26 @@ function FontCollection( { slug } ) {
) }

{ ! selectedFont && (
<Flex
<HStack
spacing={ 4 }
justify="center"
className="font-library-modal__tabpanel-layout__footer"
className="font-library-modal__footer"
>
<Button
label={ __( 'First page' ) }
size="compact"
onClick={ () => setPage( 1 ) }
disabled={ page === 1 }
accessibleWhenDisabled
>
<span>«</span>
</Button>
<Button
label={ __( 'Previous page' ) }
size="compact"
onClick={ () => setPage( page - 1 ) }
disabled={ page === 1 }
showTooltip
accessibleWhenDisabled
>
<span>‹</span>
</Button>
icon={ chevronLeft }
tooltipPosition="top"
/>
<HStack
justify="flex-start"
expanded={ false }
spacing={ 2 }
className="font-library-modal__page-selection"
>
{ createInterpolateElement(
sprintf(
Expand Down Expand Up @@ -515,19 +509,10 @@ function FontCollection( { slug } ) {
onClick={ () => setPage( page + 1 ) }
disabled={ page === totalPages }
accessibleWhenDisabled
>
<span>›</span>
</Button>
<Button
label={ __( 'Last page' ) }
size="compact"
onClick={ () => setPage( totalPages ) }
disabled={ page === totalPages }
accessibleWhenDisabled
>
<span>»</span>
</Button>
</Flex>
icon={ chevronRight }
tooltipPosition="top"
/>
</HStack>
) }
</>
) }
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ function InstalledFonts() {

<HStack
justify="flex-end"
className="font-library-modal__tabpanel-layout__footer"
className="font-library-modal__footer"
>
{ isInstalling && <ProgressBar /> }
{ shouldDisplayDeleteButton && (
Expand Down
27 changes: 17 additions & 10 deletions packages/edit-site/src/components/global-styles/font-library-modal/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,24 @@ $footer-height: 70px;
// It should be 120px (72px modal header height + 48px tab height)
padding-top: $header-height + $grid-unit-15 + $grid-unit-60;
}
}

.font-library-modal__tabpanel-layout__footer {
border-top: 1px solid $gray-300;
margin: 0 #{$grid-unit-40 * -1} #{$grid-unit-40 * -1};
padding: $grid-unit-20 $grid-unit-40;
position: absolute;
bottom: $grid-unit-40;
width: 100%;
height: $footer-height;
background-color: $white;
}
.font-library-modal__footer {
border-top: 1px solid $gray-300;
margin: 0 #{$grid-unit-40 * -1} #{$grid-unit-40 * -1};
padding: $grid-unit-20 $grid-unit-40;
position: absolute;
bottom: $grid-unit-40;
width: 100%;
height: $footer-height;
background-color: $white;
}

.font-library-modal__page-selection {
font-size: 11px;
text-transform: uppercase;
font-weight: 500;
color: $gray-900;
}

.font-library-modal__tabpanel-layout .components-base-control__field {
Expand Down
Loading