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

Fix position source code files toggle #60383

Merged

Conversation

GuillaumeGomez
Copy link
Member

Fixes #60381.

The second commit is a big cleanup of the media queries.

r? @rust-lang/rustdoc

cc @Manishearth

screenshot of the fix:

Screenshot 2019-04-29 at 23 42 56

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2019
@@ -1228,6 +1228,39 @@ h4 > .important-traits {
margin: 5px 0;
}

#sidebar-toggle {
position: fixed;
Copy link
Member

Choose a reason for hiding this comment

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

What was actually changed here? Moving the lines up makes it harder to see the actual diff.

Copy link
Member Author

Choose a reason for hiding this comment

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

Just look at the first commit. I splitted the changed so you can review easily.

Copy link
Member

Choose a reason for hiding this comment

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

I am looking at the first commit, it's still harder to tell what was added

Copy link
Member

Choose a reason for hiding this comment

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

Ah, the only change is adding the stuff to the media query.

@@ -1261,7 +1138,177 @@ h4 > .important-traits {
margin-bottom: 6px;
}

.theme-picker {
position: absolute;
Copy link
Member

Choose a reason for hiding this comment

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

Does this commit just move entries around, or does it actually change any semantics too?

Copy link
Member Author

Choose a reason for hiding this comment

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

The second commit is a cleanup.

@Manishearth
Copy link
Member

This fix seems to be pushing the line list back down (as compared to the screenshot in #60381 ). Does this go away when #60380 is applied?

(Also please explain in words what is being fixed in the issue or PR title, it's hard to guess this stuff at times)

@bors
Copy link
Contributor

bors commented Apr 30, 2019

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

@GuillaumeGomez
Copy link
Member Author

This fix seems to be pushing the line list back down (as compared to the screenshot in #60381 ). Does this go away when #60380 is applied?

In mobile version, it moves it down and make it bigger but on desktop, nothing changes.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-position-source-code-files-toggle branch from d10efde to 87d1c17 Compare April 30, 2019 08:34
@Dylan-DPC-zz
Copy link

ping from triage @Manishearth waiting for your review on this

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 20, 2019

📌 Commit 87d1c17 has been approved by Manishearth

@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 20, 2019
Centril added a commit to Centril/rust that referenced this pull request May 20, 2019
…code-files-toggle, r=Manishearth

Fix position source code files toggle

Fixes rust-lang#60381.

The second commit is a big cleanup of the media queries.

r? @rust-lang/rustdoc

cc @Manishearth

screenshot of the fix:

<img width="501" alt="Screenshot 2019-04-29 at 23 42 56" src="https://user-images.githubusercontent.com/3050060/56929111-112b2b00-6ad9-11e9-9a23-e0a8e3641395.png">
bors added a commit that referenced this pull request May 20, 2019
Rollup of 11 pull requests

Successful merges:

 - #60383 (Fix position source code files toggle)
 - #60453 (Fall back to `/dev/urandom` on `EPERM` for `getrandom`)
 - #60487 (Fix search sidebar width when no crate select is present)
 - #60511 (Fix intra-doc link resolution failure on re-exporting libstd)
 - #60823 (Fix incremental compilation of cdylib emitting spurious unused_attributes lint)
 - #60915 (stable hashing: Remove unused field and add documentation.)
 - #60942 (Misc changes to rustc_metadata)
 - #60952 (Document BinaryHeap time complexity)
 - #60959 (rustc: Improve type size assertions)
 - #60972 (remove confusing remarks about mixed volatile and non-volatile accesses)
 - #60983 (Set -funwind-tables and -fno-exceptions unconditionally for LLVM's libunwind)

Failed merges:

r? @ghost
@bors bors merged commit 87d1c17 into rust-lang:master May 21, 2019
@GuillaumeGomez GuillaumeGomez deleted the fix-position-source-code-files-toggle branch May 21, 2019 08:44
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustdoc: improve position and display of source code files sidebar
5 participants