Skip to content

fix: align font naming with PostScript convention for mobile compatibility #862

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
brianacnguyen merged 1 commit into from
Dec 9, 2025
Merged

fix: align font naming with PostScript convention for mobile compatibility #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions apps/storybook-react-native/.storybook/FontLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ const FontLoader = ({ children }) => {
useEffect(() => {
(async () => {
await Font.loadAsync({
'Geist Regular': require('../fonts/Geist/Geist Regular.otf'),
'Geist Regular Italic': require('../fonts/Geist/Geist Regular Italic.otf'),
'Geist Medium': require('../fonts/Geist/Geist Medium.otf'),
'Geist Medium Italic': require('../fonts/Geist/Geist Medium Italic.otf'),
'Geist Bold': require('../fonts/Geist/Geist Bold.otf'),
'Geist Bold Italic': require('../fonts/Geist/Geist Bold Italic.otf'),
'MM Poly Regular': require('../fonts/MMPoly/MM Poly Regular.otf'),
'MM Sans Regular': require('../fonts/MMSans/MM Sans Regular.otf'),
'MM Sans Medium': require('../fonts/MMSans/MM Sans Medium.otf'),
'MM Sans Bold': require('../fonts/MMSans/MM Sans Bold.otf'),
'Geist-Regular': require('../fonts/Geist/Geist-Regular.otf'),
'Geist-RegularItalic': require('../fonts/Geist/Geist-RegularItalic.otf'),
'Geist-Medium': require('../fonts/Geist/Geist-Medium.otf'),
'Geist-MediumItalic': require('../fonts/Geist/Geist-MediumItalic.otf'),
'Geist-Bold': require('../fonts/Geist/Geist-Bold.otf'),
'Geist-BoldItalic': require('../fonts/Geist/Geist-BoldItalic.otf'),
'MMPoly-Regular': require('../fonts/MMPoly/MMPoly-Regular.otf'),
'MMSans-Regular': require('../fonts/MMSans/MMSans-Regular.otf'),
'MMSans-Medium': require('../fonts/MMSans/MMSans-Medium.otf'),
'MMSans-Bold': require('../fonts/MMSans/MMSans-Bold.otf'),
});
setFontsLoaded(true);
})();
Expand Down
0 ...k-react-native/fonts/Geist/Geist Bold.otf → ...k-react-native/fonts/Geist/Geist-Bold.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

Matches PostScript name in Font Book

Image

File renamed without changes.
0 ...-native/fonts/Geist/Geist Bold Italic.otf → ...t-native/fonts/Geist/Geist-BoldItalic.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Matches PostScript name in Font Book

Image

File renamed without changes.
0 ...react-native/fonts/Geist/Geist Medium.otf → ...react-native/fonts/Geist/Geist-Medium.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

Matches PostScript name in Font Book

Image

File renamed without changes.
0 ...ative/fonts/Geist/Geist Medium Italic.otf → ...native/fonts/Geist/Geist-MediumItalic.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...eact-native/fonts/Geist/Geist Regular.otf → ...eact-native/fonts/Geist/Geist-Regular.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...tive/fonts/Geist/Geist Regular Italic.otf → ...ative/fonts/Geist/Geist-RegularItalic.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...t-native/fonts/MMPoly/MM Poly Regular.otf → ...ct-native/fonts/MMPoly/MMPoly-Regular.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...eact-native/fonts/MMSans/MM Sans Bold.otf → ...react-native/fonts/MMSans/MMSans-Bold.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...ct-native/fonts/MMSans/MM Sans Medium.otf → ...act-native/fonts/MMSans/MMSans-Medium.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...t-native/fonts/MMSans/MM Sans Regular.otf → ...ct-native/fonts/MMSans/MMSans-Regular.otf
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

PostScript name in Font Book

Image

File renamed without changes.
0 ...rybook-react/fonts/Geist/Geist Bold.woff2 → ...rybook-react/fonts/Geist/Geist-Bold.woff2
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

Updating storybook react fonts to be consistent and prevent confusion between platforms

File renamed without changes.
0 ...react/fonts/Geist/Geist Bold Italic.woff2 → ...-react/fonts/Geist/Geist-BoldItalic.woff2
View file
Open in desktop
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

Updating storybook react fonts to be consistent and prevent confusion between platforms

File renamed without changes.
0 ...book-react/fonts/Geist/Geist Medium.woff2 → ...book-react/fonts/Geist/Geist-Medium.woff2
View file
Open in desktop
File renamed without changes.
0 ...act/fonts/Geist/Geist Medium Italic.woff2 → ...eact/fonts/Geist/Geist-MediumItalic.woff2
View file
Open in desktop
File renamed without changes.
0 ...ook-react/fonts/Geist/Geist Regular.woff2 → ...ook-react/fonts/Geist/Geist-Regular.woff2
View file
Open in desktop
File renamed without changes.
0 ...ct/fonts/Geist/Geist Regular Italic.woff2 → ...act/fonts/Geist/Geist-RegularItalic.woff2
View file
Open in desktop
File renamed without changes.
0 ...-react/fonts/MMPoly/MM Poly Regular.woff2 → ...k-react/fonts/MMPoly/MMPoly-Regular.woff2
View file
Open in desktop
File renamed without changes.
0 ...ook-react/fonts/MMSans/MM Sans Bold.woff2 → ...book-react/fonts/MMSans/MMSans-Bold.woff2
View file
Open in desktop
File renamed without changes.
0 ...k-react/fonts/MMSans/MM Sans Medium.woff2 → ...ok-react/fonts/MMSans/MMSans-Medium.woff2
View file
Open in desktop
File renamed without changes.
0 ...-react/fonts/MMSans/MM Sans Regular.woff2 → ...k-react/fonts/MMSans/MMSans-Regular.woff2
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions apps/storybook-react/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,84 @@
font-family: 'Geist';
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Dec 4, 2025

Choose a reason for hiding this comment

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

Updating tailwind stylesheet

font-style: normal;
font-weight: 400;
src: url('fonts/Geist/Geist Regular.woff2') format('woff2');
src: url('fonts/Geist/Geist-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'Geist';
font-style: italic;
font-weight: 400;
src: url('fonts/Geist/Geist Regular Italic.woff2') format('woff2');
src: url('fonts/Geist/Geist-RegularItalic.woff2') format('woff2');
}

@font-face {
font-family: 'Geist';
font-style: normal;
font-weight: 500;
src: url('fonts/Geist/Geist Medium.woff2') format('woff2');
src: url('fonts/Geist/Geist-Medium.woff2') format('woff2');
}

@font-face {
font-family: 'Geist';
font-style: italic;
font-weight: 500;
src: url('fonts/Geist/Geist Medium Italic.woff2') format('woff2');
src: url('fonts/Geist/Geist-MediumItalic.woff2') format('woff2');
}

@font-face {
font-family: 'Geist';
font-style: normal;
font-weight: 700;
src: url('fonts/Geist/Geist Bold.woff2') format('woff2');
src: url('fonts/Geist/Geist-Bold.woff2') format('woff2');
}

@font-face {
font-family: 'Geist';
font-style: italic;
font-weight: 700;
src: url('fonts/Geist/Geist Bold Italic.woff2') format('woff2');
src: url('fonts/Geist/Geist-BoldItalic.woff2') format('woff2');
}

/* MM Sans */
@font-face {
font-family: 'MMSans';
font-style: normal;
font-weight: 400;
src: url('fonts/MMSans/MM Sans Regular.woff2') format('woff2');
src: url('fonts/MMSans/MMSans-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'MMSans';
font-style: normal;
font-weight: 500;
src: url('fonts/MMSans/MM Sans Medium.woff2') format('woff2');
src: url('fonts/MMSans/MMSans-Medium.woff2') format('woff2');
}

@font-face {
font-family: 'MMSans';
font-style: normal;
font-weight: 700;
src: url('fonts/MMSans/MM Sans Bold.woff2') format('woff2');
src: url('fonts/MMSans/MMSans-Bold.woff2') format('woff2');
}

/* MM Poly */
@font-face {
font-family: 'MMPoly';
font-style: normal;
font-weight: 400;
src: url('fonts/MMPoly/MM Poly Regular.woff2') format('woff2');
src: url('fonts/MMPoly/MMPoly-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'MMPoly';
font-style: normal;
font-weight: 500;
src: url('fonts/MMPoly/MM Poly Regular.woff2') format('woff2');
src: url('fonts/MMPoly/MMPoly-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'MMPoly';
font-style: normal;
font-weight: 700;
src: url('fonts/MMPoly/MM Poly Regular.woff2') format('woff2');
src: url('fonts/MMPoly/MMPoly-Regular.woff2') format('woff2');
}
20 changes: 10 additions & 10 deletions packages/design-system-twrnc-preset/src/typography.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@ export const typographyTailwindConfig: TypographyTailwindConfigProps = {
],
},
fontFamily: {
'default-regular': 'Geist Regular',
'default-regular-italic': 'Geist Regular Italic',
'default-medium': 'Geist Medium',
'default-medium-italic': 'Geist Medium Italic',
'default-bold': 'Geist Bold',
'default-bold-italic': 'Geist Bold Italic',
'accent-regular': 'MM Sans Regular',
'accent-medium': 'MM Sans Medium',
'accent-bold': 'MM Sans Bold',
'hero-regular': 'MM Poly Regular',
'default-regular': 'Geist-Regular',
'default-regular-italic': 'Geist-RegularItalic',
'default-medium': 'Geist-Medium',
'default-medium-italic': 'Geist-MediumItalic',
'default-bold': 'Geist-Bold',
'default-bold-italic': 'Geist-BoldItalic',
'accent-regular': 'MMSans-Regular',
'accent-medium': 'MMSans-Medium',
'accent-bold': 'MMSans-Bold',
'hero-regular': 'MMPoly-Regular',
},
letterSpacing: {
'display-lg': `${typography.sDisplayLG.letterSpacing as number}`,
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system-twrnc-preset/src/typography.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export type FontStyle = 'normal' | 'italic';
* {
* fontSize: {
* 'display-md': {
* fontFamily: 'Geist Bold',
* fontFamily: 'Geist-Bold',
* fontSize: '32',
* fontWeight: '700',
* letterSpacing: '0',
Expand Down
Loading