Skip to content

rustdoc: clean up rustdoc-toggle CSS #103364

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

Merged
merged 2 commits into from
Oct 22, 2022
Merged
Changes from all commits
Commits
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
14 changes: 4 additions & 10 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
@@ -1536,6 +1536,7 @@ details.dir-entry a {
https://developer.mozilla.org/en-US/docs/Web/CSS/contain */
details.rustdoc-toggle {
contain: layout;
position: relative;
}

/* The hideme class is used on summary tags that contain a span with
@@ -1629,10 +1630,6 @@ details.rustdoc-toggle[open] > summary.hideme {
position: absolute;
}

details.rustdoc-toggle {
position: relative;
}

details.rustdoc-toggle[open] > summary.hideme > span {
display: none;
}
@@ -1983,8 +1980,8 @@ in storage.js
}
}

.method-toggle summary,
.implementors-toggle summary,
.method-toggle > summary,
.implementors-toggle > summary,
.impl,
#implementors-list > .docblock,
.impl-items > section,
@@ -1993,10 +1990,7 @@ in storage.js
margin-bottom: 0.75em;
}

.method-toggle[open]:not(:last-child) {
margin-bottom: 2em;
}

.method-toggle[open]:not(:last-child),
.implementors-toggle[open]:not(:last-child) {
margin-bottom: 2em;
}
11 changes: 11 additions & 0 deletions src/test/rustdoc-gui/docblock-details.goml
Original file line number Diff line number Diff line change
@@ -21,3 +21,14 @@ assert-property: (".top-doc .docblock summary h4", {"offsetHeight": "33"})
assert-css: (".top-doc .docblock summary h4", {"margin-top": "15px", "margin-bottom": "5px"})
// So `33 + 15 + 5` == `53`
assert-property: (".top-doc .docblock summary", {"offsetHeight": "53"})

// We now check the `<summary>` on a method.
assert-css: (
".method-toggle .docblock summary h4",
{"border-bottom-width": "0px"},
)
// This allows to ensure that summary is on one line only!
assert-property: (".method-toggle .docblock summary h4", {"offsetHeight": "30"})
assert-css: (".method-toggle .docblock summary h4", {"margin-top": "15px", "margin-bottom": "5px"})
// So `30 + 15 + 5` == `50`
assert-property: (".method-toggle .docblock summary", {"offsetHeight": "50"})
12 changes: 12 additions & 0 deletions src/test/rustdoc-gui/src/test_docs/lib.rs
Original file line number Diff line number Diff line change
@@ -317,6 +317,18 @@ pub mod details {
/// <div>I'm the content of the details!</div>
/// </details>
pub struct Details;

impl Details {
/// We check the appearance of the `<details>`/`<summary>` in here.
///
/// ## Hello
///
/// <details>
/// <summary><h4>I'm a summary</h4></summary>
/// <div>I'm the content of the details!</div>
/// </details>
pub fn method() {}
}
}

pub mod doc_block_table {