From 9077d540da944c41678a7129e04e7fc5d7e38582 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 23 Apr 2021 22:15:57 +0200
Subject: Replace h3 and h4 containing invalid DOM

---
 src/librustdoc/html/static/rustdoc.css | 90 +++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 22 deletions(-)

(limited to 'src/librustdoc/html/static/rustdoc.css')

diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index 2623ff27a25..e70bfecca59 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -117,8 +117,7 @@ h2 {
 h3 {
 	font-size: 1.3em;
 }
-h1, h2, h3:not(.impl):not(.method):not(.type):not(.tymethod):not(.notable),
-h4:not(.method):not(.type):not(.tymethod):not(.associatedconstant):not(.associatedtype) {
+h1, h2, h3:not(.notable), h4 {
 	font-weight: 500;
 	margin: 20px 0 15px 0;
 	padding-bottom: 6px;
@@ -135,30 +134,38 @@ h1.fqn {
 h1.fqn > .in-band > a:hover {
 	text-decoration: underline;
 }
-h2, h3:not(.impl):not(.method):not(.type):not(.tymethod),
-h4:not(.method):not(.type):not(.tymethod):not(.associatedconstant):not(.associatedtype) {
+h2, h3, h4 {
 	border-bottom: 1px solid;
 }
-h3.impl, h3.method, h4.method, h3.type, h4.type, h4.associatedconstant, h4.associatedtype {
+div[aria-level="3"].impl, div[aria-level="3"].method, div[aria-level="4"].method,
+div[aria-level="3"].type, div[aria-level="4"].type, div[aria-level="4"].associatedconstant,
+div[aria-level="4"].associatedtype {
 	flex-basis: 100%;
 	font-weight: 600;
 	margin-top: 16px;
 	margin-bottom: 10px;
 	position: relative;
 }
-h3.impl, h3.method, h4.method.trait-impl, h3.type,
-h4.type.trait-impl, h4.associatedconstant.trait-impl, h4.associatedtype.trait-impl {
+div[aria-level="3"].impl, div[aria-level="3"].method, div[aria-level="4"].method.trait-impl,
+div[aria-level="3"].type, div[aria-level="4"].type.trait-impl,
+div[aria-level="4"].associatedconstant.trait-impl,
+div[aria-level="4"].associatedtype.trait-impl {
 	padding-left: 15px;
 }
 
+div.impl-items > div {
+	padding-left: 0;
+}
+
 h1, h2, h3, h4,
 .sidebar, a.source, .search-input, .search-results .result-name,
 .content table td:first-child > a,
-div.item-list .out-of-band,
+.collapse-toggle, div.item-list .out-of-band, span.since,
 #source-sidebar, #sidebar-toggle,
 details.rustdoc-toggle > summary::before,
 details.undocumented > summary::before,
-.content ul.crate a.crate,
+div.impl-items > div:not(.docblock):not(.item-info),
+.content ul.crate a.crate, a.srclink,
 /* This selector is for the items listed in the "all items" page. */
 #main > ul.docblock > li > a {
 	font-family: "Fira Sans", Arial, sans-serif;
@@ -313,8 +320,6 @@ nav.sub {
 	margin-bottom: 14px;
 }
 .block h2, .block h3 {
-	margin-top: 0;
-	margin-bottom: 8px;
 	text-align: center;
 }
 .block ul, .block li {
@@ -462,15 +467,15 @@ nav.sub {
 	font-weight: normal;
 }
 
-h3.impl > .out-of-band {
+div[aria-level="3"].impl > .out-of-band {
 	font-size: 21px;
 }
 
-h4.method > .out-of-band {
+div[aria-level="4"].method > .out-of-band {
 	font-size: 19px;
 }
 
-h4 > code, h3 > code, .invisible > code {
+div[aria-level="3"] > code, div[aria-level="4"] > code, .invisible > code {
 	max-width: calc(100% - 41px);
 	display: block;
 }
@@ -543,7 +548,7 @@ h4 > code, h3 > code, .invisible > code {
 }
 .content .multi-column li { width: 100%; display: inline-block; }
 
-.content .method {
+.content > div.methods > div.method {
 	font-size: 1em;
 	position: relative;
 }
@@ -555,7 +560,7 @@ h4 > code, h3 > code, .invisible > code {
 	font-size: 0.8em;
 }
 
-.content .methods > div:not(.notable-traits):not(.methods) {
+.content .methods > div:not(.notable-traits):not(.method) {
 	margin-left: 40px;
 	margin-bottom: 15px;
 }
@@ -564,7 +569,7 @@ h4 > code, h3 > code, .invisible > code {
 	margin-left: 20px;
 	margin-top: -34px;
 }
-.content .docblock > .impl-items > h4 {
+.content .docblock > .impl-items > div[aria-level="4"] {
 	border-bottom: 0;
 }
 .content .docblock >.impl-items .table-display {
@@ -688,7 +693,8 @@ a {
 	text-decoration: underline;
 }
 
-.invisible > .srclink, h4 > code + .srclink, h3 > code + .srclink {
+.invisible > .srclink,
+div[aria-level="3"] > code + .srclink, div[aria-level="4"] > code + .srclink {
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -923,7 +929,8 @@ body.blur > :not(#help) {
 	flex-grow: 1;
 }
 
-.impl-items h4, h4.impl, h3.impl, .methods h3 {
+.impl-items div[aria-level="4"], div[aria-level="4"].impl, div[aria-level="3"].impl,
+.methods div[aria-level="3"] {
 	display: flex;
 	flex-basis: 100%;
 	font-size: 16px;
@@ -985,6 +992,45 @@ a.test-arrow:hover{
 	font-weight: 300;
 }
 
+.collapse-toggle {
+	font-weight: 300;
+	position: absolute;
+	left: -23px;
+	top: 0;
+}
+
+div[aria-level="3"] > .collapse-toggle, div[aria-level="4"] > .collapse-toggle {
+	font-size: 0.8em;
+	top: 5px;
+}
+
+.toggle-wrapper > .collapse-toggle {
+	left: -24px;
+	margin-top: 0px;
+}
+
+.toggle-wrapper {
+	position: relative;
+	margin-top: 0;
+}
+
+.toggle-wrapper.collapsed {
+	height: 25px;
+	transition: height .2s;
+	margin-bottom: .6em;
+}
+
+.collapse-toggle > .inner {
+	display: inline-block;
+	width: 1.2ch;
+	text-align: center;
+}
+
+.collapse-toggle.hidden-default {
+	position: relative;
+	margin-left: 20px;
+}
+
 .since + .srclink {
 	display: table-cell;
 	padding-left: 10px;
@@ -1197,7 +1243,7 @@ pre.rust {
 	margin-left: 5px;
 }
 
-h4 > .notable-traits {
+div[aria-level="4"] > .notable-traits {
 	position: absolute;
 	left: -44px;
 	top: 2px;
@@ -1615,7 +1661,7 @@ details.undocumented[open] > summary::before {
 		padding: 0;
 	}
 
-	.content h4 > .out-of-band {
+	.content div[aria-level="4"] > .out-of-band {
 		position: inherit;
 	}
 
@@ -1638,7 +1684,7 @@ details.undocumented[open] > summary::before {
 		z-index: 1;
 	}
 
-	h4 > .notable-traits {
+	div[aria-level="4"] > .notable-traits {
 		position: absolute;
 		left: -22px;
 		top: 24px;
-- 
cgit 1.4.1-3-g733a5


From 93389b556896bd71b684a6a3f3cf498810732288 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Mon, 10 May 2021 16:38:41 +0200
Subject: Remove invalid usage of aria-level

---
 src/librustdoc/html/render/mod.rs        | 12 +++++------
 src/librustdoc/html/render/print_item.rs |  2 +-
 src/librustdoc/html/static/rustdoc.css   | 36 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/librustdoc/html/static/rustdoc.css')

diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index baa5a611a29..fbd98609ab3 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -1371,7 +1371,7 @@ fn render_impl(
                         .map(|item| format!("{}.{}", item.type_(), name));
                     write!(
                         w,
-                        "<div id=\"{}\" class=\"{}{}\" role=\"heading\" aria-level=\"4\">",
+                        "<div id=\"{}\" class=\"{}{}\" data-level=\"2\">",
                         id, item_type, in_trait_class,
                     );
                     w.write_str("<code>");
@@ -1400,7 +1400,7 @@ fn render_impl(
                 let id = cx.derive_id(source_id.clone());
                 write!(
                     w,
-                    "<div id=\"{}\" class=\"{}{}\" role=\"heading\" aria-level=\"4\"><code>",
+                    "<div id=\"{}\" class=\"{}{}\" data-level=\"2\"><code>",
                     id, item_type, in_trait_class
                 );
                 assoc_type(
@@ -1421,7 +1421,7 @@ fn render_impl(
                 let id = cx.derive_id(source_id.clone());
                 write!(
                     w,
-                    "<div id=\"{}\" class=\"{}{}\" role=\"heading\" aria-level=\"4\"><code>",
+                    "<div id=\"{}\" class=\"{}{}\" data-level=\"2\"><code>",
                     id, item_type, in_trait_class
                 );
                 assoc_const(
@@ -1450,7 +1450,7 @@ fn render_impl(
                 let id = cx.derive_id(source_id.clone());
                 write!(
                     w,
-                    "<div id=\"{}\" class=\"{}{}\" role=\"heading\" aria-level=\"4\"><code>",
+                    "<div id=\"{}\" class=\"{}{}\" data-level=\"2\"><code>",
                     id, item_type, in_trait_class,
                 );
                 assoc_type(
@@ -1593,7 +1593,7 @@ fn render_impl(
         if let Some(use_absolute) = use_absolute {
             write!(
                 w,
-                "{}<div id=\"{}\" class=\"impl\"{} role=\"heading\" aria-level=\"3\">\
+                "{}<div id=\"{}\" class=\"impl\"{} data-level=\"1\">\
                      <code class=\"in-band\">",
                 open_details(&mut close_tags, is_implementing_trait),
                 id,
@@ -1621,7 +1621,7 @@ fn render_impl(
         } else {
             write!(
                 w,
-                "{}<div id=\"{}\" class=\"impl\"{} role=\"heading\" aria-level=\"3\">\
+                "{}<div id=\"{}\" class=\"impl\"{} data-level=\"1\">\
                      <code class=\"in-band\">{}</code>",
                 open_details(&mut close_tags, is_implementing_trait),
                 id,
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs
index 19508025d2c..24f56913a23 100644
--- a/src/librustdoc/html/render/print_item.rs
+++ b/src/librustdoc/html/render/print_item.rs
@@ -585,7 +585,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
         if toggled {
             write!(w, "<details class=\"rustdoc-toggle\" open><summary>");
         }
-        write!(w, "<div id=\"{}\" class=\"method\" role=\"heading\" aria-level=\"3\"><code>", id);
+        write!(w, "<div id=\"{}\" class=\"method\" data-level=\"1\"><code>", id);
         render_assoc_item(w, m, AssocItemLink::Anchor(Some(&id)), ItemType::Impl, cx);
         w.write_str("</code>");
         render_stability_since(w, m, t, cx.tcx());
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index e70bfecca59..f53d5f9c540 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -137,19 +137,19 @@ h1.fqn > .in-band > a:hover {
 h2, h3, h4 {
 	border-bottom: 1px solid;
 }
-div[aria-level="3"].impl, div[aria-level="3"].method, div[aria-level="4"].method,
-div[aria-level="3"].type, div[aria-level="4"].type, div[aria-level="4"].associatedconstant,
-div[aria-level="4"].associatedtype {
+div[data-level="1"].impl, div[data-level="1"].method, div[data-level="2"].method,
+div[data-level="1"].type, div[data-level="2"].type, div[data-level="2"].associatedconstant,
+div[data-level="2"].associatedtype {
 	flex-basis: 100%;
 	font-weight: 600;
 	margin-top: 16px;
 	margin-bottom: 10px;
 	position: relative;
 }
-div[aria-level="3"].impl, div[aria-level="3"].method, div[aria-level="4"].method.trait-impl,
-div[aria-level="3"].type, div[aria-level="4"].type.trait-impl,
-div[aria-level="4"].associatedconstant.trait-impl,
-div[aria-level="4"].associatedtype.trait-impl {
+div[data-level="1"].impl, div[data-level="1"].method, div[data-level="2"].method.trait-impl,
+div[data-level="1"].type, div[data-level="2"].type.trait-impl,
+div[data-level="2"].associatedconstant.trait-impl,
+div[data-level="2"].associatedtype.trait-impl {
 	padding-left: 15px;
 }
 
@@ -467,15 +467,15 @@ nav.sub {
 	font-weight: normal;
 }
 
-div[aria-level="3"].impl > .out-of-band {
+div[data-level="1"].impl > .out-of-band {
 	font-size: 21px;
 }
 
-div[aria-level="4"].method > .out-of-band {
+div[data-level="2"].method > .out-of-band {
 	font-size: 19px;
 }
 
-div[aria-level="3"] > code, div[aria-level="4"] > code, .invisible > code {
+div[data-level="1"] > code, div[data-level="2"] > code, .invisible > code {
 	max-width: calc(100% - 41px);
 	display: block;
 }
@@ -569,7 +569,7 @@ div[aria-level="3"] > code, div[aria-level="4"] > code, .invisible > code {
 	margin-left: 20px;
 	margin-top: -34px;
 }
-.content .docblock > .impl-items > div[aria-level="4"] {
+.content .docblock > .impl-items > div[data-level="2"] {
 	border-bottom: 0;
 }
 .content .docblock >.impl-items .table-display {
@@ -694,7 +694,7 @@ a {
 }
 
 .invisible > .srclink,
-div[aria-level="3"] > code + .srclink, div[aria-level="4"] > code + .srclink {
+div[data-level="1"] > code + .srclink, div[data-level="2"] > code + .srclink {
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -929,8 +929,8 @@ body.blur > :not(#help) {
 	flex-grow: 1;
 }
 
-.impl-items div[aria-level="4"], div[aria-level="4"].impl, div[aria-level="3"].impl,
-.methods div[aria-level="3"] {
+.impl-items div[data-level="2"], div[data-level="2"].impl, div[data-level="1"].impl,
+.methods div[data-level="1"] {
 	display: flex;
 	flex-basis: 100%;
 	font-size: 16px;
@@ -999,7 +999,7 @@ a.test-arrow:hover{
 	top: 0;
 }
 
-div[aria-level="3"] > .collapse-toggle, div[aria-level="4"] > .collapse-toggle {
+div[data-level="1"] > .collapse-toggle, div[data-level="2"] > .collapse-toggle {
 	font-size: 0.8em;
 	top: 5px;
 }
@@ -1243,7 +1243,7 @@ pre.rust {
 	margin-left: 5px;
 }
 
-div[aria-level="4"] > .notable-traits {
+div[data-level="2"] > .notable-traits {
 	position: absolute;
 	left: -44px;
 	top: 2px;
@@ -1661,7 +1661,7 @@ details.undocumented[open] > summary::before {
 		padding: 0;
 	}
 
-	.content div[aria-level="4"] > .out-of-band {
+	.content div[data-level="2"] > .out-of-band {
 		position: inherit;
 	}
 
@@ -1684,7 +1684,7 @@ details.undocumented[open] > summary::before {
 		z-index: 1;
 	}
 
-	div[aria-level="4"] > .notable-traits {
+	div[data-level="2"] > .notable-traits {
 		position: absolute;
 		left: -22px;
 		top: 24px;
-- 
cgit 1.4.1-3-g733a5


From fab6814ff3033108a2f4a1b16bf51ad8ffd0e36f Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Tue, 1 Jun 2021 21:43:09 -0700
Subject: Remove data-level selectors from CSS.

---
 src/librustdoc/html/render/mod.rs        | 16 +++---
 src/librustdoc/html/render/print_item.rs |  2 +-
 src/librustdoc/html/static/rustdoc.css   | 84 +++++---------------------------
 3 files changed, 20 insertions(+), 82 deletions(-)

(limited to 'src/librustdoc/html/static/rustdoc.css')

diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index d888a5a52a9..21d588e42f8 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -1371,7 +1371,7 @@ fn render_impl(
                         .map(|item| format!("{}.{}", item.type_(), name));
                     write!(
                         w,
-                        "<div id=\"{}\" class=\"{}{}\" data-level=\"2\">",
+                        "<div id=\"{}\" class=\"{}{} has-srclink\">",
                         id, item_type, in_trait_class,
                     );
                     w.write_str("<code>");
@@ -1400,7 +1400,7 @@ fn render_impl(
                 let id = cx.derive_id(source_id.clone());
                 write!(
                     w,
-                    "<div id=\"{}\" class=\"{}{}\" data-level=\"2\"><code>",
+                    "<div id=\"{}\" class=\"{}{} has-srclink\"><code>",
                     id, item_type, in_trait_class
                 );
                 assoc_type(
@@ -1421,7 +1421,7 @@ fn render_impl(
                 let id = cx.derive_id(source_id.clone());
                 write!(
                     w,
-                    "<div id=\"{}\" class=\"{}{}\" data-level=\"2\"><code>",
+                    "<div id=\"{}\" class=\"{}{} has-srclink\"><code>",
                     id, item_type, in_trait_class
                 );
                 assoc_const(
@@ -1448,11 +1448,7 @@ fn render_impl(
             clean::AssocTypeItem(ref bounds, ref default) => {
                 let source_id = format!("{}.{}", item_type, name);
                 let id = cx.derive_id(source_id.clone());
-                write!(
-                    w,
-                    "<div id=\"{}\" class=\"{}{}\" data-level=\"2\"><code>",
-                    id, item_type, in_trait_class,
-                );
+                write!(w, "<div id=\"{}\" class=\"{}{}\"><code>", id, item_type, in_trait_class,);
                 assoc_type(
                     w,
                     item,
@@ -1593,7 +1589,7 @@ fn render_impl(
         if let Some(use_absolute) = use_absolute {
             write!(
                 w,
-                "{}<div id=\"{}\" class=\"impl\"{} data-level=\"1\">\
+                "{}<div id=\"{}\" class=\"impl has-srclink\"{}>\
                      <code class=\"in-band\">",
                 open_details(&mut close_tags, is_implementing_trait),
                 id,
@@ -1621,7 +1617,7 @@ fn render_impl(
         } else {
             write!(
                 w,
-                "{}<div id=\"{}\" class=\"impl\"{} data-level=\"1\">\
+                "{}<div id=\"{}\" class=\"impl has-srclink\"{}>\
                      <code class=\"in-band\">{}</code>",
                 open_details(&mut close_tags, is_implementing_trait),
                 id,
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs
index 24f56913a23..61b6833c2b2 100644
--- a/src/librustdoc/html/render/print_item.rs
+++ b/src/librustdoc/html/render/print_item.rs
@@ -585,7 +585,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
         if toggled {
             write!(w, "<details class=\"rustdoc-toggle\" open><summary>");
         }
-        write!(w, "<div id=\"{}\" class=\"method\" data-level=\"1\"><code>", id);
+        write!(w, "<div id=\"{}\" class=\"method has-srclink\"><code>", id);
         render_assoc_item(w, m, AssocItemLink::Anchor(Some(&id)), ItemType::Impl, cx);
         w.write_str("</code>");
         render_stability_since(w, m, t, cx.tcx());
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index f53d5f9c540..8dad9f85386 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -137,19 +137,19 @@ h1.fqn > .in-band > a:hover {
 h2, h3, h4 {
 	border-bottom: 1px solid;
 }
-div[data-level="1"].impl, div[data-level="1"].method, div[data-level="2"].method,
-div[data-level="1"].type, div[data-level="2"].type, div[data-level="2"].associatedconstant,
-div[data-level="2"].associatedtype {
+.impl, .method,
+.type, .associatedconstant,
+.associatedtype {
 	flex-basis: 100%;
 	font-weight: 600;
 	margin-top: 16px;
 	margin-bottom: 10px;
 	position: relative;
 }
-div[data-level="1"].impl, div[data-level="1"].method, div[data-level="2"].method.trait-impl,
-div[data-level="1"].type, div[data-level="2"].type.trait-impl,
-div[data-level="2"].associatedconstant.trait-impl,
-div[data-level="2"].associatedtype.trait-impl {
+.impl, .method.trait-impl,
+.type.trait-impl,
+.associatedconstant.trait-impl,
+.associatedtype.trait-impl {
 	padding-left: 15px;
 }
 
@@ -160,7 +160,7 @@ div.impl-items > div {
 h1, h2, h3, h4,
 .sidebar, a.source, .search-input, .search-results .result-name,
 .content table td:first-child > a,
-.collapse-toggle, div.item-list .out-of-band, span.since,
+div.item-list .out-of-band, span.since,
 #source-sidebar, #sidebar-toggle,
 details.rustdoc-toggle > summary::before,
 details.undocumented > summary::before,
@@ -467,15 +467,7 @@ nav.sub {
 	font-weight: normal;
 }
 
-div[data-level="1"].impl > .out-of-band {
-	font-size: 21px;
-}
-
-div[data-level="2"].method > .out-of-band {
-	font-size: 19px;
-}
-
-div[data-level="1"] > code, div[data-level="2"] > code, .invisible > code {
+.method > code, .trait-impl > code, .invisible > code {
 	max-width: calc(100% - 41px);
 	display: block;
 }
@@ -548,7 +540,7 @@ div[data-level="1"] > code, div[data-level="2"] > code, .invisible > code {
 }
 .content .multi-column li { width: 100%; display: inline-block; }
 
-.content > div.methods > div.method {
+.content > .methods > .method {
 	font-size: 1em;
 	position: relative;
 }
@@ -569,9 +561,6 @@ div[data-level="1"] > code, div[data-level="2"] > code, .invisible > code {
 	margin-left: 20px;
 	margin-top: -34px;
 }
-.content .docblock > .impl-items > div[data-level="2"] {
-	border-bottom: 0;
-}
 .content .docblock >.impl-items .table-display {
 	margin: 0;
 }
@@ -694,7 +683,7 @@ a {
 }
 
 .invisible > .srclink,
-div[data-level="1"] > code + .srclink, div[data-level="2"] > code + .srclink {
+.method > code + .srclink {
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -929,8 +918,7 @@ body.blur > :not(#help) {
 	flex-grow: 1;
 }
 
-.impl-items div[data-level="2"], div[data-level="2"].impl, div[data-level="1"].impl,
-.methods div[data-level="1"] {
+.has-srclink {
 	display: flex;
 	flex-basis: 100%;
 	font-size: 16px;
@@ -992,45 +980,6 @@ a.test-arrow:hover{
 	font-weight: 300;
 }
 
-.collapse-toggle {
-	font-weight: 300;
-	position: absolute;
-	left: -23px;
-	top: 0;
-}
-
-div[data-level="1"] > .collapse-toggle, div[data-level="2"] > .collapse-toggle {
-	font-size: 0.8em;
-	top: 5px;
-}
-
-.toggle-wrapper > .collapse-toggle {
-	left: -24px;
-	margin-top: 0px;
-}
-
-.toggle-wrapper {
-	position: relative;
-	margin-top: 0;
-}
-
-.toggle-wrapper.collapsed {
-	height: 25px;
-	transition: height .2s;
-	margin-bottom: .6em;
-}
-
-.collapse-toggle > .inner {
-	display: inline-block;
-	width: 1.2ch;
-	text-align: center;
-}
-
-.collapse-toggle.hidden-default {
-	position: relative;
-	margin-left: 20px;
-}
-
 .since + .srclink {
 	display: table-cell;
 	padding-left: 10px;
@@ -1241,9 +1190,6 @@ pre.rust {
 	cursor: pointer;
 	z-index: 2;
 	margin-left: 5px;
-}
-
-div[data-level="2"] > .notable-traits {
 	position: absolute;
 	left: -44px;
 	top: 2px;
@@ -1661,10 +1607,6 @@ details.undocumented[open] > summary::before {
 		padding: 0;
 	}
 
-	.content div[data-level="2"] > .out-of-band {
-		position: inherit;
-	}
-
 	#search {
 		margin-left: 0;
 	}
@@ -1684,7 +1626,7 @@ details.undocumented[open] > summary::before {
 		z-index: 1;
 	}
 
-	div[data-level="2"] > .notable-traits {
+	.notable-traits {
 		position: absolute;
 		left: -22px;
 		top: 24px;
-- 
cgit 1.4.1-3-g733a5


From 0daf8ac41f438ba338051e18a56ef8ae64951748 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Wed, 2 Jun 2021 21:16:33 +0200
Subject: Replace h3 for notable traits with div

---
 src/librustdoc/html/static/rustdoc.css      | 20 ++++++++------------
 src/librustdoc/html/static/themes/ayu.css   |  6 +++++-
 src/librustdoc/html/static/themes/dark.css  |  6 +++++-
 src/librustdoc/html/static/themes/light.css |  6 +++++-
 4 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'src/librustdoc/html/static/rustdoc.css')

diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index 8dad9f85386..aee10a7b06f 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -117,7 +117,7 @@ h2 {
 h3 {
 	font-size: 1.3em;
 }
-h1, h2, h3:not(.notable), h4 {
+h1, h2, h3, h4 {
 	font-weight: 500;
 	margin: 20px 0 15px 0;
 	padding-bottom: 6px;
@@ -1129,6 +1129,13 @@ a.test-arrow:hover{
 	margin: 0;
 }
 
+.notable-traits .notable {
+	margin: 0;
+	margin-bottom: 13px;
+	font-size: 19px;
+	font-weight: 600;
+}
+
 .notable-traits .docblock code.content{
 	margin: 0;
 	padding: 0;
@@ -1190,9 +1197,6 @@ pre.rust {
 	cursor: pointer;
 	z-index: 2;
 	margin-left: 5px;
-	position: absolute;
-	left: -44px;
-	top: 2px;
 }
 
 #all-types {
@@ -1308,14 +1312,6 @@ pre.rust {
 	border-top: 1px solid;
 }
 
-
-
-h3.notable {
-	margin: 0;
-	margin-bottom: 13px;
-	font-size: 19px;
-}
-
 kbd {
 	display: inline-block;
 	padding: 3px 5px;
diff --git a/src/librustdoc/html/static/themes/ayu.css b/src/librustdoc/html/static/themes/ayu.css
index 8f2f79a77a1..d220d8708a1 100644
--- a/src/librustdoc/html/static/themes/ayu.css
+++ b/src/librustdoc/html/static/themes/ayu.css
@@ -10,7 +10,7 @@ body {
 	color: #c5c5c5;
 }
 
-h1, h2, h3:not(.notable), h4 {
+h1, h2, h3, h4 {
 	color: white;
 }
 h1.fqn {
@@ -406,6 +406,10 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	border-color: #5c6773;
 }
 
+.notable-traits-tooltiptext .notable {
+	border-bottom-color: #5c6773;
+}
+
 #titles > button.selected {
 	background-color: #141920 !important;
 	border-bottom: 1px solid #ffb44c !important;
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
index cf3ba312da1..6385a763f2e 100644
--- a/src/librustdoc/html/static/themes/dark.css
+++ b/src/librustdoc/html/static/themes/dark.css
@@ -3,7 +3,7 @@ body {
 	color: #ddd;
 }
 
-h1, h2, h3:not(.notable), h4 {
+h1, h2, h3, h4 {
 	color: #ddd;
 }
 h1.fqn {
@@ -354,6 +354,10 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	border-color: #777;
 }
 
+.notable-traits-tooltiptext .notable {
+	border-bottom-color: #d2d2d2;
+}
+
 #titles > button:not(.selected) {
 	background-color: #252525;
 	border-top-color: #252525;
diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css
index 68e74db383b..c19d5bfc317 100644
--- a/src/librustdoc/html/static/themes/light.css
+++ b/src/librustdoc/html/static/themes/light.css
@@ -5,7 +5,7 @@ body {
 	color: black;
 }
 
-h1, h2, h3:not(.notable), h4 {
+h1, h2, h3, h4 {
 	color: black;
 }
 h1.fqn {
@@ -346,6 +346,10 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	border-color: #999;
 }
 
+.notable-traits-tooltiptext .notable {
+	border-bottom-color: #DDDDDD;
+}
+
 #titles > button:not(.selected) {
 	background-color: #e6e6e6;
 	border-top-color: #e6e6e6;
-- 
cgit 1.4.1-3-g733a5