Fix new sidebar changes

Author: GuillaumeGomez

build.rs

@@ -77,6 +77,7 @@ fn compile_sass() -> Result<(), Box<dyn Error>> {
 
     // Compile rustdoc.scss -> rustdoc.css
     compile_sass_file("rustdoc", "rustdoc", &[])?;
+    compile_sass_file("rustdoc-docsrs-1", "rustdoc-docsrs-1", &[])?;
 
     // Compile vendored.scss -> vendored.css
     compile_sass_file(

src/docbuilder/rustwide_builder.rs

@@ -589,8 +589,18 @@ impl RustwideBuilder {
         rustdoc_flags.extend(vec![
             "--resource-suffix".to_string(),
             format!("-{}", parse_rustc_version(&self.rustc_version)?),
+            "--html-in-header".to_string(),
+            "docsrs-in-header.html".to_string(),
         ]);
 
+        let f = build.host_source_dir().join("docsrs-in-header.html");
+        std::fs::write(
+            f,
+            "<link rel=\"stylesheet\" href=\"/-/static/rustdoc-docsrs-1.css\" \
+              type=\"text/css\" media=\"all\">",
+        )
+        .expect("failed");
+
         let mut storage = LogStorage::new(LevelFilter::Info);
         storage.set_max_size(limits.max_log_size());
 

src/web/statics.rs

@@ -14,6 +14,7 @@ use std::{ffi::OsStr, fs, path::Path};
 const VENDORED_CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/vendored.css"));
 const STYLE_CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/style.css"));
 const RUSTDOC_CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/rustdoc.css"));
+const RUSTDOC_CSS_DOCSRS: &str = include_str!(concat!(env!("OUT_DIR"), "/rustdoc-docsrs-1.css"));
 const STATIC_SEARCH_PATHS: &[&str] = &["static", "vendor"];
 
 pub(crate) fn static_handler(req: &mut Request) -> IronResult<Response> {
@@ -25,6 +26,7 @@ pub(crate) fn static_handler(req: &mut Request) -> IronResult<Response> {
         "vendored.css" => serve_resource(VENDORED_CSS, ContentType("text/css".parse().unwrap())),
         "style.css" => serve_resource(STYLE_CSS, ContentType("text/css".parse().unwrap())),
         "rustdoc.css" => serve_resource(RUSTDOC_CSS, ContentType("text/css".parse().unwrap())),
+        "rustdoc-docsrs-1.css" => serve_resource(RUSTDOC_CSS_DOCSRS, ContentType("text/css".parse().unwrap())),
         file => serve_file(file)?,
     })
 }

templates/style/rustdoc-docsrs-1.scss

@@ -0,0 +1,34 @@
+@import "vars";
+
+// This file is needed to overload the previous docs.rs style. It is added into crates generated
+// using rustdoc after https://github.com/rust-lang/rust/pull/91356 has been merged.
+
+#rustdoc_body_wrapper {
+    padding: 0 !important;
+
+    .sidebar {
+        margin-top: 0 !important;
+        top: $top-navbar-height !important;
+
+        .sidebar-menu {
+            top: $top-navbar-height !important;
+        }
+    }
+
+    main {
+        padding-bottom: 50px !important;
+    }
+}
+
+div.container-rustdoc > .docs-rs-footer {
+    bottom: 0 !important;
+    right: 0 !important;
+}
+
+div.container-rustdoc:not(.source) > .docs-rs-footer {
+    left: 200px !important;
+}
+
+div.rustdoc #sidebar-toggle {
+    top: 0 !important;
+}