Skip to content

Commit 4994a5c

Browse files
Add new setting allowing to switch to sans serif fonts
1 parent caa8172 commit 4994a5c

File tree

7 files changed

+43
-2
lines changed

7 files changed

+43
-2
lines changed

Diff for: src/librustdoc/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ fn main() {
1919
"static/images/favicon-32x32.png",
2020
"static/fonts/FiraSans-Regular.woff2",
2121
"static/fonts/FiraSans-Medium.woff2",
22+
"static/fonts/FiraMono-Regular.woff2",
23+
"static/fonts/FiraMono-Medium.woff2",
2224
"static/fonts/FiraSans-LICENSE.txt",
2325
"static/fonts/SourceSerif4-Regular.ttf.woff2",
2426
"static/fonts/SourceSerif4-Bold.ttf.woff2",

Diff for: src/librustdoc/html/static/css/rustdoc.css

+25-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
3838
--code-block-border-radius: 6px;
3939
--impl-items-indent: 0.3em;
4040
--docblock-indent: 24px;
41+
--font-family: "Source Serif 4", NanumBarunGothic, serif;
42+
--font-family-code: "Source Code Pro", monospace;
43+
}
44+
45+
:root.sans-serif {
46+
--font-family: "Fira Sans", sans-serif;
47+
--font-family-code: "Fira Mono", monospace;
4148
}
4249

4350
/* See FiraSans-LICENSE.txt for the Fira Sans license. */
@@ -57,6 +64,22 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
5764
url("FiraSans-Medium-e1aa3f0a.woff2") format("woff2");
5865
font-display: swap;
5966
}
67+
@font-face {
68+
font-family: 'Fira Mono';
69+
font-style: normal;
70+
font-weight: 400;
71+
src: local('Fira Mono'),
72+
url("FiraMono-Regular-87c26294.woff2") format("woff2");
73+
font-display: swap;
74+
}
75+
@font-face {
76+
font-family: 'Fira Mono';
77+
font-style: normal;
78+
font-weight: 500;
79+
src: local('Fira Mono Medium'),
80+
url("FiraMono-Medium-86f75c8c.woff2") format("woff2");
81+
font-display: swap;
82+
}
6083

6184
/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
6285
@font-face {
@@ -126,7 +149,7 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
126149
body {
127150
/* Line spacing at least 1.5 per Web Content Accessibility Guidelines
128151
https://www.w3.org/WAI/WCAG21/Understanding/visual-presentation.html */
129-
font: 1rem/1.5 "Source Serif 4", NanumBarunGothic, serif;
152+
font: 1rem/1.5 var(--font-family);
130153
margin: 0;
131154
position: relative;
132155
/* We use overflow-wrap: break-word for Safari, which doesn't recognize
@@ -383,7 +406,7 @@ details:not(.toggle) summary {
383406
}
384407

385408
code, pre, .code-header, .type-signature {
386-
font-family: "Source Code Pro", monospace;
409+
font-family: var(--font-family-code)
387410
}
388411
.docblock code, .docblock-short code {
389412
border-radius: 3px;
63.1 KB
Binary file not shown.
63.3 KB
Binary file not shown.

Diff for: src/librustdoc/html/static/js/settings.js

+11
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
removeClass(document.documentElement, "hide-modnav");
5151
}
5252
break;
53+
case "sans-serif-fonts":
54+
if (value === true) {
55+
addClass(document.documentElement, "sans-serif");
56+
} else {
57+
removeClass(document.documentElement, "sans-serif");
58+
}
5359
}
5460
}
5561

@@ -232,6 +238,11 @@
232238
"js_name": "disable-shortcuts",
233239
"default": false,
234240
},
241+
{
242+
"name": "Use sans serif fonts",
243+
"js_name": "sans-serif-fonts",
244+
"default": false,
245+
},
235246
];
236247

237248
// Then we build the DOM.

Diff for: src/librustdoc/html/static/js/storage.js

+3
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ if (getSettingValue("hide-toc") === "true") {
211211
if (getSettingValue("hide-modnav") === "true") {
212212
addClass(document.documentElement, "hide-modnav");
213213
}
214+
if (getSettingValue("sans-serif-fonts") === "true") {
215+
addClass(document.documentElement, "sans-serif");
216+
}
214217
function updateSidebarWidth() {
215218
const desktopSidebarWidth = getSettingValue("desktop-sidebar-width");
216219
if (desktopSidebarWidth && desktopSidebarWidth !== "null") {

Diff for: src/librustdoc/html/static_files.rs

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ static_files! {
100100
rust_favicon_png_32 => "static/images/favicon-32x32.png",
101101
fira_sans_regular => "static/fonts/FiraSans-Regular.woff2",
102102
fira_sans_medium => "static/fonts/FiraSans-Medium.woff2",
103+
fira_mono_regular => "static/fonts/FiraMono-Regular.woff2",
104+
fira_mono_medium => "static/fonts/FiraMono-Medium.woff2",
103105
fira_sans_license => "static/fonts/FiraSans-LICENSE.txt",
104106
source_serif_4_regular => "static/fonts/SourceSerif4-Regular.ttf.woff2",
105107
source_serif_4_bold => "static/fonts/SourceSerif4-Bold.ttf.woff2",

0 commit comments

Comments
 (0)