Skip to content

Use rustdoc.css for error index - #86663

Merged
bors merged 3 commits into
rust-lang:masterfrom
fee1-dead-contrib:use-rustdoc-css
Jul 5, 2021
Merged

Use rustdoc.css for error index#86663
bors merged 3 commits into
rust-lang:masterfrom
fee1-dead-contrib:use-rustdoc-css

Conversation

@fee1-dead

Copy link
Copy Markdown
Member

Closes #86512.

@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS themes.

cc @GuillaumeGomez

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

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 27, 2021
@ehuss

ehuss commented Jun 27, 2021

Copy link
Copy Markdown
Contributor

Note that rust.css is used for a bunch of other pages, and this breaks a lot of the formatting for them. The primary one is the main offline landing page, but it is used for a few others. Please check all the things in doc.rs that use it.

@fee1-dead
fee1-dead marked this pull request as draft June 27, 2021 14:10
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
GuillaumeGomez marked this pull request as ready for review June 28, 2021 11:51
@GuillaumeGomez

Copy link
Copy Markdown
Member

This looks good to me, thanks for this fix! I'd feel better though if the @rust-lang/infra team took a look to this PR to ensure something wasn't overlooked.

@GuillaumeGomez GuillaumeGomez added T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 28, 2021
@jyn514

jyn514 commented Jul 2, 2021

Copy link
Copy Markdown
Member

@GuillaumeGomez I don't understand why you pinged the infra team. They don't own the index page AFAIK, I'm not sure who does.

@ehuss you meant doc.rust-lang.org, right? @fee1-dead @GuillaumeGomez can one of you follow up on that? You can build all the docs locally with x.py doc --stage 1.

@GuillaumeGomez

Copy link
Copy Markdown
Member

Last time I proposed to change the style on the error index page, it was rejected. (I think we discussed about it with @pietroalbini but don't remember...)

I already checked it locally and it works so if there is no other thing to check, it can be r+ed.

@ehuss

ehuss commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

@ehuss you meant doc.rust-lang.org, right?

The link is to https://github.com/rust-lang/rust/blob/master/src/bootstrap/doc.rs, where the usage of rust.css is.

@emilyalbini

Copy link
Copy Markdown
Member

Last time I proposed to change the style on the error index page, it was rejected. (I think we discussed about it with @pietroalbini but don't remember...)

@GuillaumeGomez do you recall when or where? I don't remember anything about the index page.

@GuillaumeGomez

Copy link
Copy Markdown
Member

I don't remember at all and can't find the PR. Maybe I just dreamed all this...

Comment thread src/bootstrap/doc.rs
@jyn514

jyn514 commented Jul 5, 2021

Copy link
Copy Markdown
Member

@bors r=GuillaumeGomez

This is easy enough to revert if necessary and it seems worthwhile to not have to keep things in sync.

@bors

bors commented Jul 5, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 5072a47 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 Jul 5, 2021
@bors

bors commented Jul 5, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5072a47 with merge c54895b...

@bors

bors commented Jul 5, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing c54895b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2021
@bors
bors merged commit c54895b into rust-lang:master Jul 5, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 5, 2021
@fee1-dead
fee1-dead deleted the use-rustdoc-css branch August 16, 2021 11:57
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 18, 2022
…ark-Simulacrum

Don't add rustdoc's CSS to other doc pages

This was originally added so those doc pages could use the same font files, but it turns out to be fragile. And those doc pages are just stubs that link to other pages, so they don't need fancy fonts.

Before:

![Screenshot from 2022-09-16 16-45-44](https://user-images.githubusercontent.com/220205/190831650-b626ee66-046a-4b71-8e57-dd06872359db.png)

After:

![Screenshot from 2022-09-16 16-52-06](https://user-images.githubusercontent.com/220205/190831657-f7d10a3f-d8c0-48a3-b30d-666db5a50563.png)

Demo of all affected pages:

https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/complement-design-faq.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/complement-lang-faq.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/complement-project-faq.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/grammar.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-crates.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-error-handling.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-ffi.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-macros.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-ownership.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-plugins.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-pointers.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-strings.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-tasks.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-testing.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/guide-unsafe.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/index.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/intro.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/not_found.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/reference.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/rustdoc.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/rust.html
https://rustdoc.crud.net/jsha/aux-pages-no-rustdoc-css/tutorial.html

Prior art: rust-lang#86663
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. 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.

Use rustdoc files again for error index page

9 participants