fix(fakt): Rename fakt, never try to use the locally installed version (with potentially incorrect baseline)

This commit is contained in:
Ben Gotow 2015-06-08 17:48:59 -07:00
parent 81eb565e7d
commit fd2a197cc1
3 changed files with 12 additions and 12 deletions

View file

@ -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; }

View file

@ -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;

View file

@ -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;