mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #101335 - notriddle:notriddle/methods-stability, r=notriddle

Browse Source 
rustdoc: remove old CSS selector that causes weird spacing

It was added with e08a84a0c18739417a50c3e46917ced5037244eb (actually, it was called `.methods > .stability` at the time) and was directly nested that way.

**EDIT**: It is technically reachable code still, but it seems wrong.

## With the old CSS rule still present

https://notriddle.com/notriddle-rustdoc-test/weird-spacing/lib/struct.Foo.html

![image](https://user-images.githubusercontent.com/1593513/188216226-c667c560-d33d-494f-a492-4e0ec3ac0009.png)

## Version 2 (an older version of this PR)

https://notriddle.com/notriddle-rustdoc-test/normal-spacing-2/lib/struct.Foo.html

![image](https://user-images.githubusercontent.com/1593513/188216418-9fcd3109-f1b2-425d-b4fc-0c6b3b54e48e.png)

## Version 3 (with alignment fix for mobile)

https://notriddle.com/notriddle-rustdoc-test/normal-spacing-3/lib/struct.Foo.html

![image](https://user-images.githubusercontent.com/1593513/188223161-0e1ebce7-842f-41cb-8a0c-ae43aedcfccc.png)
This commit is contained in:
Matthias Krüger 2022-09-03 14:20:49 +02:00 committed by GitHub
commit 5e34b79c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustdoc/html/static/css/rustdoc.css
View File

@ -778,14 +778,6 @@ pre, .rustdoc.source .example-wrap {
margin-bottom: .6em; margin-bottom: .6em;
} }
.content .impl-items > .item-info {
margin-left: 40px;
}
.methods > .item-info, .content .impl-items > .item-info {
margin-top: -8px;
}
.impl-items { .impl-items {
flex-basis: 100%; flex-basis: 100%;
} }
@ -2035,6 +2027,11 @@ in storage.js plus the media query with (min-width: 701px)
#main-content > div > details.rustdoc-toggle > summary::before { #main-content > div > details.rustdoc-toggle > summary::before {
left: -11px; left: -11px;
} }
/* Align summary-nested and unnested item-info gizmos. */
.content .impl-items > .item-info {
margin-left: 34px;
}
} }
@media print { @media print {

10
src/test/rustdoc-gui/item-info-alignment.goml Normal file
View File

@ -0,0 +1,10 @@
// This test ensures that the "item-info" looks about the same
// whether or not it's inside a toggle.
goto: file://|DOC_PATH|/lib2/struct.ItemInfoAlignmentTest.html
// First, we try it in "desktop" mode.
size: (1200, 870)
compare-elements-position: (".impl-items > .item-info", "summary > .item-info", ("x"))
// Next, we try it in "mobile" mode (max-width: 700px).
size: (650, 650)
compare-elements-position: (".impl-items > .item-info", "summary > .item-info", ("x"))

10
src/test/rustdoc-gui/src/lib2/lib.rs
View File

@ -170,3 +170,13 @@ where
type Output; type Output;
fn index(&self, index: Idx) -> &Self::Output; fn index(&self, index: Idx) -> &Self::Output;
} }
pub struct ItemInfoAlignmentTest;
impl ItemInfoAlignmentTest {
/// This method has docs
#[deprecated]
pub fn foo() {}
#[deprecated]
pub fn bar() {}
}