Merge pull request #12656 from Expensify/luke-add-new-fonts

Expensify · Dec 1, 2022 · c27b78b · c27b78b
2 parents 5fe2645 + 4fae98b
commit c27b78b
Show file tree

Hide file tree

Showing 69 changed files with 114 additions and 202 deletions.
diff --git a/.storybook/theme.js b/.storybook/theme.js
@@ -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,
 });
diff --git a/.../main/assets/fonts/ExpensifyMono-Bold.otf → ...main/assets/fonts/Expensify-Mono-Bold.otf b/.../main/assets/fonts/ExpensifyMono-Bold.otf → ...main/assets/fonts/Expensify-Mono-Bold.otf
diff --git a/...in/assets/fonts/ExpensifyMono-Regular.otf → ...n/assets/fonts/Expensify-Mono-Regular.otf b/...in/assets/fonts/ExpensifyMono-Regular.otf → ...n/assets/fonts/Expensify-Mono-Regular.otf
diff --git a/.../main/assets/fonts/ExpensifyNeue-Bold.otf → ...main/assets/fonts/Expensify-Neue-Bold.otf b/.../main/assets/fonts/ExpensifyNeue-Bold.otf → ...main/assets/fonts/Expensify-Neue-Bold.otf
diff --git a/...assets/fonts/ExpensifyNeue-BoldItalic.otf → ...ssets/fonts/Expensify-Neue-BoldItalic.otf b/...assets/fonts/ExpensifyNeue-BoldItalic.otf → ...ssets/fonts/Expensify-Neue-BoldItalic.otf
diff --git a/...ain/assets/fonts/ExpensifyNeue-Italic.otf → ...in/assets/fonts/Expensify-Neue-Italic.otf b/...ain/assets/fonts/ExpensifyNeue-Italic.otf → ...in/assets/fonts/Expensify-Neue-Italic.otf
diff --git a/...in/assets/fonts/ExpensifyNeue-Regular.otf → ...n/assets/fonts/Expensify-Neue-Regular.otf b/...in/assets/fonts/ExpensifyNeue-Regular.otf → ...n/assets/fonts/Expensify-Neue-Regular.otf
diff --git a/...ssets/fonts/ExpensifyNewKansas-Medium.otf → ...ets/fonts/Expensify-New-Kansas-Medium.otf b/...ssets/fonts/ExpensifyNewKansas-Medium.otf → ...ets/fonts/Expensify-New-Kansas-Medium.otf
diff --git a/...fonts/ExpensifyNewKansas-MediumItalic.otf → ...nts/Expensify-New-Kansas-MediumItalic.otf b/...fonts/ExpensifyNewKansas-MediumItalic.otf → ...nts/Expensify-New-Kansas-MediumItalic.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Bold.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Bold.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Light.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Light.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Medium.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Medium.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Regular.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Regular.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Thin.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Thin.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-Bd.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-Bd.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-BdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-BdIt.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf
diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-RgIt.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-RgIt.otf
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
@@ -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');
 }
 
 * {

diff --git a/assets/fonts/ExpensifyMono-Bold.woff b/assets/fonts/ExpensifyMono-Bold.woff
diff --git a/assets/fonts/ExpensifyMono-Bold.woff2 b/assets/fonts/ExpensifyMono-Bold.woff2
diff --git a/assets/fonts/ExpensifyMono-Regular.woff b/assets/fonts/ExpensifyMono-Regular.woff
diff --git a/assets/fonts/ExpensifyMono-Regular.woff2 b/assets/fonts/ExpensifyMono-Regular.woff2
diff --git a/assets/fonts/ExpensifyNeue-Bold.woff b/assets/fonts/ExpensifyNeue-Bold.woff
diff --git a/assets/fonts/ExpensifyNeue-Bold.woff2 b/assets/fonts/ExpensifyNeue-Bold.woff2
diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff b/assets/fonts/ExpensifyNeue-BoldItalic.woff
diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff2 b/assets/fonts/ExpensifyNeue-BoldItalic.woff2
diff --git a/assets/fonts/ExpensifyNeue-Italic.woff b/assets/fonts/ExpensifyNeue-Italic.woff
diff --git a/assets/fonts/ExpensifyNeue-Italic.woff2 b/assets/fonts/ExpensifyNeue-Italic.woff2
diff --git a/assets/fonts/ExpensifyNeue-Regular.woff b/assets/fonts/ExpensifyNeue-Regular.woff
diff --git a/assets/fonts/ExpensifyNeue-Regular.woff2 b/assets/fonts/ExpensifyNeue-Regular.woff2
diff --git a/assets/fonts/GTAmericaExp-BdIt.otf b/assets/fonts/GTAmericaExp-BdIt.otf
diff --git a/assets/fonts/GTAmericaExp-Bold.otf b/assets/fonts/GTAmericaExp-Bold.otf
diff --git a/assets/fonts/GTAmericaExp-Light.otf b/assets/fonts/GTAmericaExp-Light.otf
diff --git a/assets/fonts/GTAmericaExp-MdIt.otf b/assets/fonts/GTAmericaExp-MdIt.otf
diff --git a/assets/fonts/GTAmericaExp-Medium.otf b/assets/fonts/GTAmericaExp-Medium.otf
diff --git a/assets/fonts/GTAmericaExp-Regular.otf b/assets/fonts/GTAmericaExp-Regular.otf
diff --git a/assets/fonts/GTAmericaExp-RgIt.otf b/assets/fonts/GTAmericaExp-RgIt.otf
diff --git a/assets/fonts/GTAmericaExp-Thin.otf b/assets/fonts/GTAmericaExp-Thin.otf
diff --git a/assets/fonts/GTAmericaExpMono-Bd.otf b/assets/fonts/GTAmericaExpMono-Bd.otf
diff --git a/assets/fonts/GTAmericaExpMono-BdIt.otf b/assets/fonts/GTAmericaExpMono-BdIt.otf
diff --git a/assets/fonts/GTAmericaExpMono-Rg.otf b/assets/fonts/GTAmericaExpMono-Rg.otf
diff --git a/assets/fonts/GTAmericaExpMono-RgIt.otf b/assets/fonts/GTAmericaExpMono-RgIt.otf
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -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'},
@@ -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',

diff --git a/ios/ExpensifyMono-Bold.otf b/ios/ExpensifyMono-Bold.otf
diff --git a/ios/ExpensifyMono-Regular.otf b/ios/ExpensifyMono-Regular.otf
diff --git a/ios/ExpensifyNeue-Bold.otf b/ios/ExpensifyNeue-Bold.otf
diff --git a/ios/ExpensifyNeue-BoldItalic.otf b/ios/ExpensifyNeue-BoldItalic.otf
diff --git a/ios/ExpensifyNeue-Italic.otf b/ios/ExpensifyNeue-Italic.otf
diff --git a/ios/ExpensifyNeue-Regular.otf b/ios/ExpensifyNeue-Regular.otf
diff --git a/ios/ExpensifyNewKansas-Medium.otf b/ios/ExpensifyNewKansas-Medium.otf
diff --git a/ios/ExpensifyNewKansas-MediumItalic.otf b/ios/ExpensifyNewKansas-MediumItalic.otf