Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use "Fira Sans" for crate list font #76126

Merged
merged 1 commit into from
Sep 2, 2020
Merged

Conversation

camelid
Copy link
Member

@camelid camelid commented Aug 30, 2020

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

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 30, 2020
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

Some changes occurred in HTML/CSS themes.

cc @GuillaumeGomez

A change occurred in the Ayu theme.

cc @Cldfire

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2020
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Aug 30, 2020

Screenshots before/after please. :)

@camelid
Copy link
Member Author

camelid commented Aug 30, 2020

Sorry about that, I meant to :)

My docs build still isn't working (it had been going for 2 hours on my desktop so I stopped it), so I had to manually edit the styles in Firefox which means this might not be exactly the output:

Before

image

After

image

@bors
Copy link
Contributor

bors commented Sep 1, 2020

☔ The latest upstream changes (presumably #76186) made this pull request unmergeable. Please resolve the merge conflicts.

@camelid
Copy link
Member Author

camelid commented Sep 1, 2020

Rebased.

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.
@camelid
Copy link
Member Author

camelid commented Sep 1, 2020

CI is passing now (had to fix some CSS formatting, update a test, etc.).

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Sep 1, 2020

📌 Commit c86d249 has been approved by GuillaumeGomez

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 1, 2020
@camelid
Copy link
Member Author

camelid commented Sep 1, 2020

I just saw in my email bors's message saying that there are merge conflicts, and for a second I thought "Oh no, not more merge conflicts!" before I realized that it was old ;)

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 2, 2020
Rollup of 14 pull requests

Successful merges:

 - rust-lang#74880 (Add trailing comma support to matches macro)
 - rust-lang#76074 (Add new `-Z dump-mir-spanview` option)
 - rust-lang#76088 (Add more examples to lexicographic cmp on Iterators.)
 - rust-lang#76099 (Add info about `!` and `impl Trait`)
 - rust-lang#76126 (Use "Fira Sans" for crate list font)
 - rust-lang#76132 (Factor out StmtKind::MacCall fields into `MacCallStmt` struct)
 - rust-lang#76143 (Give a better error message for duplicate built-in macros)
 - rust-lang#76158 (Stabilise link-self-contained option)
 - rust-lang#76201 (Move to intra-doc links for library/core/src/panic.rs)
 - rust-lang#76206 (Make all methods of `std::net::Ipv6Addr` const)
 - rust-lang#76207 (# Move to intra-doc links for library/core/src/clone.rs)
 - rust-lang#76212 (Document lint missing_doc_code_examples is nightly-only)
 - rust-lang#76218 (lexer: Tiny improvement to shebang detection)
 - rust-lang#76221 (Clean up header in `iter` docs for `for` loops)

Failed merges:

r? @ghost
@bors bors merged commit 9a05582 into rust-lang:master Sep 2, 2020
@camelid camelid deleted the crate-list-font branch September 2, 2020 03:32
camelid added a commit to camelid/rust that referenced this pull request Sep 7, 2020
I had put it in the wrong file in rust-lang#76126. This should fix it now. Thank
you to @ollie27 for pointing this out!
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 9, 2020
…meGomez,ollie27

rustdoc: Fix font CSS for crate lists

I had put it in the wrong file in rust-lang#76126. This should fix it now. Thank
you to `@ollie27` for pointing this out!

---

`@rustbot` modify labels: T-rustdoc C-bug
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants