Skip to content

Improve rustdoc layout #91356

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.

Sign up for GitHub

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 13 commits into from
Dec 5, 2021
Merged

Improve rustdoc layout #91356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
135281e
rustdoc: use flexbox to layout sidebar and main content
cynecx Sep 30, 2021
1e98fb1
rustdoc: fix source view
cynecx Oct 9, 2021
07e3f99
rustdoc: merge source sidebar into main sidebar
cynecx Oct 10, 2021
b533e8c
rustdoc: fix theme colors
cynecx Oct 10, 2021
ee0ca2d
rustdoc: make source sidebar collapse by default
cynecx Oct 10, 2021
e2467f2
rustdoc: fix source-code-page test
cynecx Oct 10, 2021
cad0fce
rustdoc: don't use overflow for main, instead make the sidebar sticky
cynecx Oct 24, 2021
501b3d2
rustdoc: fix tabs in css
cynecx Oct 24, 2021
dc2c972
rustdoc: rework source sidebar
cynecx Oct 24, 2021
6e9954d
rustdoc: show logo in source sub nav
cynecx Oct 24, 2021
1e55c31
Fix remaining bugs
GuillaumeGomez Nov 29, 2021
d7e998d
Rename ID "main" into "main-content"
GuillaumeGomez Nov 29, 2021
d7528e2
Rename CSS class main-inner into width-limiter
GuillaumeGomez Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustdoc/html/markdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@ fn init_id_map() -> FxHashMap<String, usize> {
map.insert("theme-choices".to_owned(), 1);
map.insert("settings-menu".to_owned(), 1);
map.insert("help-button".to_owned(), 1);
map.insert("main".to_owned(), 1);
map.insert("main-content".to_owned(), 1);
map.insert("search".to_owned(), 1);
map.insert("crate-search".to_owned(), 1);
map.insert("render-detail".to_owned(), 1);
Expand Down
8 changes: 4 additions & 4 deletions src/librustdoc/html/markdown/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn test_unique_id() {
"examples",
"method.into_iter",
"foo",
"main",
"main-content",
"search",
"methods",
"examples",
Expand All @@ -28,7 +28,7 @@ fn test_unique_id() {
"examples-2",
"method.into_iter-1",
"foo-1",
"main-1",
"main-content-1",
"search-1",
"methods",
"examples-3",
Expand Down Expand Up @@ -219,8 +219,8 @@ fn test_header_ids_multiple_blocks() {
);
t(
&mut map,
"# Main",
"<h2 id=\"main-1\" class=\"section-header\"><a href=\"#main-1\">Main</a></h2>",
"# Search",
"<h2 id=\"search-1\" class=\"section-header\"><a href=\"#search-1\">Search</a></h2>",
);
t(
&mut map,
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/css/noscript.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ of content is hidden by default (depending on the settings too), we have to over
rules.
*/

#main .attributes {
#main-content .attributes {
/* Since there is no toggle (the "[-]") when JS is disabled, no need for this margin either. */
margin-left: 0 !important;
}
Expand Down
Loading