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.

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

Add link to rustdoc book in rustdoc help popup #78103

Merged
merged 1 commit into from
Oct 19, 2020

Conversation

GuillaumeGomez
Copy link
Member

Part of #75520.

It looks like this:

Screenshot from 2020-10-19 13-46-02
Screenshot from 2020-10-19 13-43-46
Screenshot from 2020-10-19 13-37-26

r? @jyn514

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

Some changes occurred in HTML/CSS themes.

cc @GuillaumeGomez

A change occurred in the Ayu theme.

cc @Cldfire

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2020
@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Oct 19, 2020
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with or without nit :) This looks great!

src/librustdoc/html/static/main.js Outdated Show resolved Hide resolved
@jyn514
Copy link
Member

jyn514 commented Oct 19, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 19, 2020

📌 Commit 880d644 has been approved by jyn514

@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 Oct 19, 2020
Copy link
Contributor

@pickfire pickfire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me but the keyboard buttons in the dark theme looks ugly to me.

But should we really make it javascript only? Maybe html can display it by default when <noscript> in the bottom, but that's another issue.

@GuillaumeGomez
Copy link
Member Author

@pickfire: It's completely beyond the scope of this PR. Also, if you don't have JS enabled, this popup cannot be displayed (and that's the whole point since it's mostly about search after all, which only works with JS 😆 ).

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2020
…laumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#77877 (Use `try{}` in `try_fold` to decouple iterators in the library from `Try` details)
 - rust-lang#78089 (Fix issue with specifying generic arguments for primitive types)
 - rust-lang#78099 (Add missing punctuation)
 - rust-lang#78103 (Add link to rustdoc book in rustdoc help popup)

Failed merges:

r? `@ghost`
@bors bors merged commit cbcf8d4 into rust-lang:master Oct 19, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 19, 2020
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-book branch October 19, 2020 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants