Greatly improve sidebar when width < 700px #46526
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kennytm
added
the
S-waiting-on-review
kennytm
reviewed
Dec 6, 2017
src/librustdoc/html/render.rs
Outdated
| @@ -3625,6 +3626,8 @@ impl<'a> fmt::Display for Sidebar<'a> { | |||
| write!(fmt, "<script defer src=\"{path}sidebar-items.js\"></script>", | |||
| path = relpath)?; | |||
| } | |||
| // Closes sidebar-elems div. | |||
| write!(fmt, "</div>")?; | |||
There was a problem hiding this comment.
Is this </div> placed correctly? It is at different indentation level than line 3578. htmldocck on CI currently complains all files are invalid HTML.
[01:05:10] stderr:
[01:05:10] ------------------------------------------
[01:05:10] Traceback (most recent call last):
[01:05:10] File "/checkout/src/etc/htmldocck.py", line 455, in <module>
[01:05:10] check(sys.argv[1], get_commands(sys.argv[2]))
[01:05:10] File "/checkout/src/etc/htmldocck.py", line 448, in check
[01:05:10] check_command(c, cache)
[01:05:10] File "/checkout/src/etc/htmldocck.py", line 397, in check_command
[01:05:10] tree = cache.get_tree(c.args[0])
[01:05:10] File "/checkout/src/etc/htmldocck.py", line 309, in get_tree
[01:05:10] raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[01:05:10] RuntimeError: Cannot parse an HTML file 'foo/fn.f.html': pop from empty stack
There was a problem hiding this comment.
Arf, forgot to write the condition... (it's not supposed to be there everytime)
GuillaumeGomez
force-pushed
the
mobile-sidebar
branch
from
56454c8 to
c612641
Compare
|
@bors r+ Thanks! I've wanted a menu like this for a while myself. :D |
|
📌 Commit c612641 has been approved by |
kennytm
added
S-waiting-on-bors
|
@bors rollup |
|
☔ The latest upstream changes (presumably #46221) made this pull request unmergeable. Please resolve the merge conflicts. |
kennytm
added
S-waiting-on-author
GuillaumeGomez
force-pushed
the
mobile-sidebar
branch
from
c612641 to
423e5ac
Compare
|
Rebased. |
kennytm
added
S-waiting-on-review
|
@bors r+ rollup |
|
📌 Commit 423e5ac has been approved by |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Dec 7, 2017
…ietMisdreavus Greatly improve sidebar when width < 700px Fixes rust-lang#36531. r? @QuietMisdreavus A few screenshots: <img width="1440" alt="screen shot 2017-12-06 at 00 41 36" src="https://user-images.githubusercontent.com/3050060/33636875-6ad8b1a6-da1e-11e7-8d5b-d6d530ea5258.png"> <img width="1440" alt="screen shot 2017-12-06 at 00 41 40" src="https://user-images.githubusercontent.com/3050060/33636876-6af58196-da1e-11e7-82ab-b82768958037.png">
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #36531.
r? @QuietMisdreavus
A few screenshots: