diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-10-11 00:34:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 00:34:37 +0200 |
| commit | 3fa897df2685277174b583ac119401b4e4520d10 (patch) | |
| tree | 2d4393b6e3dec8b2dc0c2d23c321c8bf2997feb3 | |
| parent | 2bfbf9776228c64d29052f8f3af870f832ea6e43 (diff) | |
| parent | d4f3cf03f940607f1e77fc2c1b27d8ae0b804408 (diff) | |
| download | rust-3fa897df2685277174b583ac119401b4e4520d10.tar.gz rust-3fa897df2685277174b583ac119401b4e4520d10.zip | |
Rollup merge of #89632 - GuillaumeGomez:fix-docblock-code, r=jsha
Fix docblock code display on mobile Fixes https://github.com/rust-lang/rust/issues/89618. Before:  After:  r? `@jsha`
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 4 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/docblock-big-code-mobile.goml | 9 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/src/test_docs/lib.rs | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 5d33681847a..2764b7435eb 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1969,4 +1969,8 @@ details.undocumented[open] > summary::before { .docblock { margin-left: 12px; } + + .docblock code { + overflow-wrap: anywhere; + } } diff --git a/src/test/rustdoc-gui/docblock-big-code-mobile.goml b/src/test/rustdoc-gui/docblock-big-code-mobile.goml new file mode 100644 index 00000000000..12677a5648a --- /dev/null +++ b/src/test/rustdoc-gui/docblock-big-code-mobile.goml @@ -0,0 +1,9 @@ +// If we have a long `<code>`, we need to ensure that it'll be fully displayed on mobile, meaning +// that it'll be on two lines. +emulate: "iPhone 8" // it has the following size: (375, 667) +goto: file://|DOC_PATH|/test_docs/long_code_block/index.html +// We now check that the block is on two lines: +show-text: true // We need to enable text draw to be able to have the "real" size +// Little explanations for this test: if the text wasn't displayed on two lines, it would take +// around 20px (which is the font size). +assert-property: (".docblock p > code", {"offsetHeight": "42"}) diff --git a/src/test/rustdoc-gui/src/test_docs/lib.rs b/src/test/rustdoc-gui/src/test_docs/lib.rs index 0aa1426a36a..2a147e64d8b 100644 --- a/src/test/rustdoc-gui/src/test_docs/lib.rs +++ b/src/test/rustdoc-gui/src/test_docs/lib.rs @@ -120,3 +120,6 @@ pub type SomeType = u32; pub mod huge_amount_of_consts { include!(concat!(env!("OUT_DIR"), "/huge_amount_of_consts.rs")); } + +/// Very long code text `hereIgoWithLongTextBecauseWhyNotAndWhyWouldntI`. +pub mod long_code_block {} |