Remove unneeded Fabriga

williamtran29 · Aug 12, 2020 · f0d0a02 · f0d0a02
1 parent cfd0045
commit f0d0a02
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 22 deletions.
diff --git a/src/components/Text.js b/src/components/Text.js
@@ -25,8 +25,8 @@ const propTypes = {
 };
 const defaultProps = {
     color: '#ffffff',
-    fontSize: 13,
-    family: 'fabriga',
+    fontSize: 15,
+    family: 'GTA',
     textAlign: null,
     children: null,
     style: {},
@@ -50,7 +50,7 @@ const Text = ({
     const componentStyle = {
         color,
         fontSize,
-        lineHeight: fontSize + 4,
+        lineHeight: '1.4',
         textAlign,
         ...fontFamily[family],
         ...mergedStyles,

diff --git a/src/style/fontFamily/index.js b/src/style/fontFamily/index.js
@@ -1,15 +1,6 @@
 const fontFamily = {
-    fabriga: {
-        fontFamily: 'Fabriga',
-    },
-    fabrigaBlack: {
-        fontFamily: 'Fabriga Black',
-    },
-    americaMedium: {
-        fontFamily: 'GTAmericaExp Medium',
-    },
-    americaRegular: {
-        fontFamily: 'GTAmericaExp Regular',
+    GTA: {
+        fontFamily: 'GT-America-Standard',
     },
 };
 

diff --git a/web/index.html b/web/index.html
@@ -4,14 +4,40 @@
     <title>Chat</title>
     <style>
         @font-face {
-            font-family: Fabriga;
-            font-weight: 700;
-            font-style: normal;
-            src:
-                url('https://www.expensify.com/font/Fabriga-Black.eot') format('embedded-opentype'),
-                url('https://www.expensify.com/font/Fabriga-Black.woff') format('woff'),
-                url('https://www.expensify.com/font/Fabriga-Black.woff2') format('woff2');
-        }
+          font-family: GT-America-Standard;
+          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: GT-America-Standard;
+          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: GT-America-Standard;
+          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: GT-America-Standard;
+          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: GT-America-Standard;
+          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"); }
+
+        @font-face {
+          font-family: GT-America-Standard;
+          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"); }
 
         * {
             -webkit-font-smoothing: antialiased;