about summary refs log tree commit diff
path: root/src/librustdoc/html/static/css/rustdoc.css
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-12-20 10:20:27 +0000
committerbors <bors@rust-lang.org>2022-12-20 10:20:27 +0000
commit8a746f4ac3a489efb724cde813607f3b96c2df7b (patch)
treec1a88a68650bff13ac0b61a0195f89c58e1a850a /src/librustdoc/html/static/css/rustdoc.css
parenteb9e5e711d3eef1998ff24ac2bc57386662652e9 (diff)
parent051c52a72705035e1d18b4204de6ae4c8248aca0 (diff)
downloadrust-8a746f4ac3a489efb724cde813607f3b96c2df7b.tar.gz
rust-8a746f4ac3a489efb724cde813607f3b96c2df7b.zip
Auto merge of #105940 - matthiaskrgr:rollup-ho4po1t, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #105901 (Don't panic on stable since miri is not available there)
 - #105912 (rustdoc: force pre tags to have the default line height)
 - #105914 (rustdoc: Simplify CSS for scraped code examples code blocks)
 - #105933 (Add readable rustdoc display for tvOS and watchOS)
 - #105935 (docs/test: add UI test and long-form error docs for `E0377`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/static/css/rustdoc.css')
-rw-r--r--src/librustdoc/html/static/css/rustdoc.css11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index efb19467c87..11e34a3fc7d 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -338,6 +338,7 @@ code, pre, a.test-arrow, .code-header {
 }
 pre {
 	padding: 14px;
+	line-height: 1.5; /* https://github.com/rust-lang/rust/issues/105906 */
 }
 .item-decl pre {
 	overflow-x: auto;
@@ -1972,10 +1973,7 @@ in storage.js
 }
 
 .scraped-example .code-wrapper .example-wrap {
-	display: grid;
-	grid-template-columns: max-content auto;
 	width: 100%;
-	overflow-x: auto;
 	overflow-y: hidden;
 	margin-bottom: 0;
 }
@@ -1984,13 +1982,6 @@ in storage.js
 	overflow-x: hidden;
 }
 
-.scraped-example .code-wrapper .example-wrap pre.rust {
-	overflow-x: inherit;
-	width: inherit;
-	overflow-y: hidden;
-}
-
-
 .more-examples-toggle {
 	max-width: calc(100% + 25px);
 	margin-top: 10px;