bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve display of the separation between page items and siblings in the sidebar

Browse source
This commit is contained in:
Guillaume Gomez 2021-05-31 12:11:05 +02:00
parent a2ba9ef1ff
commit 9b637fa72e
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/html/render/mod.rs
View file

@ -1738,7 +1738,7 @@ fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) {
// to navigate the documentation (though slightly inefficiently). // to navigate the documentation (though slightly inefficiently).
if !it.is_mod() { if !it.is_mod() {
buffer.write_str("<p class=\"location\">"); buffer.write_str("<p class=\"location\">Other items in<br>");
for (i, name) in cx.current.iter().take(parentlen).enumerate() { for (i, name) in cx.current.iter().take(parentlen).enumerate() {
if i > 0 { if i > 0 {
buffer.write_str("::<wbr>"); buffer.write_str("::<wbr>");

5
src/librustdoc/html/static/rustdoc.css
View file

@ -304,9 +304,12 @@ nav.sub {
border: none; border: none;
} }
.location a:first-child { .location a:first-of-type {
font-weight: 500; font-weight: 500;
} }
.location a:hover {
text-decoration: underline;
}
.block { .block {
padding: 0; padding: 0;

12
src/test/rustdoc-gui/sidebar.goml
View file

@ -19,6 +19,9 @@ click: "#structs + table td > a"
assert: (".sidebar .location", 2) assert: (".sidebar .location", 2)
// We check that there is no crate listed outside of the top level. // We check that there is no crate listed outside of the top level.
assert-false: ".sidebar-elems > .crate" assert-false: ".sidebar-elems > .crate"
// We now go back to the crate page to click on the "lib2" crate link.
goto: file://|DOC_PATH|/test_docs/index.html
click: ".sidebar-elems > .crate > ul > li:first-child > a"
// PAGE: lib2/index.html // PAGE: lib2/index.html
goto: file://|DOC_PATH|/lib2/index.html goto: file://|DOC_PATH|/lib2/index.html
@ -35,10 +38,17 @@ click: "#functions + table td > a"
// In items containing no items (like functions or constants) and in modules, we have one // In items containing no items (like functions or constants) and in modules, we have one
// "location" elements. // "location" elements.
assert: (".sidebar .location", 1) assert: (".sidebar .location", 1)
// There is a "<br>" tag between "in" and "lib2", but it doesn't count as a space.
assert: (".sidebar .sidebar-elems .location", "Other items inlib2")
// We check that we don't have the crate list. // We check that we don't have the crate list.
assert-false: ".sidebar-elems > .crate" assert-false: ".sidebar-elems > .crate"
goto: ./module/sub_module/sub_sub_module/index.html
goto: ./module/index.html
assert: (".sidebar > .location", "Module module")
// We check that we don't have the crate list.
assert-false: ".sidebar-elems > .crate"
goto: ./sub_module/sub_sub_module/index.html
assert: (".sidebar > .location", "Module sub_sub_module") assert: (".sidebar > .location", "Module sub_sub_module")
// We check that we don't have the crate list. // We check that we don't have the crate list.
assert-false: ".sidebar-elems > .crate" assert-false: ".sidebar-elems > .crate"