Skip to content

Remove horizontal lines at top of page#92797

Merged
bors merged 1 commit into
rust-lang:masterfrom
jsha:fewer-lines
Jan 19, 2022
Merged

Remove horizontal lines at top of page#92797
bors merged 1 commit into
rust-lang:masterfrom
jsha:fewer-lines

Conversation

@jsha

@jsha jsha commented Jan 11, 2022

Copy link
Copy Markdown
Contributor

They are not needed to separate the search bar and the title, which are visually distinct on their own.

Part of #59840

Demo: https://rustdoc.crud.net/jsha/fewer-lines/std/string/struct.String.html

r? @GuillaumeGomez

@jsha jsha 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 Jan 11, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez,@Folyd

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 11, 2022
@rust-log-analyzer

This comment has been minimized.

@camelid

camelid commented Jan 12, 2022

Copy link
Copy Markdown
Member

Ah, what a nice improvement!

Comment thread src/test/rustdoc-gui/headings.goml Outdated
@rust-log-analyzer

This comment has been minimized.

@jsha

jsha commented Jan 12, 2022

Copy link
Copy Markdown
Contributor Author

@bors retry

@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 Jan 12, 2022
@camelid

camelid commented Jan 12, 2022

Copy link
Copy Markdown
Member

@jsha the test failure was not from bors, it was from PR CI. You can re-run that by clicking "re-run all jobs" on this page: https://github.com/rust-lang/rust/runs/4793628088?check_suite_focus=true. But it might not be worth it.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 12, 2022
@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 12, 2022
@jsha

jsha commented Jan 15, 2022

Copy link
Copy Markdown
Contributor Author

Bump on this one when you get a chance @GuillaumeGomez.

@GuillaumeGomez

Copy link
Copy Markdown
Member

@jsha I don't think it's coming from your PR but just in case, can you rebase it on top of master please? Then r=me.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
Member

Thanks!

@bors: r+ rollup

@bors

bors commented Jan 17, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit ddc328c159390d3562326993683349f57d451c69 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 Jan 17, 2022
@jsha

jsha commented Jan 17, 2022

Copy link
Copy Markdown
Contributor Author

Thanks for the review! Temporarily bumping this out of the queue because it has a change to toggle-docs-mobile that will conflict with the changes in #92629. Letting that one merge first.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 17, 2022
@bors

bors commented Jan 18, 2022

Copy link
Copy Markdown
Collaborator

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

@camelid

camelid commented Jan 18, 2022

Copy link
Copy Markdown
Member

@jsha should this be re-approved now or does it need a new review?

@jsha

jsha commented Jan 19, 2022

Copy link
Copy Markdown
Contributor Author

It shouldn't get reapproved quite yet. There's another PR in the queue (#92861) that also touches toggle-docs-mobile and will generate a conflict. Once that's landed I'll rebase this and reapprove it.

@bors

bors commented Jan 19, 2022

Copy link
Copy Markdown
Collaborator

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

They are not needed to separate the search bar and the title, which are
visually distinct on their own.
@jsha

jsha commented Jan 19, 2022

Copy link
Copy Markdown
Contributor Author

@bors r=GuillaumeGomez rollup

I decided to make another revision on #92861, so it will need another review; this one can go ahead of it.

@bors

bors commented Jan 19, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit fa9a843 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 19, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2022
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#88642 (Formally implement let chains)
 - rust-lang#89621 (doc: guarantee call order for sort_by_cached_key)
 - rust-lang#91278 (Use iterator instead of recursion in `codegen_place`)
 - rust-lang#92124 (Little improves in CString `new` when creating from slice)
 - rust-lang#92783 (Annotate dead code lint with notes about ignored derived impls)
 - rust-lang#92797 (Remove horizontal lines at top of page)
 - rust-lang#92920 (Move expr- and item-related pretty printing functions to modules)
 - rust-lang#93041 (Remove some unused ordering derivations based on `DefId`)
 - rust-lang#93051 (Add Option::is_some_with and Result::is_{ok,err}_with)
 - rust-lang#93062 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7f2dbcb into rust-lang:master Jan 19, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 19, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2022
rustdoc: remove dashed underline under main heading

This was removed in rust-lang#92797 but accidentally re-introduced by a bad merge in rust-lang#92861.

r? `@camelid`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2022
rustdoc: remove dashed underline under main heading

This was removed in rust-lang#92797 but accidentally re-introduced by a bad merge in rust-lang#92861.

r? ``@camelid``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2022
rustdoc: remove dashed underline under main heading

This was removed in rust-lang#92797 but accidentally re-introduced by a bad merge in rust-lang#92861.

r? ```@camelid```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

7 participants