Skip to content

Unify sidebar buttons to use the same image #140135

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

Merged
merged 3 commits into from
May 6, 2025

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Apr 21, 2025

Part of #139832.

The source sidebar looks like this with the new image:

image

You can test it here.

r? @notriddle

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Apr 21, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 21, 2025

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @jsha

@notriddle notriddle removed the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Apr 21, 2025
@notriddle
Copy link
Contributor

Is there a particular reason for using the hamburger icon in desktop mode, instead of the sidebar button? When the file icon was originally chosen in #119066, the main reason was that hamburger icons usually open modals, but, in desktop mode, this button doesn't.

In any case, this is my only question, and it's not that big of a deal. We finally have empirical feedback to work with here, and that trumps any amount of theorizing.

@rfcbot fcp merge

@rfcbot

This comment was marked as off-topic.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Apr 21, 2025
@notriddle notriddle removed the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Apr 21, 2025
@notriddle
Copy link
Contributor

notriddle commented Apr 21, 2025

@rfcbot fcp cancel

Uuuugggghhhh... why do I always forget to check the list of T- tags before calling fcp on a gui test like this?

@rfcbot
Copy link
Collaborator

rfcbot commented Apr 21, 2025

@notriddle proposal cancelled.

@rfcbot rfcbot removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Apr 21, 2025
@notriddle
Copy link
Contributor

@rfcbot fcp merge

@rfcbot
Copy link
Collaborator

rfcbot commented Apr 21, 2025

Team member @notriddle has proposed to merge this. The next step is review by the rest of the tagged team members:

Concerns:

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Apr 21, 2025
@notriddle
Copy link
Contributor

notriddle commented Apr 21, 2025

@rfcbot concern hamburger-button-on-desktop

#140135 (comment)

@bors
Copy link
Collaborator

bors commented Apr 22, 2025

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

@GuillaumeGomez
Copy link
Member Author

Is there a particular reason for using the hamburger icon in desktop mode, instead of the sidebar button? When the file icon was originally chosen in #119066, the main reason was that hamburger icons usually open modals, but, in desktop mode, this button doesn't.

Because the hamburger button is universally known to "open a menu", which is what it's doing here. I don't think whether it's a modal or not makes a difference for users.

@jsha
Copy link
Contributor

jsha commented Apr 22, 2025

Concept seems fine. I note from your screenshot that the button has a light background despite being in a dark theme. For consistency with the mobile topbar, it should have no background / no border.

image

@rustbot rustbot added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Apr 23, 2025
@GuillaumeGomez
Copy link
Member Author

Applied @jsha's suggestion (thanks for it!). Updated the screenshot and also added a link to the hosted generated docs.

@GuillaumeGomez
Copy link
Member Author

@notriddle Is your concern resolved btw?

@notriddle
Copy link
Contributor

@rfcbot resolve hamburger-button-on-desktop

@rfcbot rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Apr 25, 2025
@rfcbot
Copy link
Collaborator

rfcbot commented Apr 25, 2025

🔔 This is now entering its final comment period, as per the review above. 🔔

@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels May 5, 2025
@rfcbot
Copy link
Collaborator

rfcbot commented May 5, 2025

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

@GuillaumeGomez
Copy link
Member Author

@bors r=rustdoc rollup

@bors
Copy link
Collaborator

bors commented May 6, 2025

📌 Commit f7d8558 has been approved by rustdoc

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 May 6, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2025
…llaumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#140135 (Unify sidebar buttons to use the same image)
 - rust-lang#140632 (add a test for issue rust-lang#81317)
 - rust-lang#140658 (`deref_patterns`: let string and byte string literal patterns peel references and smart pointers before matching)
 - rust-lang#140681 (Don't ignore compiler stderr in `lib-defaults.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a92ba60 into rust-lang:master May 6, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 6, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2025
Rollup merge of rust-lang#140135 - GuillaumeGomez:sidebars-image, r=rustdoc

Unify sidebar buttons to use the same image

Part of rust-lang#139832.

The source sidebar looks like this with the new image:

![image](https://github.com/user-attachments/assets/df4fee52-fb71-4794-91b7-3afc6d2aab70)

You can test it [here](https://rustdoc.crud.net/imperio/sidebar-images/src/foo/foo.rs.html).

r? `@notriddle`
@GuillaumeGomez GuillaumeGomez deleted the sidebars-image branch May 6, 2025 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. 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-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. to-announce Announce this issue on triage meeting
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants