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.

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

Add New Fonts #12656

Merged
merged 37 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
98f108c
added ExpensifyNeue
Nov 10, 2022
a47318d
added Expensify Mono
Nov 10, 2022
96f09d0
font name changes
Nov 15, 2022
28f7c25
experimenting
Nov 15, 2022
b6166bd
configure webpack
Nov 16, 2022
10faa84
change font linking
Nov 16, 2022
4bd100f
change web fonts
Nov 17, 2022
4882d3c
add bold fonts
Nov 17, 2022
02c41aa
renamed ios fonts for consistency
Nov 17, 2022
4c67427
mobile font configs
Nov 17, 2022
ab60bca
font names
Nov 17, 2022
e6ffd31
names
Nov 17, 2022
a1c646c
linting
Nov 17, 2022
5bb234a
trialing spaces
Nov 17, 2022
c8d2041
missed some names
Nov 17, 2022
824e159
smattering of other font locations
Nov 17, 2022
fbf5105
delete GTA fonts
Nov 17, 2022
58ceade
removing fonts
Nov 17, 2022
6ca36be
removing fonts
Nov 17, 2022
b369ff7
Merge branch 'main' of github.com:Expensify/App into luke-add-new-fonts
Nov 17, 2022
6f0ad66
delete GTA fonts
Nov 21, 2022
c92e41b
Merge branch 'main' of github.com:Expensify/App into luke-add-new-fonts
Nov 21, 2022
da5414a
fix androids fonts
Nov 21, 2022
c58f715
Merge branch 'main' of github.com:Expensify/App into luke-add-new-fonts
Nov 29, 2022
d495a67
take out font resources
Nov 29, 2022
95fe282
fixed unrecognized font issue
Nov 29, 2022
fadb9ed
change font location
Nov 29, 2022
9e8103b
prefer woff2's
Nov 29, 2022
a2b07b4
change fonts to their postscript name
Nov 29, 2022
2d2e377
use postscript names in ios
Nov 29, 2022
f053762
use new names
Nov 29, 2022
b06a842
more name changes
Nov 29, 2022
08fa35d
more name changes
Nov 29, 2022
696acb7
typo
Nov 29, 2022
cde027b
revert help site font changes
Nov 30, 2022
46b15a4
missed a few
Nov 30, 2022
4fae98b
config stuff
Nov 30, 2022
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
2 changes: 1 addition & 1 deletion .storybook/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default create({
brandImage: 'logomark.svg',
colorPrimary: colors.dark,
colorSecondary: colors.orange,
fontBase: 'GTAmericaExp-Regular',
fontBase: 'ExpensifyNeue-Regular',
fontCode: 'monospace',
textInverseColor: colors.black,
});
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
77 changes: 14 additions & 63 deletions assets/css/fonts.css
Original file line number Diff line number Diff line change
@@ -1,92 +1,43 @@
@font-face {
font-family: GTAmericaExp-Regular;
font-weight: 100;
font-style: normal;
src: url("https://www.expensify.com/font/GT-America-Standard-Light.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Light.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Light.woff2") format("woff2");
}

@font-face {
font-family: GTAmericaExp-Regular;
font-weight: 200;
font-style: normal;
src: url("https://www.expensify.com/font/GT-America-Standard-Thin.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Thin.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Thin.woff2") format("woff2");
}

@font-face {
font-family: GTAmericaExp-Regular;
font-family: ExpensifyNeue-Regular;
font-weight: 400;
font-style: normal;
src: url("https://www.expensify.com/font/GT-America-Standard-Regular.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Regular.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Regular.woff2") format("woff2");
}

@font-face {
font-family: GTAmericaExp-Regular;
font-weight: 500;
font-style: normal;
src: url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2");
}

@font-face {
font-family: GTAmericaExp-Regular;
font-weight: 600;
font-style: normal;
src: url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2");
src: url('/fonts/ExpensifyNeue-Regular.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Regular.woff') format('woff');
}

@font-face {
font-family: GTAmericaExp-Regular;
font-family: ExpensifyNeue-Bold;
font-weight: 700;
font-style: normal;
src: url("https://www.expensify.com/font/GT-America-Standard-Bold.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Bold.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Bold.woff2") format("woff2");
src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Bold.woff') format('woff');
}

