Skip to content

rustdoc: force pre tags to have the default line height #105912

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 20, 2022
Merged

rustdoc: force pre tags to have the default line height #105912

merged 1 commit into from
Dec 20, 2022

Conversation

notriddle
Copy link
Contributor

Fixes #105906

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2022

r? @GuillaumeGomez

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 19, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2022

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

@notriddle notriddle force-pushed the notriddle/pre-line-height branch from 1eb430f to f24c04c Compare December 19, 2022 17:23
@eddyb
Copy link
Member

eddyb commented Dec 19, 2022 •
edited
Loading

Ugh, for crates.io looks like it maybe comes from this:
https://github.com/rust-lang/crates.io/blob/b5ee4778dab6267b1bc14352a91dde7ab945bd7b/ember-cli-build.js#L61
https://github.com/rust-lang/crates.io/blob/b5ee4778dab6267b1bc14352a91dde7ab945bd7b/package.json#L127
(and may need to be worked around in https://github.com/rust-lang/crates.io/tree/b5ee4778dab6267b1bc14352a91dde7ab945bd7b/app/styles instead)

So that's even worse to fix than rustdoc's vendored normalize.css or the file you're changing here...

@notriddle
Copy link
Contributor Author

Yeah, crates.io and docs.rs don't use rustdoc.css for their README displays. Those are going to require separate PRs.

@notriddle
Copy link
Contributor Author

I also opened a discussion on GitHub Feedback asking for <small> to be added to GitHub's allowed list of HTML tags, since that's actually what you probably want to be doing.

community/community#42150

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 20, 2022

📌 Commit f24c04c has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Dec 20, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 20, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 20, 2022
@bors
Auto merge of rust-lang#105940 - matthiaskrgr:rollup-ho4po1t, r=matth…
8a746f4 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#105901 (Don't panic on stable since miri is not available there)
 - rust-lang#105912 (rustdoc: force pre tags to have the default line height)
 - rust-lang#105914 (rustdoc: Simplify CSS for scraped code examples code blocks)
 - rust-lang#105933 (Add readable rustdoc display for tvOS and watchOS)
 - rust-lang#105935 (docs/test: add UI test and long-form error docs for `E0377`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 951949c into rust-lang:master Dec 20, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

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
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.

rustdoc CSS does not reset line-height to a non-zero value in <pre>.
5 participants
@notriddle @rustbot @eddyb @GuillaumeGomez @bors