From 570ba09cbe3922036db07f5862ebe6cc2a4b456e Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 6 Jun 2021 23:06:01 +0200 Subject: [PATCH 1/2] Fix invalid weight for type pages --- src/librustdoc/html/static/rustdoc.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index d3f8a7aa67dd7..35b2785fac004 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -138,7 +138,7 @@ h2, h3, h4 { border-bottom: 1px solid; } .impl, .method, -.type, .associatedconstant, +.type:not(.container-rustdoc), .associatedconstant, .associatedtype { flex-basis: 100%; font-weight: 600; From 45973621bcc57adb4d97d23d20ae915041db5534 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 6 Jun 2021 23:06:49 +0200 Subject: [PATCH 2/2] Add test to check that font-weight is correctly set on type page --- src/test/rustdoc-gui/sidebar.goml | 3 ++- src/test/rustdoc-gui/src/lib.rs | 3 +++ src/test/rustdoc-gui/type-weight.rs | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/test/rustdoc-gui/type-weight.rs diff --git a/src/test/rustdoc-gui/sidebar.goml b/src/test/rustdoc-gui/sidebar.goml index 388ca120d770e..7703677154ef9 100644 --- a/src/test/rustdoc-gui/sidebar.goml +++ b/src/test/rustdoc-gui/sidebar.goml @@ -11,7 +11,8 @@ assert: (".sidebar-elems > .items > ul > li:nth-child(2)", "Structs") assert: (".sidebar-elems > .items > ul > li:nth-child(3)", "Enums") assert: (".sidebar-elems > .items > ul > li:nth-child(4)", "Traits") assert: (".sidebar-elems > .items > ul > li:nth-child(5)", "Functions") -assert: (".sidebar-elems > .items > ul > li:nth-child(6)", "Keywords") +assert: (".sidebar-elems > .items > ul > li:nth-child(6)", "Type Definitions") +assert: (".sidebar-elems > .items > ul > li:nth-child(7)", "Keywords") assert: ("#structs + table td > a", "Foo") click: "#structs + table td > a" diff --git a/src/test/rustdoc-gui/src/lib.rs b/src/test/rustdoc-gui/src/lib.rs index 272b1d05452e3..5141b6d1920ea 100644 --- a/src/test/rustdoc-gui/src/lib.rs +++ b/src/test/rustdoc-gui/src/lib.rs @@ -96,3 +96,6 @@ pub enum AnEnum { #[doc(keyword = "CookieMonster")] pub mod keyword {} + +/// Just some type alias. +pub type SomeType = u32; diff --git a/src/test/rustdoc-gui/type-weight.rs b/src/test/rustdoc-gui/type-weight.rs new file mode 100644 index 0000000000000..8b6518e7f317a --- /dev/null +++ b/src/test/rustdoc-gui/type-weight.rs @@ -0,0 +1,2 @@ +goto: file://|DOC_PATH|/test_docs/type.SomeType.html +assert-all: (".top-block .docblock p", {"font-weight": "400"})