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

Fix rust.css fonts. #86503

Merged
merged 1 commit into from
Jun 21, 2021
Merged

Fix rust.css fonts. #86503

merged 1 commit into from
Jun 21, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 21, 2021

The rust.css file (used for all non-rustdoc and non-mdbook pages) has gotten out of sync with rustdoc's css. The two share the same fonts, so this updates them to match what rustdoc uses.

It would be ideal not to need this at all, but that's for another time.

@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 Jun 21, 2021
@jyn514
Copy link
Member

jyn514 commented Jun 21, 2021

It would be ideal not to need this at all, but that's for another time.

Is there any reason not to make the change here?

@jyn514 jyn514 added the A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools label Jun 21, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Jun 21, 2021

I'm not sure exactly what you mean, can you say more about what you are thinking? How to fix this hasn't been decided, and would likely be a large amount of work (should error_index_generator be built into rustdoc? use mdbook? use something else?). And all the other pages would need to be adapted to something else as well (probably just drop the use of custom fonts, those pages are rarely seen).

Alternatively, it could just drop the use of custom fonts altogether, but again that's a bit more work to bikeshed exactly what to use, and deal with the fallout from that (rendering issues, font size changes, etc.).

@jyn514
Copy link
Member

jyn514 commented Jun 21, 2021

I think I was confused, I was under the impression rust.css and rustdoc.css were basically the same and we could just plug in rustdoc.css wherever rust.css is used. If that's not the case I agree this makes sense to land first.

@ehuss
Copy link
Contributor Author

ehuss commented Jun 21, 2021

Ah, yea, that is also an option. rust.css has a bunch of custom rules, so it would still need to be kept around, but the pages could load both rustdoc.css and then rust.css (and let rustdoc.css handle the fonts). That's a bit more work than I want to put in right now, though.

@GuillaumeGomez
Copy link
Member

Yes that's what I said on zulip: for whatever reasons we decided to split both but since then, rust.css got completely out of sync. So what should we do here? Merge this directly and send another PR or directly make the good change?

@jyn514
Copy link
Member

jyn514 commented Jun 21, 2021

@GuillaumeGomez I think we should merge this for now and we can always do a more broad fix later

@GuillaumeGomez
Copy link
Member

Fine by me. I'll open an issue too.

Thanks @ehuss!

@bors: r=jyn514,GuillaumeGomez rollup

@bors
Copy link
Contributor

bors commented Jun 21, 2021

📌 Commit 008d4d6 has been approved by jyn514,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 Jun 21, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2021
Rollup of 9 pull requests

Successful merges:

 - rust-lang#86192 (Make OR_PATTERNS_BACK_COMPAT be a 2021 future-incompatible lint)
 - rust-lang#86248 (Add a regression test for issue-85113)
 - rust-lang#86274 (Spaces)
 - rust-lang#86349 (Add regression test for issue rust-lang#78632)
 - rust-lang#86424 (rustfmt: load nested out-of-line mods correctly)
 - rust-lang#86472 (Fix CI to fetch master on beta channel)
 - rust-lang#86473 (Rustdoc: Account for const-unstable functions)
 - rust-lang#86495 (Improve `proc_macro::{Punct, Spacing}` documentation)
 - rust-lang#86503 (Fix rust.css fonts.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 599e8a7 into rust-lang:master Jun 21, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants