Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-28 18:14:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(fonts): update fonts

Browse source
This commit is contained in:
Evan Morikawa 2015-10-01 11:48:19 -07:00
parent 2cfd4b4dfb
commit f6f8114cf2
3 changed files with 4 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,6 +17,7 @@ docs/output
docs/includes docs/includes
spec/fixtures/evil-files/ spec/fixtures/evil-files/
yoursway-create-dmg yoursway-create-dmg
private_packages
!spec-nylas/fixtures/packages/package-with-incompatible-native-module/node_modules !spec-nylas/fixtures/packages/package-with-incompatible-native-module/node_modules

2
static/email-frame.less
View file

@ -4,7 +4,7 @@
.ignore-in-parent-frame { .ignore-in-parent-frame {
html, body { html, body {
font-family: "Nylas-FaktPro", "Helvetica", "Lucidia Grande", sans-serif; font-family: "Nylas-Pro", "Helvetica", "Lucidia Grande", sans-serif;
font-size: 16px; font-size: 16px;
line-height: 1.5; line-height: 1.5;
color: @text-color; color: @text-color;

50
static/variables/ui-variables.less
View file

@ -7,7 +7,7 @@
// 5. Application-specific usage (@unread-label-background) // 5. Application-specific usage (@unread-label-background)
// Typography abstraction hierarchy // Typography abstraction hierarchy
// 1. Font-face (Nylas-FaktPro) // 1. Font-face (Nylas-Pro)
// 2. Common name (@bold, @italic) // 2. Common name (@bold, @italic)
// 3. Generic font descriptor mixins (.bold, .italic, .h1, .h2) // 3. Generic font descriptor mixins (.bold, .italic, .h1, .h2)
// -------- // --------
@ -86,53 +86,7 @@
@text-color-error: @error-color; @text-color-error: @error-color;
@text-color-destructive: @danger-color; @text-color-destructive: @danger-color;
// ----- Font Families ----- @font-family-sans-serif: "Nylas-Pro", "Helvetica", 'Lucida Grande', 'Segoe UI', sans-serif;
@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-smallcap: "Proxima Nova Regular Small Cap", "sans-serif"; @font-family-smallcap: "Proxima Nova Regular Small Cap", "sans-serif";
@font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;