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

feat: add Arial as fallback for fonts #2048

Merged
merged 12 commits into from
Mar 1, 2024
Merged

feat: add Arial as fallback for fonts #2048

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1a95961
feat: add Arial as fallback for fonts
saurabhdaware Feb 28, 2024
9f17b2d
feat: add more accurate overrides
saurabhdaware Feb 28, 2024
6227d94
fix: basic example dependencies
saurabhdaware Feb 29, 2024
0c657cf
feat: update snapshots
saurabhdaware Feb 29, 2024
778a76f
Create mighty-kangaroos-destroy.md
saurabhdaware Feb 29, 2024
914631f
fix: add blade prefix, update fonts.css url
saurabhdaware Mar 1, 2024
03b6de5
Merge branch 'font-fallback' of github.com:razorpay/blade into font-f…
saurabhdaware Mar 1, 2024
6266793
fix: snapshots
saurabhdaware Mar 1, 2024
db36479
Merge branch 'master' of github.com:razorpay/blade into font-fallback
saurabhdaware Mar 1, 2024
ca6acc5
feat: update snapshots again
saurabhdaware Mar 1, 2024
eeea0f9
feat: remove font css variable
saurabhdaware Mar 1, 2024
d191627
fix: snapshots again
saurabhdaware Mar 1, 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
24 changes: 24 additions & 0 deletions packages/blade/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,27 @@
U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20A0-20AF, U+20B0-20BF, U+20C0,
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/* Fallback Fonts */
@font-face {
font-family: 'Inter Fallback Arial';
src: local(Arial);
size-adjust: 105%;
ascent-override: 91%;
descent-override: 20%;
line-gap-override: 4%;
}

@font-face {
font-family: 'TASA Orbiter Fallback Arial';
src: local('Arial Bold');
size-adjust: 93%;
ascent-override: 95%;
descent-override: 20%;
line-gap-override: 10%;
}

:root {
--inter-fallback: 'Inter Fallback Arial';
--tasa-orbiter-fallback: 'TASA Orbiter Fallback Arial';
saurabhdaware marked this conversation as resolved.
Show resolved Hide resolved
}
7 changes: 3 additions & 4 deletions packages/blade/src/tokens/global/fontFamily/fontFamily.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import type { FontFamily } from './types';

// Fallbacks here are defined in `packages/blade/fonts.css`
export const fontFamily: FontFamily = {
text:
'"Inter", -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif',
heading:
'"TASA Orbiter", -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif',
text: '"Inter", var(--inter-fallback), Arial',
heading: '"TASA Orbiter", var(--tasa-orbiter-fallback), Arial',
code: '"Menlo", San Francisco Mono, Courier New, Roboto Mono, monospace',
};
Loading