Skip to content

Global Styles: Add a typesets section to Typography #62539

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
scruffian merged 11 commits into from
Jul 25, 2024
Merged

Global Styles: Add a typesets section to Typography #62539

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f14e4c5
Global Styles: Add a typesets section to Typography
scruffian Jun 13, 2024
4a6d43f
update typesets to contain font families
scruffian Jun 19, 2024
e147702
add variation name to typesets
scruffian Jun 19, 2024
79868db
add variation name to typesets
scruffian Jun 19, 2024
883f52a
use variation titles for typeset button
scruffian Jun 19, 2024
31a0996
Update packages/edit-site/src/components/global-styles/typeset-button.js
scruffian Jul 24, 2024
de2dd63
Update packages/edit-site/src/components/global-styles/typeset-button.js
scruffian Jul 24, 2024
3b6000a
Update packages/edit-site/src/components/global-styles/typeset-button.js
scruffian Jul 24, 2024
312dc1f
Add fontLibraryEnabled to ScreenTypography
mikachan Jul 25, 2024
8566c93
Remove window.__experimentalDisableFontLibrary
mikachan Jul 25, 2024
6d65aab
Check for themeFontFamilies and customFontFamilies
mikachan Jul 25, 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
Prev Previous commit
Next Next commit
Remove window.__experimentalDisableFontLibrary
  • Loading branch information
@mikachan
mikachan committed Jul 25, 2024
commit 8566c93379555cc51e24a99ef966b28ef06aed24
3 changes: 1 addition & 2 deletions packages/edit-site/src/components/global-styles/screen-typeset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ function ScreenTypeset() {
<VStack spacing={ 7 }>
<TypographyVariations />

{ ! window.__experimentalDisableFontLibrary &&
fontLibraryEnabled && <FontFamilies /> }
{ fontLibraryEnabled && <FontFamilies /> }
</VStack>
</div>
</>
Expand Down