diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-07-19 11:37:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 11:37:46 +0200 |
| commit | 8cf995f6acb70cb09f14080df4d1232f736b2fc5 (patch) | |
| tree | 351d79758808a4a2a8c887d161dbbde01e4fd97c /src | |
| parent | 6df9df7e36ca40e8e30e107761e8d2763fc13864 (diff) | |
| parent | 57f7501b1d0e276415cefdc1b8fba76563387744 (diff) | |
| download | rust-8cf995f6acb70cb09f14080df4d1232f736b2fc5.tar.gz rust-8cf995f6acb70cb09f14080df4d1232f736b2fc5.zip | |
Rollup merge of #87251 - GuillaumeGomez:item-info-width, r=notriddle
Fix "item info" width Fixes #87202. It now looks again like this:  cc `@jyn514` r? `@notriddle`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 3 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/item-info-width.goml | 7 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/src/lib2/lib.rs | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index a7ffd8a9aea..e608ad05b17 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -925,6 +925,9 @@ body.blur > :not(#help) { padding: 0 20px 20px 17px;; } +.item-info .stab { + display: table; +} .stab { border-width: 1px; border-style: solid; diff --git a/src/test/rustdoc-gui/item-info-width.goml b/src/test/rustdoc-gui/item-info-width.goml new file mode 100644 index 00000000000..44b79e60912 --- /dev/null +++ b/src/test/rustdoc-gui/item-info-width.goml @@ -0,0 +1,7 @@ +// This test ensures that the item information don't take 100% of the width if unnecessary. +goto: file://|DOC_PATH|/lib2/struct.Foo.html +// We set a fixed size so there is no chance of "random" resize. +size: (1100, 800) +// We check that ".item-info" is bigger than its content. +assert-css: (".item-info", {"width": "807px"}) +assert-css: (".item-info .stab", {"width": "343px"}) diff --git a/src/test/rustdoc-gui/src/lib2/lib.rs b/src/test/rustdoc-gui/src/lib2/lib.rs index 0466909479b..cd00348cad3 100644 --- a/src/test/rustdoc-gui/src/lib2/lib.rs +++ b/src/test/rustdoc-gui/src/lib2/lib.rs @@ -1,5 +1,7 @@ // ignore-tidy-linelength +#![feature(doc_cfg)] + pub mod module { pub mod sub_module { pub mod sub_sub_module { @@ -14,6 +16,7 @@ pub fn foobar() {} pub type Alias = u32; +#[doc(cfg(feature = "foo-method"))] pub struct Foo { pub x: Alias, } |
