From f6f8114cf244facb677114dc424d127707d242c4 Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Thu, 1 Oct 2015 11:48:19 -0700
Subject: [PATCH] fix(fonts): update fonts

---
 .gitignore                         |  1 +
 static/email-frame.less            |  2 +-
 static/variables/ui-variables.less | 50 ++----------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1360a5a80..a056e1cfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ docs/output
 docs/includes
 spec/fixtures/evil-files/
 yoursway-create-dmg
+private_packages
 
 !spec-nylas/fixtures/packages/package-with-incompatible-native-module/node_modules
 
diff --git a/static/email-frame.less b/static/email-frame.less
index 6b8689d95..5f4d7d15b 100644
--- a/static/email-frame.less
+++ b/static/email-frame.less
@@ -4,7 +4,7 @@
 .ignore-in-parent-frame {
 
   html, body {
-    font-family: "Nylas-FaktPro", "Helvetica", "Lucidia Grande", sans-serif;
+    font-family: "Nylas-Pro", "Helvetica", "Lucidia Grande", sans-serif;
     font-size: 16px;
     line-height: 1.5;
     color: @text-color;
diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
index 39573b8af..7a87db04f 100644
--- a/static/variables/ui-variables.less
+++ b/static/variables/ui-variables.less
@@ -7,7 +7,7 @@
 // 5. Application-specific usage (@unread-label-background)
 
 // Typography abstraction hierarchy
-// 1. Font-face (Nylas-FaktPro)
+// 1. Font-face (Nylas-Pro)
 // 2. Common name (@bold, @italic)
 // 3. Generic font descriptor mixins (.bold, .italic, .h1, .h2)
 // --------
@@ -86,53 +86,7 @@
 @text-color-error:       @error-color;
 @text-color-destructive: @danger-color;
 
-// ----- Font Families -----
-@font-face {
-  font-family: 'Nylas-FaktPro';
-  font-style: normal;
-  font-weight: 200;
-  src: url('fonts/Fakt/Nylas-FaktPro-Thin.otf'), local('Comic Sans MS');
-}
-
-@font-face {
-  font-family: 'Nylas-FaktPro';
-  font-style: normal;
-  font-weight: 300;
-  src: url('fonts/Fakt/Nylas-FaktPro-Blond.otf'), local('Comic Sans MS');
-}
-
-@font-face {
-  font-family: 'Nylas-FaktPro';
-  font-style: normal;
-  font-weight: 400;
-  src: url('fonts/Fakt/Nylas-FaktPro-Normal.otf'), local('Comic Sans MS');
-}
-
-@font-face {
-  font-family: 'Nylas-FaktPro';
-  font-style: normal;
-  font-weight: 500;
-  src: url('fonts/Fakt/Nylas-FaktPro-Medium.otf'), local('Comic Sans MS');
-}
-
-@font-face {
-  font-family: 'Nylas-FaktPro';
-  font-style: normal;
-  font-weight: 600;
-  src: url('fonts/Fakt/Nylas-FaktPro-SemiBold.otf'), local('Comic Sans MS');
-}
-
-// FaktPro-SemiBold doesn't render emoji properly. Override the emjoi unicode
-// block so that it uses the "Normal" weight even at font-weight:600.
-@font-face {
-  font-family: 'Nylas-FaktPro';
-  font-style: normal;
-  font-weight: 600;
-  src: url('fonts/Fakt/Nylas-FaktPro-Normal.otf'), local('Comic Sans MS');
-  unicode-range: U+1F300-1F5FF, U+1F600-1F64F, U+1F680-1F6FF, U+2600-26FF;
-}
-
-@font-family-sans-serif:  "Nylas-FaktPro", "Helvetica", 'Lucida Grande', 'Segoe UI', sans-serif;
+@font-family-sans-serif:  "Nylas-Pro", "Helvetica", 'Lucida Grande', 'Segoe UI', sans-serif;
 @font-family-smallcap:    "Proxima Nova Regular Small Cap", "sans-serif";
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;