diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-24 23:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-24 23:25:46 +0100 |
| commit | d15cf36f0c2abdc1ebde9d00d8e0f3aef3f1e530 (patch) | |
| tree | 5974a4a7cc9fa51594108a2b77fe2fb3b2a456a7 | |
| parent | 99e34a4ea0592d53496900ec9918018e16f67992 (diff) | |
| parent | caacb048303bfef39a2c89baccccad8e79e5a8d2 (diff) | |
| download | rust-d15cf36f0c2abdc1ebde9d00d8e0f3aef3f1e530.tar.gz rust-d15cf36f0c2abdc1ebde9d00d8e0f3aef3f1e530.zip | |
Rollup merge of #135998 - GuillaumeGomez:fix-trait-items-mobile-indent, r=notriddle
[rustdoc] Fix indent of trait items on mobile Before:  After:  Seems like we forgot them when we did #131718. Can be tested [here](https://rustdoc.crud.net/imperio/fix-trait-items-mobile-indent/foo/trait.T.html). r? `@notriddle`
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 10 | ||||
| -rw-r--r-- | tests/rustdoc-gui/search-tab.goml | 2 | ||||
| -rw-r--r-- | tests/rustdoc-gui/src/test_docs/lib.rs | 22 | ||||
| -rw-r--r-- | tests/rustdoc-gui/toggle-docs-mobile.goml | 26 |
4 files changed, 56 insertions, 4 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index b994a43868c..a7b462936cc 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -2166,7 +2166,8 @@ details.toggle > summary:not(.hideme)::before { top: 4px; } -.impl-items > details.toggle > summary:not(.hideme)::before { +.impl-items > details.toggle > summary:not(.hideme)::before, +#main-content > .methods > details.toggle > summary:not(.hideme)::before { position: absolute; left: -24px; } @@ -2176,7 +2177,9 @@ details.toggle > summary:not(.hideme)::before { .impl-items > *:not(.item-info), /* We also indent the first top doc comment the same to still keep an indent on the doc block while aligning it with the impl block items. */ -.implementors-toggle > .docblock { +.implementors-toggle > .docblock, +/* We indent trait items as well. */ +#main-content > .methods > :not(.item-info) { margin-left: var(--impl-items-indent); } @@ -2508,7 +2511,8 @@ in src-script.js and main.js margin-left: 10px; } - .impl-items > details.toggle > summary:not(.hideme)::before { + .impl-items > details.toggle > summary:not(.hideme)::before, + #main-content > .methods > details.toggle > summary:not(.hideme)::before { left: -20px; } diff --git a/tests/rustdoc-gui/search-tab.goml b/tests/rustdoc-gui/search-tab.goml index eea561e0c67..826e272e508 100644 --- a/tests/rustdoc-gui/search-tab.goml +++ b/tests/rustdoc-gui/search-tab.goml @@ -78,7 +78,7 @@ call-function: ("check-colors", { set-window-size: (851, 600) // Check the size and count in tabs -assert-text: ("#search-tabs > button:nth-child(1) > .count", " (26) ") +assert-text: ("#search-tabs > button:nth-child(1) > .count", " (27) ") assert-text: ("#search-tabs > button:nth-child(2) > .count", " (7) ") assert-text: ("#search-tabs > button:nth-child(3) > .count", " (0) ") store-property: ("#search-tabs > button:nth-child(1)", {"offsetWidth": buttonWidth}) diff --git a/tests/rustdoc-gui/src/test_docs/lib.rs b/tests/rustdoc-gui/src/test_docs/lib.rs index dae13d9ac18..1a9ffbe8898 100644 --- a/tests/rustdoc-gui/src/test_docs/lib.rs +++ b/tests/rustdoc-gui/src/test_docs/lib.rs @@ -691,3 +691,25 @@ impl ImplDoc { impl ImplDoc { pub fn bar5() {} } + +pub trait ItemsTrait { + /// You want doc, here is doc! + /// + /// blablala + type F; + + /// You want doc, here is doc! + /// + /// blablala + const X: u32; + + /// You want doc, here is doc! + /// + /// blablala + fn foo() {} + + /// You want doc, here is doc! + /// + /// blablala + fn bar(); +} diff --git a/tests/rustdoc-gui/toggle-docs-mobile.goml b/tests/rustdoc-gui/toggle-docs-mobile.goml index be12e4c19b3..6a40ba83b84 100644 --- a/tests/rustdoc-gui/toggle-docs-mobile.goml +++ b/tests/rustdoc-gui/toggle-docs-mobile.goml @@ -31,3 +31,29 @@ assert-attribute: (".top-doc", {"open": ""}) // To ensure that the toggle isn't over the text, we check that the toggle isn't clicked. click: (3, 270) assert-attribute: (".top-doc", {"open": ""}) + +// Same check on trait items. +fail-on-request-error: false // To prevent downloads errors on "trait.impl/test_docs/trait.ItemsTrait.js" +go-to: "file://" + |DOC_PATH| + "/test_docs/trait.ItemsTrait.html" + +define-function: ( + "check-trait-item", + [nth, text], + block { + store-value: (selector, ".methods:nth-of-type(" + |nth| + ") > details summary") + assert-text: (|selector| + " h4", |text|) + assert-position: ( + |selector| + "::before", + {"x": 6}, + ) + }, +) + +// Assert the position of the toggle on an associated const. +call-function: ("check-trait-item", {"nth": 2, "text": "const X: u32"}) +// Assert the position of the toggle on an associated type. +call-function: ("check-trait-item", {"nth": 3, "text": "type F"}) +// Assert the position of the toggle on an associated required method. +call-function: ("check-trait-item", {"nth": 4, "text": "fn bar()"}) +// Assert the position of the toggle on an associated provided method. +call-function: ("check-trait-item", {"nth": 5, "text": "fn foo()"}) |