@font-face {
font-family: GTAmericaExp-RgIt;
font-family: ExpensifyNeue-Italic;
font-weight: 400;
font-style: italic;
src: url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff2") format("woff2");
}

@font-face {
font-family: GTAmericaExp-MdIt;
font-weight: 500;
font-style: italic;
src: url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff2") format("woff2");
font-style: normal;
src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Italic.woff') format('woff');
}

@font-face {
font-family: GTAmericaExp-BdIt;
font-family: ExpensifyNeue-BoldItalic;
font-weight: 700;
font-style: italic;
src: url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff2") format("woff2");
}

@font-face {
font-family: GTAmericaExpMono-Rg;
font-weight: 400;
font-style: normal;
src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff2') format('woff2');
src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-BoldItalic.woff') format('woff');
}

@font-face {
font-family: GTAmericaExpMono-RgIt;
font-family: ExpensifyMono-Regular;
font-weight: 400;
font-style: italic;
src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff2') format('woff2');
}

@font-face {
font-family: GTAmericaExpMono-Bd;
font-weight: 700;
font-style: normal;
src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff2') format('woff2');
src: url('/fonts/ExpensifyMono-Regular.woff2') format('woff2'), url('/fonts/ExpensifyMono-Regular.woff') format('woff');
}

@font-face {
font-family: GTAmericaExpMono-BdIt;
font-family: ExpensifyMono-Bold;
font-weight: 700;
font-style: italic;
src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff2') format('woff2');
font-style: normal;
src: url('/fonts/ExpensifyMono-Bold.woff2') format('woff2'), url('/fonts/ExpensifyMono-Bold.woff') format('woff');
}

* {
Expand Down
Binary file added assets/fonts/ExpensifyMono-Bold.woff
Binary file not shown.
Binary file added assets/fonts/ExpensifyMono-Bold.woff2
Binary file not shown.
Binary file added assets/fonts/ExpensifyMono-Regular.woff
Binary file not shown.
Binary file added assets/fonts/ExpensifyMono-Regular.woff2
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-Bold.woff
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-Bold.woff2
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-BoldItalic.woff
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-BoldItalic.woff2
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-Italic.woff
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-Italic.woff2
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-Regular.woff
Binary file not shown.
Binary file added assets/fonts/ExpensifyNeue-Regular.woff2
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-BdIt.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-Bold.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-Light.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-MdIt.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-Medium.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-Regular.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-RgIt.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExp-Thin.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExpMono-Bd.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExpMono-BdIt.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExpMono-Rg.otf
Binary file not shown.
Binary file removed assets/fonts/GTAmericaExpMono-RgIt.otf
Binary file not shown.
5 changes: 5 additions & 0 deletions config/webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
{from: 'web/favicon-unread.png'},
{from: 'web/og-preview-image.png'},
{from: 'assets/css', to: 'css'},
{from: 'assets/fonts', to: 'fonts'},
{from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
{from: 'assets/images/shadow.png', to: 'images/shadow.png'},
{from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'},
Expand Down Expand Up @@ -187,6 +188,10 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
{
test: /\.(woff|woff2)$/i,
type: 'asset',
},
{
resourceQuery: /raw/,
type: 'asset/source',
Expand Down
Binary file removed ios/ExpensifyMono-Bold.otf
Binary file not shown.
Binary file removed ios/ExpensifyMono-Regular.otf
Binary file not shown.
Binary file removed ios/ExpensifyNeue-Bold.otf
Binary file not shown.
Binary file removed ios/ExpensifyNeue-BoldItalic.otf
Binary file not shown.
Binary file removed ios/ExpensifyNeue-Italic.otf
Binary file not shown.
Binary file removed ios/ExpensifyNeue-Regular.otf
Binary file not shown.
Binary file removed ios/ExpensifyNewKansas-Medium.otf
Binary file not shown.
Binary file removed ios/ExpensifyNewKansas-MediumItalic.otf
Binary file not shown.
Loading