mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #76126 - camelid:crate-list-font, r=GuillaumeGomez

Browse Source 
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
This commit is contained in:
Tyler Mandry 2020-09-01 18:24:31 -07:00 committed by GitHub
commit 9a055826f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustdoc/html/render/mod.rs
View File

@ -1062,12 +1062,13 @@ fn to_json_string(&self) -> String {
let content = format!( let content = format!(
"<h1 class='fqn'>\ "<h1 class='fqn'>\
<span class='in-band'>List of all crates</span>\ <span class='in-band'>List of all crates</span>\
</h1><ul class='mod'>{}</ul>", </h1>\
<ul class='crate mod'>{}</ul>",
krates krates
.iter() .iter()
.map(|s| { .map(|s| {
format!( format!(
"<li><a class=\"mod\" href=\"{}index.html\">{}</a></li>", "<li><a class=\"crate mod\" href=\"{}index.html\">{}</a></li>",
ensure_trailing_slash(s), ensure_trailing_slash(s),
s s
) )

3
src/librustdoc/html/static/themes/ayu.css
View File

@ -178,6 +178,9 @@ pre {
.content span.externcrate, .content span.mod, .content a.mod { .content span.externcrate, .content span.mod, .content a.mod {
color: #acccf9; color: #acccf9;
} }
.content ul.crate a.crate {
font: 16px/1.6 "Fira Sans";
}
.content span.struct, .content a.struct { .content span.struct, .content a.struct {
color: #ffa0a5; color: #ffa0a5;
} }

4
src/test/rustdoc/index-page.rs
View File

@ -6,6 +6,6 @@
// @has foo/../index.html // @has foo/../index.html
// @has - '//span[@class="in-band"]' 'List of all crates' // @has - '//span[@class="in-band"]' 'List of all crates'
// @has - '//ul[@class="mod"]//a[@href="foo/index.html"]' 'foo' // @has - '//ul[@class="crate 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="all_item_types/index.html"]' 'all_item_types'
pub struct Foo; pub struct Foo;