From 6221bf131134eb20543f34f05b7ea2c168ef0fc8 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Mon, 8 Jun 2015 17:48:59 -0700
Subject: [PATCH] fix(fakt): Rename fakt, never try to use the locally
 installed version (with potentially incorrect baseline)

---
 .../stylesheets/message-list.less             |  2 +-
 static/email-frame.less                       |  2 +-
 static/variables/ui-variables.less            | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 46c619fa9..db36907d7 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -243,7 +243,7 @@
     position: absolute;
     top: 0;
     left: -1 * @spacing-standard;
-    color: @text-color-very-subtle;
+    img { background: @text-color-very-subtle; }
   }
   .message-item-wrap:hover {
     .collapse-control.inactive { display: block; }
diff --git a/static/email-frame.less b/static/email-frame.less
index 8c83b3d2a..811a4f176 100644
--- a/static/email-frame.less
+++ b/static/email-frame.less
@@ -4,7 +4,7 @@
 .ignore-in-parent-frame {
 
   html, body {
-    font-family: "FaktPro", "Helvetica", "Lucidia Grande", sans-serif;
+    font-family: "Nylas-FaktPro", "Helvetica", "Lucidia Grande", sans-serif;
     font-size: 16px;
     line-height: 1.5;
 
diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
index aa85fc9c5..3960699d0 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 (FaktPro)
+// 1. Font-face (Nylas-FaktPro)
 // 2. Common name (@bold, @italic)
 // 3. Generic font descriptor mixins (.bold, .italic, .h1, .h2)
 // --------
@@ -87,34 +87,34 @@
 
 // ----- Font Families -----
 @font-face {
-  font-family: 'FaktPro';
+  font-family: 'Nylas-FaktPro';
   font-style: normal;
   font-weight: 300;
-  src: local('FaktPro-Blond'), url('fonts/Fakt/FaktPro-Blond.otf'), local('Comic Sans MS');
+  src: url('fonts/Fakt/Nylas-FaktPro-Blond.otf'), local('Comic Sans MS');
 }
 
 @font-face {
-  font-family: 'FaktPro';
+  font-family: 'Nylas-FaktPro';
   font-style: normal;
   font-weight: 400;
-  src: local('FaktPro-Normal'), url('fonts/Fakt/FaktPro-Normal.otf'), local('Comic Sans MS');
+  src: url('fonts/Fakt/Nylas-FaktPro-Normal.otf'), local('Comic Sans MS');
 }
 
 @font-face {
-  font-family: 'FaktPro';
+  font-family: 'Nylas-FaktPro';
   font-style: normal;
   font-weight: 500;
-  src: local('FaktPro-Medium'), url('fonts/Fakt/FaktPro-Medium.otf'), local('Comic Sans MS');
+  src: url('fonts/Fakt/Nylas-FaktPro-Medium.otf'), local('Comic Sans MS');
 }
 
 @font-face {
-  font-family: 'FaktPro';
+  font-family: 'Nylas-FaktPro';
   font-style: normal;
   font-weight: 600;
-  src: local('FaktPro-SemiBold'), url('fonts/Fakt/FaktPro-SemiBold.otf'), local('Comic Sans MS');
+  src: url('fonts/Fakt/Nylas-FaktPro-SemiBold.otf'), local('Comic Sans MS');
 }
 
-@font-family-sans-serif:  "FaktPro", "Helvetica", 'Lucida Grande', 'Segoe UI', sans-serif;
+@font-family-sans-serif:  "Nylas-FaktPro", "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;