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

#56734 When there is no font, the border should not appear. Display further guidance text. #56825

Merged
merged 5 commits into from
Jan 11, 2024
Merged

#56734 When there is no font, the border should not appear. Display further guidance text. #56825

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e980e9
#56734 When there is no font, the border should not appear. Display f…
inc2734 Dec 6, 2023
f62b4ac
update text
matiasbenedetto Jan 3, 2024
87b926c
Merge branch 'trunk' into pr/inc2734/56825
matiasbenedetto Jan 3, 2024
74209ce
Fix formatting in font-families.js
mikachan Jan 11, 2024
fa96f0f
Improve readability
mikachan Jan 11, 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
22 changes: 14 additions & 8 deletions packages/edit-site/src/components/global-styles/font-families.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ function FontFamilies() {
const { modalTabOpen, toggleModal, themeFonts, customFonts } =
useContext( FontLibraryContext );

const hasFonts = 0 < customFonts.length || 0 < themeFonts.length;

return (
<>
{ !! modalTabOpen && (
Expand All @@ -51,14 +53,18 @@ function FontFamilies() {
</Tooltip>
</HStack>
</HStack>
<ItemGroup isBordered isSeparated>
{ customFonts.map( ( font ) => (
<FontFamilyItem key={ font.slug } font={ font } />
) ) }
{ themeFonts.map( ( font ) => (
<FontFamilyItem key={ font.slug } font={ font } />
) ) }
</ItemGroup>
{ hasFonts ? (
<ItemGroup isBordered isSeparated>
{ customFonts.map( ( font ) => (
<FontFamilyItem key={ font.slug } font={ font } />
) ) }
{ themeFonts.map( ( font ) => (
<FontFamilyItem key={ font.slug } font={ font } />
) ) }
</ItemGroup>
) : (
<>{ __( 'No fonts installed.' ) }</>
) }
</VStack>
</>
);
Expand Down
Loading