Skip to content

Commit 4d5f4ff

Browse files
committed
webfonts: proper fix
1 parent bfe4ddf commit 4d5f4ff

8 files changed

+19
-18
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
99
src/rt/msvc/* -whitespace
1010
src/rt/valgrind/* -whitespace
11+
*.woff binary

src/doc/rust.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
2424
}
2525
@font-face {
26-
font-family: 'Heuristica';
26+
font-family: 'Source Serif Pro';
2727
font-style: normal;
2828
font-weight: 400;
29-
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
29+
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
3030
}
3131
@font-face {
32-
font-family: 'Heuristica';
32+
font-family: 'Source Serif Pro';
3333
font-style: italic;
3434
font-weight: 400;
35-
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
35+
src: url("Heuristica-Italic.woff") format('woff');
3636
}
3737
@font-face {
38-
font-family: 'Heuristica';
38+
font-family: 'Source Serif Pro';
3939
font-style: normal;
4040
font-weight: 700;
41-
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
41+
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
4242
}
4343

4444
*:not(body) {
@@ -52,7 +52,7 @@
5252
body {
5353
margin: 0 auto;
5454
padding: 0 15px;
55-
font-family: "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif;
55+
font-family: "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
5656
font-size: 18px;
5757
color: #333;
5858
line-height: 1.428571429;

src/librustdoc/html/render.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -478,12 +478,12 @@ fn write_shared(cx: &Context,
478478
include_bin!("static/FiraSans-Regular.woff")));
479479
try!(write(cx.dst.join("FiraSans-Medium.woff"),
480480
include_bin!("static/FiraSans-Medium.woff")));
481-
try!(write(cx.dst.join("Heuristica-Regular.woff"),
482-
include_bin!("static/Heuristica-Regular.woff")));
481+
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
482+
include_bin!("static/SourceSerifPro-Bold.woff")));
483483
try!(write(cx.dst.join("Heuristica-Italic.woff"),
484484
include_bin!("static/Heuristica-Italic.woff")));
485-
try!(write(cx.dst.join("Heuristica-Bold.woff"),
486-
include_bin!("static/Heuristica-Bold.woff")));
485+
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
486+
include_bin!("static/SourceSerifPro-Bold.woff")));
487487

488488
fn collect(path: &Path, krate: &str,
489489
key: &str) -> io::IoResult<Vec<String>> {
-120 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/librustdoc/html/static/main.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
2323
}
2424
@font-face {
25-
font-family: 'Heuristica';
25+
font-family: 'Source Serif Pro';
2626
font-style: normal;
2727
font-weight: 400;
28-
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
28+
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
2929
}
3030
@font-face {
31-
font-family: 'Heuristica';
31+
font-family: 'Source Serif Pro';
3232
font-style: italic;
3333
font-weight: 400;
34-
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
34+
src: url("Heuristica-Italic.woff") format('woff');
3535
}
3636
@font-face {
37-
font-family: 'Heuristica';
37+
font-family: 'Source Serif Pro';
3838
font-style: normal;
3939
font-weight: 700;
40-
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
40+
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
4141
}
4242

4343
@import "normalize.css";
@@ -53,7 +53,7 @@
5353
body {
5454
color: #333;
5555
min-width: 500px;
56-
font: 15.5px/1.4 "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif;
56+
font: 16px/1.4 "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
5757
margin: 0;
5858
position: relative;
5959
padding: 10px 15px 20px 15px;

0 commit comments

Comments
 (0)