Skip to content

Commit 282d866

Browse files
authored
Rollup merge of #133636 - GuillaumeGomez:sans-serif, r=rustdoc
[rustdoc] Add sans-serif font setting Fixes #52449. This PR adds a new setting introducing the possibility to switch to a sans-serif font (`Fira Sans`) for the text. Can be tested [here](https://rustdoc.crud.net/imperio/sans-serif/std/index.html). cc ```@rust-lang/rustdoc-frontend``` r? ```@notriddle```
2 parents e6f12c8 + 2511faf commit 282d866

17 files changed

+117
-11
lines changed

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ SPDX-FileCopyrightText = "2015 Anders Kaseorg <andersk@mit.edu>"
9292
SPDX-License-Identifier = "MIT"
9393

9494
[[annotations]]
95-
path = "src/librustdoc/html/static/fonts/FiraSans**"
95+
path = "src/librustdoc/html/static/fonts/Fira**"
9696
precedence = "override"
9797
SPDX-FileCopyrightText = ["2014, Mozilla Foundation", "2014, Telefonica S.A."]
9898
SPDX-License-Identifier = "OFL-1.1"

license-metadata.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,12 @@
113113
{
114114
"directories": [],
115115
"files": [
116+
"FiraMono-Medium.woff2",
117+
"FiraMono-Regular.woff2",
118+
"FiraSans-Italic.woff2",
116119
"FiraSans-LICENSE.txt",
117120
"FiraSans-Medium.woff2",
121+
"FiraSans-MediumItalic.woff2",
118122
"FiraSans-Regular.woff2"
119123
],
120124
"license": {
@@ -266,4 +270,4 @@
266270
],
267271
"type": "root"
268272
}
269-
}
273+
}

src/librustdoc/build.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ 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",
24+
"static/fonts/FiraMono-Regular.woff2",
25+
"static/fonts/FiraMono-Medium.woff2",
2226
"static/fonts/FiraSans-LICENSE.txt",
2327
"static/fonts/SourceSerif4-Regular.ttf.woff2",
28+
"static/fonts/SourceSerif4-Semibold.ttf.woff2",
2429
"static/fonts/SourceSerif4-Bold.ttf.woff2",
2530
"static/fonts/SourceSerif4-It.ttf.woff2",
2631
"static/fonts/SourceSerif4-LICENSE.md",

src/librustdoc/html/static/COPYRIGHT.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ included, and carry their own copyright notices and license terms:
3636
See SourceCodePro-LICENSE.txt.
3737

3838
* Source Serif 4 (SourceSerif4-Regular.ttf.woff2, SourceSerif4-Bold.ttf.woff2,
39-
SourceSerif4-It.ttf.woff2):
39+
SourceSerif4-It.ttf.woff2, SourceSerif4-Semibold.ttf.woff2):
4040

4141
Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name
4242
'Source'. All Rights Reserved. Source is a trademark of Adobe in the United

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

Lines changed: 49 additions & 2 deletions
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. */
@@ -49,6 +56,14 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
4956
url("FiraSans-Regular-0fe48ade.woff2") format("woff2");
5057
font-display: swap;
5158
}
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+
}
5267
@font-face {
5368
font-family: 'Fira Sans';
5469
font-style: normal;
@@ -57,6 +72,30 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
5772
url("FiraSans-Medium-e1aa3f0a.woff2") format("woff2");
5873
font-display: swap;
5974
}
75+
@font-face {
76+
font-family: 'Fira Sans';
77+
font-style: italic;
78+
font-weight: 500;
79+
src: local('Fira Sans Medium Italic'),
80+
url("FiraSans-MediumItalic-ccf7e434.woff2") format("woff2");
81+
font-display: swap;
82+
}
83+
@font-face {
84+
font-family: 'Fira Mono';
85+
font-style: normal;
86+
font-weight: 400;
87+
src: local('Fira Mono'),
88+
url("FiraMono-Regular-87c26294.woff2") format("woff2");
89+
font-display: swap;
90+
}
91+
@font-face {
92+
font-family: 'Fira Mono';
93+
font-style: normal;
94+
font-weight: 500;
95+
src: local('Fira Mono Medium'),
96+
url("FiraMono-Medium-86f75c8c.woff2") format("woff2");
97+
font-display: swap;
98+
}
6099

61100
/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
62101
@font-face {
@@ -75,6 +114,14 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
75114
url("SourceSerif4-It-ca3b17ed.ttf.woff2") format("woff2");
76115
font-display: swap;
77116
}
117+
@font-face {
118+
font-family: 'Source Serif 4';
119+
font-style: normal;
120+
font-weight: 500;
121+
src: local('Source Serif 4 Semibold'),
122+
url("SourceSerif4-Semibold-457a13ac.ttf.woff2") format("woff2");
123+
font-display: swap;
124+
}
78125
@font-face {
79126
font-family: 'Source Serif 4';
80127
font-style: normal;
@@ -126,7 +173,7 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
126173
body {
127174
/* Line spacing at least 1.5 per Web Content Accessibility Guidelines
128175
https://www.w3.org/WAI/WCAG21/Understanding/visual-presentation.html */
129-
font: 1rem/1.5 "Source Serif 4", NanumBarunGothic, serif;
176+
font: 1rem/1.5 var(--font-family);
130177
margin: 0;
131178
position: relative;
132179
/* We use overflow-wrap: break-word for Safari, which doesn't recognize
@@ -380,7 +427,7 @@ details:not(.toggle) summary {
380427
}
381428

382429
code, pre, .code-header, .type-signature {
383-
font-family: "Source Code Pro", monospace;
430+
font-family: var(--font-family-code);
384431
}
385432
.docblock code, .item-table dd code {
386433
border-radius: 3px;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)