Skip to content

Commit 599e8a7

Browse files
authored
Rollup merge of #86503 - ehuss:rustc.css-fonts, r=jyn514,GuillaumeGomez
Fix rust.css fonts. The `rust.css` file (used for all non-rustdoc and non-mdbook pages) has gotten out of sync with rustdoc's css. The two share the same fonts, so this updates them to match what rustdoc uses. It would be ideal not to need this at all, but that's for another time.
2 parents 2fdc2ea + 008d4d6 commit 599e8a7

File tree

1 file changed

+33
-10
lines changed

1 file changed

+33
-10
lines changed

src/doc/rust.css

+33-10
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,68 @@
1+
/* See FiraSans-LICENSE.txt for the Fira Sans license. */
12
@font-face {
23
font-family: 'Fira Sans';
34
font-style: normal;
45
font-weight: 400;
5-
src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
6+
src: local('Fira Sans'),
7+
url("FiraSans-Regular.woff2") format("woff2"),
8+
url("FiraSans-Regular.woff") format('woff');
69
font-display: swap;
710
}
811
@font-face {
912
font-family: 'Fira Sans';
1013
font-style: normal;
1114
font-weight: 500;
12-
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
15+
src: local('Fira Sans Medium'),
16+
url("FiraSans-Medium.woff2") format("woff2"),
17+
url("FiraSans-Medium.woff") format('woff');
1318
font-display: swap;
1419
}
20+
21+
/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
1522
@font-face {
16-
font-family: 'Source Serif Pro';
23+
font-family: 'Source Serif 4';
1724
font-style: normal;
1825
font-weight: 400;
19-
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
26+
src: local('Source Serif 4'), url("SourceSerif4-Regular.ttf.woff") format('woff');
2027
font-display: swap;
2128
}
2229
@font-face {
23-
font-family: 'Source Serif Pro';
30+
font-family: 'Source Serif 4';
2431
font-style: italic;
2532
font-weight: 400;
26-
src: url("SourceSerifPro-It.ttf.woff") format('woff');
33+
src: local('Source Serif 4 Italic'), url("SourceSerif4-It.ttf.woff") format('woff');
2734
font-display: swap;
2835
}
2936
@font-face {
30-
font-family: 'Source Serif Pro';
37+
font-family: 'Source Serif 4';
3138
font-style: normal;
3239
font-weight: 700;
33-
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
40+
src: local('Source Serif 4 Bold'), url("SourceSerif4-Bold.ttf.woff") format('woff');
3441
font-display: swap;
3542
}
43+
44+
/* See SourceCodePro-LICENSE.txt for the Source Code Pro license. */
3645
@font-face {
3746
font-family: 'Source Code Pro';
3847
font-style: normal;
3948
font-weight: 400;
4049
/* Avoid using locally installed font because bad versions are in circulation:
4150
* see https://github.com/rust-lang/rust/issues/24355 */
42-
src: url("SourceCodePro-Regular.woff") format('woff');
51+
src: url("SourceCodePro-Regular.ttf.woff") format('woff');
52+
font-display: swap;
53+
}
54+
@font-face {
55+
font-family: 'Source Code Pro';
56+
font-style: italic;
57+
font-weight: 400;
58+
src: url("SourceCodePro-It.ttf.woff") format('woff');
59+
font-display: swap;
60+
}
61+
@font-face {
62+
font-family: 'Source Code Pro';
63+
font-style: normal;
64+
font-weight: 600;
65+
src: url("SourceCodePro-Semibold.ttf.woff") format('woff');
4366
font-display: swap;
4467
}
4568

@@ -55,7 +78,7 @@ body {
5578
background-color: white;
5679
margin: 0 auto;
5780
padding: 0 15px;
58-
font-family: "Source Serif Pro", Georgia, Times, "Times New Roman", serif;
81+
font-family: "Source Serif 4", Georgia, Times, "Times New Roman", serif;
5982
font-size: 18px;
6083
color: #333;
6184
line-height: 1.428571429;

0 commit comments

Comments
 (0)