about summary refs log tree commit diff
path: root/src/librustdoc/html/static/rustdoc.css
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-03-30 11:44:36 +0000
committerbors <bors@rust-lang.org>2021-03-30 11:44:36 +0000
commit16156fb2787f745e57504197bd7fe38b69c6cbea (patch)
tree8629975b2f2fb968c84444d7090f746f0a7a98e2 /src/librustdoc/html/static/rustdoc.css
parent689e8470ffa7aeca17cfee428704a4d6c4148c11 (diff)
parent5b467787b625d83d5cf210e70d56487e53ce4255 (diff)
downloadrust-16156fb2787f745e57504197bd7fe38b69c6cbea.tar.gz
rust-16156fb2787f745e57504197bd7fe38b69c6cbea.zip
Auto merge of #83674 - Dylan-DPC:rollup-bcuc1hl, r=Dylan-DPC
Rollup of 7 pull requests

Successful merges:

 - #83568 (update comment at MaybeUninit::uninit_array)
 - #83571 (Constantify some slice methods)
 - #83579 (Improve pointer arithmetic docs)
 - #83645 (Wrap non-pre code blocks)
 - #83656 (Add a regression test for issue-82865)
 - #83662 (Update books)
 - #83667 (Suggest box/pin/arc ing receiver on method calls)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/static/rustdoc.css')
-rw-r--r--src/librustdoc/html/static/rustdoc.css4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index 6c90fd7c9ee..f5a034a0d24 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -424,7 +424,9 @@ nav.sub {
 	text-overflow: ellipsis;
 	margin: 0;
 }
-.docblock-short code {
+/* Wrap non-pre code blocks (`text`) but not (```text```). */
+.docblock > :not(pre) > code,
+.docblock-short > :not(pre) > code {
 	white-space: pre-wrap;
 }