Skip to content

Commit 1b6d0cf

Browse files
Add italic for newly added sans serif fonts
1 parent 68055e5 commit 1b6d0cf

File tree

7 files changed

+26
-6
lines changed

7 files changed

+26
-6
lines changed

license-metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@
115115
"files": [
116116
"FiraMono-Medium.woff2",
117117
"FiraMono-Regular.woff2",
118+
"FiraSans-Italic.woff2",
118119
"FiraSans-LICENSE.txt",
119120
"FiraSans-Medium.woff2",
120-
"FiraSans-Regular.woff2",
121-
"FiraMono-Medium.woff2",
122-
"FiraMono-Regular.woff2"
121+
"FiraSans-MediumItalic.woff2",
122+
"FiraSans-Regular.woff2"
123123
],
124124
"license": {
125125
"copyright": [

src/librustdoc/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ fn main() {
1717
"static/images/rust-logo.svg",
1818
"static/images/favicon.svg",
1919
"static/images/favicon-32x32.png",
20+
"static/fonts/FiraSans-Italic.woff2",
2021
"static/fonts/FiraSans-Regular.woff2",
2122
"static/fonts/FiraSans-Medium.woff2",
23+
"static/fonts/FiraSans-MediumItalic.woff2",
2224
"static/fonts/FiraMono-Regular.woff2",
2325
"static/fonts/FiraMono-Medium.woff2",
2426
"static/fonts/FiraSans-LICENSE.txt",

src/librustdoc/html/static/css/rustdoc.css

+18-2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
5656
url("FiraSans-Regular-0fe48ade.woff2") format("woff2");
5757
font-display: swap;
5858
}
59+
@font-face {
60+
font-family: 'Fira Sans';
61+
font-style: italic;
62+
font-weight: 400;
63+
src: local('Fira Sans Italic'),
64+
url("FiraSans-Italic-81dc35de.woff2") format("woff2");
65+
font-display: swap;
66+
}
5967
@font-face {
6068
font-family: 'Fira Sans';
6169
font-style: normal;
@@ -64,6 +72,14 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
6472
url("FiraSans-Medium-e1aa3f0a.woff2") format("woff2");
6573
font-display: swap;
6674
}
75+
@font-face {
76+
font-family: 'Fira Sans';
77+
font-style: normal;
78+
font-weight: 500;
79+
src: local('Fira Sans Medium Italic'),
80+
url("FiraSans-MediumItalic-ccf7e434.woff2") format("woff2");
81+
font-display: swap;
82+
}
6783
@font-face {
6884
font-family: 'Fira Mono';
6985
font-style: normal;
@@ -276,7 +292,7 @@ summary.hideme,
276292
.rustdoc-breadcrumbs,
277293
/* This selector is for the items listed in the "all items" page. */
278294
ul.all-items {
279-
font-family: "Fira Sans", Arial, NanumBarunGothic, sans-serif;
295+
font-family: var(--font-family);
280296
}
281297

282298
#toggle-all-docs,
@@ -406,7 +422,7 @@ details:not(.toggle) summary {
406422
}
407423

408424
code, pre, .code-header, .type-signature {
409-
font-family: var(--font-family-code)
425+
font-family: var(--font-family-code);
410426
}
411427
.docblock code, .docblock-short code {
412428
border-radius: 3px;
Binary file not shown.
Binary file not shown.

src/librustdoc/html/static_files.rs

+2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,10 @@ static_files! {
9898
rust_logo_svg => "static/images/rust-logo.svg",
9999
rust_favicon_svg => "static/images/favicon.svg",
100100
rust_favicon_png_32 => "static/images/favicon-32x32.png",
101+
fira_sans_italic => "static/fonts/FiraSans-Italic.woff2",
101102
fira_sans_regular => "static/fonts/FiraSans-Regular.woff2",
102103
fira_sans_medium => "static/fonts/FiraSans-Medium.woff2",
104+
fira_sans_medium_italic => "static/fonts/FiraSans-MediumItalic.woff2",
103105
fira_mono_regular => "static/fonts/FiraMono-Regular.woff2",
104106
fira_mono_medium => "static/fonts/FiraMono-Medium.woff2",
105107
fira_sans_license => "static/fonts/FiraSans-LICENSE.txt",

src/librustdoc/html/templates/page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="description" content="{{page.description}}"> {# #}
88
<title>{{page.title}}</title> {# #}
99
<script>if(window.location.protocol!=="file:") {# Hack to skip preloading fonts locally - see #98769 #}
10-
document.head.insertAdjacentHTML("beforeend","{{files.source_serif_4_regular}},{{files.fira_sans_regular}},{{files.fira_sans_medium}},{{files.source_code_pro_regular}},{{files.source_code_pro_semibold}}".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="{{static_root_path|safe}}${f}">`).join("")) {# #}
10+
document.head.insertAdjacentHTML("beforeend","{{files.source_serif_4_regular}},{{files.fira_sans_italic}},{{files.fira_sans_regular}},{{files.fira_sans_medium_italic}},{{files.fira_sans_medium}},{{files.source_code_pro_regular}},{{files.source_code_pro_semibold}}".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="{{static_root_path|safe}}${f}">`).join("")) {# #}
1111
</script> {# #}
1212
<link rel="stylesheet" {#+ #}
1313
href="{{static_root_path|safe}}{{files.normalize_css}}"> {# #}

0 commit comments

Comments
 (0)