Skip to content

Commit 2bc3cd8

Browse files
Use sans-serif font for doc text
1 parent c1cfab2 commit 2bc3cd8

File tree

4 files changed

+2
-56
lines changed

4 files changed

+2
-56
lines changed

src/librustdoc/build.rs

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ fn main() {
2020
"static/fonts/FiraSans-Regular.woff2",
2121
"static/fonts/FiraSans-Medium.woff2",
2222
"static/fonts/FiraSans-LICENSE.txt",
23-
"static/fonts/SourceSerif4-Regular.ttf.woff2",
24-
"static/fonts/SourceSerif4-Bold.ttf.woff2",
25-
"static/fonts/SourceSerif4-It.ttf.woff2",
26-
"static/fonts/SourceSerif4-LICENSE.md",
2723
"static/fonts/SourceCodePro-Regular.ttf.woff2",
2824
"static/fonts/SourceCodePro-Semibold.ttf.woff2",
2925
"static/fonts/SourceCodePro-It.ttf.woff2",

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

+1-47
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,6 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
5656
font-display: swap;
5757
}
5858

59-
/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
60-
@font-face {
61-
font-family: 'Source Serif 4';
62-
font-style: normal;
63-
font-weight: 400;
64-
src: local('Source Serif 4'),
65-
url("SourceSerif4-Regular-6b053e98.ttf.woff2") format("woff2");
66-
font-display: swap;
67-
}
68-
@font-face {
69-
font-family: 'Source Serif 4';
70-
font-style: italic;
71-
font-weight: 400;
72-
src: local('Source Serif 4 Italic'),
73-
url("SourceSerif4-It-ca3b17ed.ttf.woff2") format("woff2");
74-
font-display: swap;
75-
}
76-
@font-face {
77-
font-family: 'Source Serif 4';
78-
font-style: normal;
79-
font-weight: 700;
80-
src: local('Source Serif 4 Bold'),
81-
url("SourceSerif4-Bold-6d4fd4c0.ttf.woff2") format("woff2");
82-
font-display: swap;
83-
}
84-
8559
/* See SourceCodePro-LICENSE.txt for the Source Code Pro license. */
8660
@font-face {
8761
font-family: 'Source Code Pro';
@@ -124,7 +98,7 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
12498
body {
12599
/* Line spacing at least 1.5 per Web Content Accessibility Guidelines
126100
https://www.w3.org/WAI/WCAG21/Understanding/visual-presentation.html */
127-
font: 1rem/1.5 "Source Serif 4", NanumBarunGothic, serif;
101+
font: 1rem/1.5 "Fira Sans", sans-serif;
128102
margin: 0;
129103
position: relative;
130104
/* We use overflow-wrap: break-word for Safari, which doesn't recognize
@@ -234,26 +208,6 @@ h4.code-header {
234208
margin: 0.6em 0;
235209
}
236210

237-
#crate-search,
238-
h1, h2, h3, h4, h5, h6,
239-
.sidebar,
240-
.mobile-topbar,
241-
.search-input,
242-
.search-results .result-name,
243-
.item-name > a,
244-
.out-of-band,
245-
.sub-heading,
246-
span.since,
247-
a.src,
248-
rustdoc-toolbar,
249-
summary.hideme,
250-
.scraped-example-list,
251-
.rustdoc-breadcrumbs,
252-
/* This selector is for the items listed in the "all items" page. */
253-
ul.all-items {
254-
font-family: "Fira Sans", Arial, NanumBarunGothic, sans-serif;
255-
}
256-
257211
#toggle-all-docs,
258212
a.anchor,
259213
.section-header a,

src/librustdoc/html/static_files.rs

-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ static_files! {
101101
fira_sans_regular => "static/fonts/FiraSans-Regular.woff2",
102102
fira_sans_medium => "static/fonts/FiraSans-Medium.woff2",
103103
fira_sans_license => "static/fonts/FiraSans-LICENSE.txt",
104-
source_serif_4_regular => "static/fonts/SourceSerif4-Regular.ttf.woff2",
105-
source_serif_4_bold => "static/fonts/SourceSerif4-Bold.ttf.woff2",
106-
source_serif_4_italic => "static/fonts/SourceSerif4-It.ttf.woff2",
107-
source_serif_4_license => "static/fonts/SourceSerif4-LICENSE.md",
108104
source_code_pro_regular => "static/fonts/SourceCodePro-Regular.ttf.woff2",
109105
source_code_pro_semibold => "static/fonts/SourceCodePro-Semibold.ttf.woff2",
110106
source_code_pro_italic => "static/fonts/SourceCodePro-It.ttf.woff2",

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.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("")) {# #}
1111
</script> {# #}
1212
<link rel="stylesheet" {#+ #}
1313
href="{{static_root_path|safe}}{{files.normalize_css}}"> {# #}

0 commit comments

Comments
 (0)