diff options
| author | bors <bors@rust-lang.org> | 2021-04-05 11:06:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-05 11:06:20 +0000 |
| commit | 39eee173fbcc21462d255b364b87715cd33b62db (patch) | |
| tree | e930e86d52114de16148de08b917c974cb874669 /src/librustdoc/html/static/rustdoc.css | |
| parent | 58e71896506edb701f276158bd2f47e8788a1133 (diff) | |
| parent | 3ca197e89c9affc76e79f0421e1bb9d65a8ec855 (diff) | |
| download | rust-39eee173fbcc21462d255b364b87715cd33b62db.tar.gz rust-39eee173fbcc21462d255b364b87715cd33b62db.zip | |
Auto merge of #83880 - Dylan-DPC:rollup-hz9ph0e, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #81922 (Let `#[allow(unstable_name_collisions)]` work for things other than function) - #82483 (Use FromStr trait for number option parsing) - #82739 (Use the beta compiler for building bootstrap tools when `download-rustc` is set) - #83650 (Update Source Serif to release 4.004) - #83826 (List trait impls before deref methods in doc's sidebar) - #83831 (Add `#[inline]` to IpAddr methods) - #83863 (Render destructured struct function param names as underscore) - #83865 (Don't report disambiguator error if link would have been ignored) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/static/rustdoc.css')
| -rw-r--r-- | src/librustdoc/html/static/rustdoc.css | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index f3ddd8ec6fa..585b7459bd7 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -18,26 +18,26 @@ font-display: swap; } -/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */ +/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */ @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Serif 4'; font-style: normal; font-weight: 400; - src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff'); + src: local('Source Serif 4'), url("SourceSerif4-Regular.ttf.woff") format('woff'); font-display: swap; } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Serif 4'; font-style: italic; font-weight: 400; - src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff'); + src: local('Source Serif 4 Italic'), url("SourceSerif4-It.ttf.woff") format('woff'); font-display: swap; } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Serif 4'; font-style: normal; font-weight: 700; - src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff'); + src: local('Source Serif 4 Bold'), url("SourceSerif4-Bold.ttf.woff") format('woff'); font-display: swap; } @@ -90,7 +90,7 @@ html { /* General structure and fonts */ body { - font: 16px/1.4 "Source Serif Pro", serif; + font: 16px/1.4 "Source Serif 4", serif; margin: 0; position: relative; padding: 10px 15px 20px 15px; |
