diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2020-09-01 18:24:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 18:24:31 -0700 |
| commit | 9a055826f97ec15c0cc7743b7dfe6b6b215aeb1e (patch) | |
| tree | 12dc03a19dee695ddde6db3c8f629878a66f0c64 | |
| parent | 34c8b7a92cd2ced1b4aee960a84f69f6b3a56bb6 (diff) | |
| parent | c86d249e94ae45fff1c882c98d85aaf49133f0b6 (diff) | |
| download | rust-9a055826f97ec15c0cc7743b7dfe6b6b215aeb1e.tar.gz rust-9a055826f97ec15c0cc7743b7dfe6b6b215aeb1e.zip | |
Rollup merge of #76126 - camelid:crate-list-font, r=GuillaumeGomez
Use "Fira Sans" for crate list font Fira Sans is what's used for module lists and other item lists. Previously, the default body font, "Source Serif Pro", was used for crate lists, which didn't visually match other item lists. @rustbot modify labels: T-rustdoc
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 5 | ||||
| -rw-r--r-- | src/librustdoc/html/static/themes/ayu.css | 3 | ||||
| -rw-r--r-- | src/test/rustdoc/index-page.rs | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 470e9d5ae76..e4aba8963c7 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1062,12 +1062,13 @@ themePicker.onblur = handleThemeButtonsBlur; let content = format!( "<h1 class='fqn'>\ <span class='in-band'>List of all crates</span>\ - </h1><ul class='mod'>{}</ul>", + </h1>\ + <ul class='crate mod'>{}</ul>", krates .iter() .map(|s| { format!( - "<li><a class=\"mod\" href=\"{}index.html\">{}</a></li>", + "<li><a class=\"crate mod\" href=\"{}index.html\">{}</a></li>", ensure_trailing_slash(s), s ) diff --git a/src/librustdoc/html/static/themes/ayu.css b/src/librustdoc/html/static/themes/ayu.css index f910bfffc22..b4571018270 100644 --- a/src/librustdoc/html/static/themes/ayu.css +++ b/src/librustdoc/html/static/themes/ayu.css @@ -178,6 +178,9 @@ pre { .content span.externcrate, .content span.mod, .content a.mod { color: #acccf9; } +.content ul.crate a.crate { + font: 16px/1.6 "Fira Sans"; +} .content span.struct, .content a.struct { color: #ffa0a5; } diff --git a/src/test/rustdoc/index-page.rs b/src/test/rustdoc/index-page.rs index f0476f083b8..be668a1276a 100644 --- a/src/test/rustdoc/index-page.rs +++ b/src/test/rustdoc/index-page.rs @@ -6,6 +6,6 @@ // @has foo/../index.html // @has - '//span[@class="in-band"]' 'List of all crates' -// @has - '//ul[@class="mod"]//a[@href="foo/index.html"]' 'foo' -// @has - '//ul[@class="mod"]//a[@href="all_item_types/index.html"]' 'all_item_types' +// @has - '//ul[@class="crate mod"]//a[@href="foo/index.html"]' 'foo' +// @has - '//ul[@class="crate mod"]//a[@href="all_item_types/index.html"]' 'all_item_types' pub struct Foo; |