Skip to content
This repository was archived by the owner on Mar 15, 2018. It is now read-only.

Commit ff2be24

Browse files
committed
use new Fira fonts; use local fonts, fallback to network fonts
1 parent 1ed33b3 commit ff2be24

34 files changed

+7617
-22
lines changed

hearth/media/css/lib.styl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,7 @@ $btn-b-dark = #267CC2;
7272
$btn-b-lite = saturate(spin($btn-b, 4), 4%);
7373

7474
// Font Stacks
75-
// TODO: When the Firefox OS devices have a version of "Feura Sans" that actually has as many weights
76-
// as does FeuraSansWeb then use "Feura Sans." Until then, always load the `font-face`.
77-
// TODO(cvan): File a bug against Firefox that it shouldn't download unused `font-face`s that are
78-
// fallbacks.
79-
$open-stack = FeuraSansWeb, "Open Sans", "Helvetica Neue", Arial, sans-serif;
75+
$open-stack = "Fira Sans", "Helvetica Neue", Arial, sans-serif;
8076

8177
// Retina
8278
$retina = unquote('screen and (-webkit-min-device-pixel-ratio: 2), screen and (min--moz-device-pixel-ratio: 2), screen and (min-device-pixel-ratio: 2)');
@@ -360,7 +356,7 @@ fatten() {
360356
}
361357

362358
glow($glowColor, $glowSize) {
363-
box-shadow: 0 0 $glowSize 0 $glowColor;
359+
box-shadow: 0 0 $glowSize 0 $glowColor;
364360
}
365361

366362
alt-btn-hover-focus() {

hearth/media/css/typography.styl

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,55 @@
11
@import 'lib';
22

33
@font-face {
4-
font-family: 'FeuraSansWeb';
5-
src: url('../fonts/FeuraSans/FeuraSansWeb-Light.woff') format('woff'),
6-
url('../fonts/FeuraSans/FeuraSansWeb-Light.svg#FeuraSansWebLight') format('svg');
4+
src: local('Fira Sans OT Light Regular'),
5+
local('Fira Sans Light Regular'),
6+
local('Fira Sans OT Light'),
7+
local('Fira Sans Light'),
8+
local('Fira Sans OT'),
9+
local('Fira Sans'),
10+
url('../fonts/FiraSans/firasansot-light-webfont.woff') format('woff'),
11+
url('../fonts/FiraSans/firasansot-light-webfont.ttf') format('truetype'),
12+
url('../fonts/FiraSans/firasansot-light-webfont.svg#fira_sans_otlight') format('svg');
13+
font-family: 'FiraSans';
714
font-weight: 300;
8-
font-style: normal;
915
}
1016

1117
@font-face {
12-
font-family: 'FeuraSansWeb';
13-
src: url('../fonts/FeuraSans/FeuraSansWeb-Regular.woff') format('woff'),
14-
url('../fonts/FeuraSans/FeuraSansWeb-Regular.svg#FeuraSansWebRegular') format('svg');
18+
src: local('Fira Sans OT Regular'),
19+
local('Fira Sans Regular'),
20+
local('Fira Sans OT'),
21+
local('Fira Sans'),
22+
url('../fonts/FiraSans/firasansot-regular-webfont.woff') format('woff'),
23+
url('../fonts/FiraSans/firasansot-regular-webfont.ttf') format('truetype'),
24+
url('../fonts/FiraSans/firasansot-regular-webfont.svg#fira_sans_otregular') format('svg');
25+
font-family: 'Fira Sans';
1526
font-weight: 400;
16-
font-style: normal;
1727
}
1828

1929
@font-face {
20-
font-family: 'FeuraSansWeb';
21-
src: url('../fonts/FeuraSans/FeuraSansWeb-Medium.woff') format('woff'),
22-
url('../fonts/FeuraSans/FeuraSansWeb-Medium.svg#FeuraSansWebMedium') format('svg');
30+
src: local('Fira Sans OT Medium Regular'),
31+
local('Fira Sans Medium Regular'),
32+
local('Fira Sans OT Medium'),
33+
local('Fira Sans Medium'),
34+
local('Fira Sans OT'),
35+
local('Fira Sans'),
36+
url('../fonts/FiraSans/firasansot-medium-webfont.woff') format('woff'),
37+
url('../fonts/FiraSans/firasansot-medium-webfont.ttf') format('truetype'),
38+
url('../fonts/FiraSans/firasansot-medium-webfont.svg#fira_sans_otregular') format('svg');
39+
font-family: 'Fira Sans';
2340
font-weight: 500;
24-
font-style: normal;
2541
}
2642

2743
@font-face {
28-
font-family: 'FeuraSansWeb';
29-
src: url('../fonts/FeuraSans/FeuraSansWeb-Bold.woff') format('woff'),
30-
url('../fonts/FeuraSans/FeuraSansWeb-Bold.svg#FeuraSansWebBold') format('svg');
44+
src: local('Fira Sans OT Bold'),
45+
local('Fira Sans Bold'),
46+
local('Fira Sans OT'),
47+
local('Fira Sans'),
48+
url('../fonts/FiraSans/firasansot-bold-webfont.woff') format('woff'),
49+
url('../fonts/FiraSans/firasansot-bold-webfont.ttf') format('truetype'),
50+
url('../fonts/FiraSans/firasansot-bold-webfont.svg#fira_sans_otbold') format('svg');
51+
font-family: 'Fira Sans';
3152
font-weight: 600;
32-
font-style: normal;
3353
}
3454

3555
body {
Binary file not shown.

hearth/media/fonts/FiraSans/firasansot-bold-webfont.svg

Lines changed: 953 additions & 0 deletions
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.

hearth/media/fonts/FiraSans/firasansot-bolditalic-webfont.svg

Lines changed: 942 additions & 0 deletions
Loading
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)