Rollup merge of #103211 - notriddle:notriddle/dot-location, r=GuillaumeGomez
rustdoc: remove class name `location` from sidebar sibling nav Preview: https://notriddle.com/notriddle-rustdoc-demos/sidebar-location/std/vec/struct.Vec.html This change tweaks the CSS to apply most of its styles to `.sidebar h2`, cleaning up a few redundant rules from `.mobile-topbar .location` and restoring useful navigation aids in mobile mode. ## Before  ## After 
This commit is contained in:
commit
433f736b86
8 changed files with 39 additions and 38 deletions
|
|
@ -12,7 +12,7 @@ assert-css: (".main-heading", {
|
|||
"flex-direction": "column"
|
||||
})
|
||||
|
||||
assert-property: (".mobile-topbar h2.location", {"offsetHeight": 36})
|
||||
assert-property: (".mobile-topbar h2", {"offsetHeight": 36})
|
||||
|
||||
// Note: We can't use assert-text here because the 'Since' is set by CSS and
|
||||
// is therefore not part of the DOM.
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ assert-css: (".sidebar", {"display": "block", "left": "-1000px"})
|
|||
click: ".sidebar-menu-toggle"
|
||||
assert-css: (".sidebar", {"left": "0px"})
|
||||
|
||||
// Make sure the "struct Foo" header is hidden, since the mobile topbar already does it.
|
||||
assert-css: ("//nav[contains(@class, 'sidebar')]//h2/a[text()='Foo']/parent::h2", {"display": "none"})
|
||||
// Make sure the global navigation is still here.
|
||||
assert-css: ("//nav[contains(@class, 'sidebar')]//h2/a[text()='In test_docs']/parent::h2", {"display": "block"})
|
||||
|
||||
// Click elsewhere.
|
||||
click: "body"
|
||||
assert-css: (".sidebar", {"display": "block", "left": "-1000px"})
|
||||
|
|
@ -39,7 +44,7 @@ assert-position: ("#method\.must_use", {"y": 45})
|
|||
// Check that the bottom-most item on the sidebar menu can be scrolled fully into view.
|
||||
click: ".sidebar-menu-toggle"
|
||||
scroll-to: ".block.keyword li:nth-child(1)"
|
||||
compare-elements-position-near: (".block.keyword li:nth-child(1)", ".mobile-topbar", {"y": 543})
|
||||
compare-elements-position-near: (".block.keyword li:nth-child(1)", ".mobile-topbar", {"y": 543.19})
|
||||
|
||||
// Now checking the background color of the sidebar.
|
||||
show-text: true
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ reload:
|
|||
assert-text: (".sidebar > .location", "Crate test_docs")
|
||||
// In modules, we only have one "location" element.
|
||||
assert-count: (".sidebar .location", 1)
|
||||
assert-count: (".sidebar h2", 1)
|
||||
assert-text: ("#all-types", "All Items")
|
||||
assert-css: ("#all-types", {"color": "rgb(53, 109, 164)"})
|
||||
// We check that we have the crates list and that the "current" on is "test_docs".
|
||||
|
|
@ -28,7 +29,8 @@ assert-text: ("#structs + .item-table .item-left > a", "Foo")
|
|||
click: "#structs + .item-table .item-left > a"
|
||||
|
||||
// PAGE: struct.Foo.html
|
||||
assert-count: (".sidebar .location", 2)
|
||||
assert-count: (".sidebar .location", 1)
|
||||
assert-count: (".sidebar h2", 2)
|
||||
// We check that there is no crate listed outside of the top level.
|
||||
assert-false: ".sidebar-elems > .crate"
|
||||
|
||||
|
|
@ -60,10 +62,11 @@ assert-text: ("#functions + .item-table .item-left > a", "foobar")
|
|||
click: "#functions + .item-table .item-left > a"
|
||||
|
||||
// PAGE: fn.foobar.html
|
||||
// In items containing no items (like functions or constants) and in modules, we have one
|
||||
// "location" elements.
|
||||
assert-count: (".sidebar .location", 1)
|
||||
assert-text: (".sidebar .sidebar-elems .location", "In lib2")
|
||||
// In items containing no items (like functions or constants) and in modules, we have no
|
||||
// "location" elements. Only the parent module h2.
|
||||
assert-count: (".sidebar .location", 0)
|
||||
assert-count: (".sidebar h2", 1)
|
||||
assert-text: (".sidebar .sidebar-elems h2", "In lib2")
|
||||
// We check that we don't have the crate list.
|
||||
assert-false: ".sidebar-elems > .crate"
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ assert-property: (".item-decl pre", {"scrollWidth": "950"})
|
|||
size: (600, 600)
|
||||
goto: "file://" + |DOC_PATH| + "/lib2/too_long/struct.SuperIncrediblyLongLongLongLongLongLongLongGigaGigaGigaMegaLongLongLongStructName.html"
|
||||
// It shouldn't have an overflow in the topbar either.
|
||||
store-property: (scrollWidth, ".mobile-topbar .location", "scrollWidth")
|
||||
assert-property: (".mobile-topbar .location", {"clientWidth": |scrollWidth|})
|
||||
assert-css: (".mobile-topbar .location", {"overflow-x": "hidden"})
|
||||
store-property: (scrollWidth, ".mobile-topbar h2", "scrollWidth")
|
||||
assert-property: (".mobile-topbar h2", {"clientWidth": |scrollWidth|})
|
||||
assert-css: (".mobile-topbar h2", {"overflow-x": "hidden"})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue