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.

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

Fix small headers display #86903

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Fix small headers display #86903

merged 1 commit into from
Jul 8, 2021

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jul 6, 2021 •
edited
Loading

You can see it on the IoSlice or on the ErrorKind pages.

Before:

Screenshot from 2021-07-06 15-26-33
Screenshot from 2021-07-08 17-51-43

After:

Screenshot from 2021-07-08 17-48-42
Screenshot from 2021-07-08 17-48-47

r? @Nemo157

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-ui Area: Rustdoc UI (generated HTML) labels Jul 6, 2021
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 6, 2021
@Nemo157
Copy link
Member

Nemo157 commented Jul 7, 2021

This would break the display of the stabilized versions on enum variants, if they weren't already broken from being display: block instead of display: flex (e.g. https://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html#variant.OutOfMemory, disabling the display: block rule fixes the version to appear on the right, but then disabling this justify-content: space-between rule breaks it to be left-aligned again).

@GuillaumeGomez
Copy link
Member Author

Good catch, thanks!

@bors
Copy link
Contributor

bors commented Jul 8, 2021

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

@GuillaumeGomez
Copy link
Member Author

Simply wrapping the section content into a span fixes the problem. Making more tests locally.

@GuillaumeGomez GuillaumeGomez force-pushed the small-header-display branch from f40a310 to 1f84bff Compare July 8, 2021 15:49
@GuillaumeGomez
Copy link
Member Author

It's now ready @Nemo157. :)

@Nemo157
Copy link
Member

Nemo157 commented Jul 8, 2021

Seems likely to fix it all

@bors r+

@bors
Copy link
Contributor

bors commented Jul 8, 2021

📌 Commit 1f84bff has been approved by Nemo157

@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 8, 2021
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 8, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2021
@bors
Auto merge of rust-lang#86982 - GuillaumeGomez:rollup-7sbye3c, r=Guil…
aa65b08 
…laumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#84961 (Rework SESSION_GLOBALS API)
 - rust-lang#86726 (Use diagnostic items instead of lang items for rfc2229 migrations)
 - rust-lang#86789 (Update BTreeSet::drain_filter documentation)
 - rust-lang#86838 (Checking that function is const if marked with rustc_const_unstable)
 - rust-lang#86903 (Fix small headers display)
 - rust-lang#86913 (Document rustdoc with `--document-private-items`)
 - rust-lang#86957 (Update .mailmap file)
 - rust-lang#86971 (mailmap: Add alternative addresses for myself)

Failed merges:

 - rust-lang#86869 (Account for capture kind in auto traits migration)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 46314f7 into rust-lang:master Jul 8, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 8, 2021
@GuillaumeGomez GuillaumeGomez deleted the small-header-display branch July 8, 2021 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Nemo157 Nemo157

Labels
A-rustdoc-ui Area: Rustdoc UI (generated HTML) 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.55.0
Development

Successfully merging this pull request may close these issues.
5 participants
@GuillaumeGomez @rust-highfive @Nemo157 @bors @rustbot