From 135281ed1525db15edd8ebd092aa10aa40df2386 Mon Sep 17 00:00:00 2001 From: cynecx Date: Thu, 30 Sep 2021 04:23:02 +0200 Subject: [PATCH 01/13] rustdoc: use flexbox to layout sidebar and main content --- src/librustdoc/html/static/css/rustdoc.css | 91 ++++++++++------------ src/librustdoc/html/static/js/main.js | 2 +- src/librustdoc/html/templates/page.html | 68 ++++++++-------- 3 files changed, 80 insertions(+), 81 deletions(-) diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index fceb508bc4ff5..6135038a4044d 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -111,7 +111,6 @@ body { font: 16px/1.4 "Source Serif 4", NanumBarunGothic, serif; margin: 0; position: relative; - padding: 10px 15px 20px 15px; -webkit-font-feature-settings: "kern", "liga"; -moz-font-feature-settings: "kern", "liga"; @@ -248,6 +247,25 @@ textarea { /* end tweaks for normalize.css 8 */ +.rustdoc { + display: flex; + flex-direction: row; + flex-wrap: nowrap; +} + +main { + position: relative; + flex-grow: 1; + padding: 10px 15px 40px 45px; + height: 100vh; + overflow-y: auto; +} + +.main-inner { + max-width: 960px; + margin-right: auto; +} + details:not(.rustdoc-toggle) summary { margin-bottom: .6em; } @@ -298,15 +316,13 @@ nav.sub { .sidebar { width: 200px; - position: fixed; - left: 0; - top: 0; - bottom: 0; overflow-y: scroll; } .rustdoc.source .sidebar { overflow-y: auto; + min-width: 200px; + height: 100vh; } /* Improve the scrollbar display on firefox */ @@ -332,10 +348,6 @@ nav.sub { margin-right: -10px; } -.content, nav { - max-width: 960px; -} - /* Everything else */ .hidden { @@ -439,10 +451,6 @@ nav.sub { display: none; } -.content { - padding: 15px 0; -} - .source .content pre.rust { white-space: pre; overflow: auto; @@ -487,7 +495,6 @@ nav.sub { } #search { - margin-left: 230px; position: relative; } @@ -707,7 +714,7 @@ nav.sub { nav:not(.sidebar) { border-bottom: 1px solid; padding-bottom: 10px; - margin-bottom: 10px; + margin-bottom: 25px; } nav.main { padding: 20px 0; @@ -726,10 +733,6 @@ nav.main .separator { nav.sum { text-align: right; } nav.sub form { display: inline; } -nav.sub, .content { - margin-left: 230px; -} - a { text-decoration: none; background: transparent; @@ -1354,7 +1357,7 @@ pre.rust { .theme-picker { position: absolute; - left: 211px; + left: 11px; top: 19px; } @@ -1653,11 +1656,23 @@ details.rustdoc-toggle[open] > summary.hideme::after { padding-top: 0px; } + main { + height: auto; + padding-left: 15px; + padding-top: 0px; + overflow-y: visible; + } + + .rustdoc { + flex-direction: column; + } + .rustdoc > .sidebar { + width: 100%; height: 45px; min-height: 40px; + max-height: 45px; margin: 0; - margin-left: -15px; padding: 0 15px; position: static; z-index: 11; @@ -1748,20 +1763,17 @@ details.rustdoc-toggle[open] > summary.hideme::after { nav.sub { width: calc(100% - 32px); - float: right; + margin-left: 32px; + margin-bottom: 10px; } .content { margin-left: 0px; } - #main, #search { - margin-top: 45px; - padding: 0; - } - #search { margin-left: 0; + padding: 0; } .anchor { @@ -1770,7 +1782,7 @@ details.rustdoc-toggle[open] > summary.hideme::after { .theme-picker { left: 10px; - top: 54px; + top: 9px; z-index: 1; } @@ -1790,22 +1802,12 @@ details.rustdoc-toggle[open] > summary.hideme::after { } .sidebar.mobile { - position: fixed; + position: sticky; + top: 0; + left: 0; width: 100%; margin-left: 0; background-color: rgba(0,0,0,0); - height: 100%; - } - /* - This allows to prevent the version text to overflow the sidebar title on mobile mode when the - sidebar is displayed (after clicking on the "hamburger" button). - */ - .sidebar.mobile > div.version { - overflow: hidden; - max-height: 33px; - } - .sidebar { - width: calc(100% + 30px); } .show-it, .sidebar-elems:focus-within { @@ -1920,13 +1922,6 @@ details.rustdoc-toggle[open] > summary.hideme::after { height: 73px; } - /* This is to prevent the search bar from being underneath the
- * element following it. - */ - #main, #search { - margin-top: 100px; - } - #main > table:not(.table-display) td { word-break: break-word; width: 50%; diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 5661d4973342f..abf6126599b2c 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -1001,7 +1001,7 @@ function hideThemeButtonState() { container.appendChild(rustdoc_version); popup.appendChild(container); - insertAfter(popup, searchState.outputElement()); + insertAfter(popup, document.querySelector("main")); // So that it's only built once and then it'll do nothing when called! buildHelperPopup = function() {}; }; diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index 2a783c6da57e4..fb4133eca4c41 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -81,39 +81,43 @@ {#- -#} {{- sidebar | safe -}} {#- -#} -
{#- -#} - {#- -#} - {#- -#} -
{#- -#} - {#- -#} -
{{- content | safe -}}
{#- -#} - {#- -#} + {#- -#} +
{{- content | safe -}}
{#- -#} + {#- -#} + {#- -#} + {#- -#} {{- layout.external_html.after_content | safe -}}
Date: Sun, 10 Oct 2021 00:52:14 +0200 Subject: [PATCH 02/13] rustdoc: fix source view --- src/librustdoc/html/static/css/rustdoc.css | 47 ++++++++++++++++++++-- src/librustdoc/html/templates/page.html | 25 ++++++++---- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 6135038a4044d..9cd05a7d6f1c5 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -261,11 +261,19 @@ main { overflow-y: auto; } +.source main { + padding: 15px; +} + .main-inner { max-width: 960px; margin-right: auto; } +.source .main-inner { + max-width: unset; +} + details:not(.rustdoc-toggle) summary { margin-bottom: .6em; } @@ -310,6 +318,7 @@ li { } nav.sub { + position: relative; font-size: 16px; text-transform: uppercase; } @@ -325,6 +334,10 @@ nav.sub { height: 100vh; } +.source .sidebar { + display: none; +} + /* Improve the scrollbar display on firefox */ * { scrollbar-width: initial; @@ -354,6 +367,18 @@ nav.sub { display: none !important; } +.logo-source { + display: none; +} + +.source .logo-source { + display: block; + position: absolute; + top: 0; + left: 0; + width: 200px; +} + .logo-container { height: 100px; width: 100px; @@ -716,6 +741,9 @@ nav:not(.sidebar) { padding-bottom: 10px; margin-bottom: 25px; } +.source nav:not(.sidebar).sub { + margin-left: 230px; +} nav.main { padding: 20px 0; text-align: center; @@ -805,6 +833,7 @@ h2.small-section-header > .anchor { .search-container { position: relative; + max-width: 960px; } .search-container > div { display: inline-flex; @@ -1357,8 +1386,8 @@ pre.rust { .theme-picker { position: absolute; - left: 11px; - top: 19px; + left: -34px; + top: 9px; } .theme-picker button { @@ -1767,10 +1796,18 @@ details.rustdoc-toggle[open] > summary.hideme::after { margin-bottom: 10px; } + .source nav:not(.sidebar).sub { + margin-left: 32px; + } + .content { margin-left: 0px; } + .source .content { + margin-top: 10px; + } + #search { margin-left: 0; padding: 0; @@ -1781,8 +1818,6 @@ details.rustdoc-toggle[open] > summary.hideme::after { } .theme-picker { - left: 10px; - top: 9px; z-index: 1; } @@ -1909,6 +1944,10 @@ details.rustdoc-toggle[open] > summary.hideme::after { .search-results div.desc, .search-results .result-description, .item-right { padding-left: 2em; } + + .source .logo-source { + display: none; + } } @media print { diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index fb4133eca4c41..815dd03d34667 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -83,14 +83,25 @@ {#- -#}
{#- -#}
{#- -#} -
{#- -#} - {#- -#} - {#- -#} -
{#- -#} + {#- -#} + {#- -#} + {#- -#}
{#- -#} diff --git a/src/test/rustdoc-gui/check-code-blocks-margin.goml b/src/test/rustdoc-gui/check-code-blocks-margin.goml index 2de4768285679..f6266eba75de7 100644 --- a/src/test/rustdoc-gui/check-code-blocks-margin.goml +++ b/src/test/rustdoc-gui/check-code-blocks-margin.goml @@ -1,6 +1,6 @@ // This test ensures that the docblock elements have the appropriate left margin. goto: file://|DOC_PATH|/test_docs/fn.foo.html // The top docblock elements shouldn't have left margin... -assert-css: ("#main .docblock.item-decl", {"margin-left": "0px"}) +assert-css: ("#main-content .docblock.item-decl", {"margin-left": "0px"}) // ... but all the others should! -assert-css: ("#main .docblock:not(.item-decl)", {"margin-left": "24px"}) +assert-css: ("#main-content .docblock:not(.item-decl)", {"margin-left": "24px"}) diff --git a/src/test/rustdoc-gui/escape-key.goml b/src/test/rustdoc-gui/escape-key.goml index 5cf8a5e136ef7..b65c398405cf5 100644 --- a/src/test/rustdoc-gui/escape-key.goml +++ b/src/test/rustdoc-gui/escape-key.goml @@ -3,15 +3,15 @@ goto: file://|DOC_PATH|/test_docs/index.html write: (".search-input", "test") wait-for: "#search > h1" // The search element is empty before the first search assert-attribute: ("#search", {"class": "content"}) -assert-attribute: ("#main", {"class": "content hidden"}) +assert-attribute: ("#main-content", {"class": "content hidden"}) press-key: "Escape" assert-attribute: ("#search", {"class": "content hidden"}) -assert-attribute: ("#main", {"class": "content"}) +assert-attribute: ("#main-content", {"class": "content"}) // Check that focusing the search input brings back the search results focus: ".search-input" assert-attribute: ("#search", {"class": "content"}) -assert-attribute: ("#main", {"class": "content hidden"}) +assert-attribute: ("#main-content", {"class": "content hidden"}) // Now let's check that when the help popup is displayed and we press Escape, it doesn't // hide the search results too. @@ -20,7 +20,7 @@ assert-attribute: ("#help", {"class": ""}) press-key: "Escape" assert-attribute: ("#help", {"class": "hidden"}) assert-attribute: ("#search", {"class": "content"}) -assert-attribute: ("#main", {"class": "content hidden"}) +assert-attribute: ("#main-content", {"class": "content hidden"}) // Check that Escape hides the search results when a search result is focused. focus: ".search-input" @@ -31,4 +31,4 @@ assert: "#results a:focus" press-key: "Escape" assert-attribute: ("#help", {"class": "hidden"}) assert-attribute: ("#search", {"class": "content hidden"}) -assert-attribute: ("#main", {"class": "content"}) +assert-attribute: ("#main-content", {"class": "content"}) diff --git a/src/test/rustdoc-gui/impl-default-expansion.goml b/src/test/rustdoc-gui/impl-default-expansion.goml index b268ec68d42e3..7c4496dc0cabc 100644 --- a/src/test/rustdoc-gui/impl-default-expansion.goml +++ b/src/test/rustdoc-gui/impl-default-expansion.goml @@ -1,3 +1,3 @@ // This test ensures that the impl blocks are open by default. goto: file://|DOC_PATH|/test_docs/struct.Foo.html -assert-attribute: ("#main > details.implementors-toggle", {"open": ""}) +assert-attribute: ("#main-content > details.implementors-toggle", {"open": ""}) diff --git a/src/test/rustdoc-gui/search-result-go-to-first.goml b/src/test/rustdoc-gui/search-result-go-to-first.goml index 5d709f6588118..cadd7f6a3f3b5 100644 --- a/src/test/rustdoc-gui/search-result-go-to-first.goml +++ b/src/test/rustdoc-gui/search-result-go-to-first.goml @@ -11,7 +11,7 @@ goto: file://|DOC_PATH|/test_docs/index.html?search=struct%3AFoo wait-for: "#titles" assert-text-false: (".fqn .in-band", "Struct test_docs::Foo") // Ensure that the search results are displayed, not the "normal" content. -assert-css: ("#main", {"display": "none"}) +assert-css: ("#main-content", {"display": "none"}) // Now we can check that the feature is working as expected! goto: file://|DOC_PATH|/test_docs/index.html?search=struct%3AFoo&go_to_first=true diff --git a/src/test/rustdoc-gui/toggle-docs.goml b/src/test/rustdoc-gui/toggle-docs.goml index 136868f3175c9..eaa4c554d5a0f 100644 --- a/src/test/rustdoc-gui/toggle-docs.goml +++ b/src/test/rustdoc-gui/toggle-docs.goml @@ -1,10 +1,10 @@ goto: file://|DOC_PATH|/test_docs/index.html -assert-attribute: ("#main > details.top-doc", {"open": ""}) +assert-attribute: ("#main-content > details.top-doc", {"open": ""}) click: "#toggle-all-docs" wait-for: 1000 // This is now collapsed so there shouldn't be the "open" attribute on details. -assert-attribute-false: ("#main > details.top-doc", {"open": ""}) +assert-attribute-false: ("#main-content > details.top-doc", {"open": ""}) click: "#toggle-all-docs" wait-for: 1000 // Not collapsed anymore so the "open" attribute should be back. -assert-attribute: ("#main > details.top-doc", {"open": ""}) +assert-attribute: ("#main-content > details.top-doc", {"open": ""}) diff --git a/src/test/rustdoc-gui/type-declation-overflow.goml b/src/test/rustdoc-gui/type-declation-overflow.goml index 63ab867fb1772..bb24d0ce79254 100644 --- a/src/test/rustdoc-gui/type-declation-overflow.goml +++ b/src/test/rustdoc-gui/type-declation-overflow.goml @@ -11,7 +11,7 @@ assert-property: (".item-decl pre", {"scrollWidth": "1324"}) goto: file://|DOC_PATH|/lib2/too_long/type.ReallyLongTypeNameLongLongLong.html assert-property: ("body", {"scrollWidth": "1100"}) // We now check that the section width hasn't grown because of it. -assert-property: ("#main", {"scrollWidth": "840"}) +assert-property: ("#main-content", {"scrollWidth": "840"}) // And now checking that it has scrollable content. assert-property: (".item-decl pre", {"scrollWidth": "1103"}) @@ -20,6 +20,6 @@ assert-property: (".item-decl pre", {"scrollWidth": "1103"}) goto: file://|DOC_PATH|/lib2/too_long/constant.ReallyLongTypeNameLongLongLongConstBecauseWhyNotAConstRightGigaGigaSupraLong.html assert-property: ("body", {"scrollWidth": "1100"}) // We now check that the section width hasn't grown because of it. -assert-property: ("#main", {"scrollWidth": "840"}) +assert-property: ("#main-content", {"scrollWidth": "840"}) // And now checking that it has scrollable content. assert-property: (".item-decl pre", {"scrollWidth": "950"}) diff --git a/src/test/rustdoc/doc-cfg.rs b/src/test/rustdoc/doc-cfg.rs index 416ffb6009863..6bf09b9d24bde 100644 --- a/src/test/rustdoc/doc-cfg.rs +++ b/src/test/rustdoc/doc-cfg.rs @@ -2,7 +2,7 @@ #![feature(target_feature, cfg_target_feature)] // @has doc_cfg/struct.Portable.html -// @!has - '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' '' +// @!has - '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' '' // @has - '//*[@id="method.unix_and_arm_only_function"]' 'fn unix_and_arm_only_function()' // @has - '//*[@class="stab portability"]' 'This is supported on Unix and ARM only.' // @has - '//*[@id="method.wasi_and_wasm32_only_function"]' 'fn wasi_and_wasm32_only_function()' @@ -10,14 +10,14 @@ pub struct Portable; // @has doc_cfg/unix_only/index.html \ -// '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ +// '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on Unix only.' // @matches - '//*[@class="item-left module-item"]//*[@class="stab portability"]' '\AARM\Z' // @count - '//*[@class="stab portability"]' 2 #[doc(cfg(unix))] pub mod unix_only { // @has doc_cfg/unix_only/fn.unix_only_function.html \ - // '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ + // '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on Unix only.' // @count - '//*[@class="stab portability"]' 1 pub fn unix_only_function() { @@ -25,7 +25,7 @@ pub mod unix_only { } // @has doc_cfg/unix_only/trait.ArmOnly.html \ - // '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ + // '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on Unix and ARM only.' // @count - '//*[@class="stab portability"]' 1 #[doc(cfg(target_arch = "arm"))] @@ -40,14 +40,14 @@ pub mod unix_only { } // @has doc_cfg/wasi_only/index.html \ -// '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ +// '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on WASI only.' // @matches - '//*[@class="item-left module-item"]//*[@class="stab portability"]' '\AWebAssembly\Z' // @count - '//*[@class="stab portability"]' 2 #[doc(cfg(target_os = "wasi"))] pub mod wasi_only { // @has doc_cfg/wasi_only/fn.wasi_only_function.html \ - // '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ + // '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on WASI only.' // @count - '//*[@class="stab portability"]' 1 pub fn wasi_only_function() { @@ -55,7 +55,7 @@ pub mod wasi_only { } // @has doc_cfg/wasi_only/trait.Wasm32Only.html \ - // '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ + // '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on WASI and WebAssembly only.' // @count - '//*[@class="stab portability"]' 1 #[doc(cfg(target_arch = "wasm32"))] @@ -77,7 +77,7 @@ pub mod wasi_only { // @matches - '//*[@class="item-left module-item"]//*[@class="stab portability"]' '\Aavx\Z' // @has doc_cfg/fn.uses_target_feature.html -// @has - '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ +// @has - '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported with target feature avx only.' #[target_feature(enable = "avx")] pub unsafe fn uses_target_feature() { @@ -85,7 +85,7 @@ pub unsafe fn uses_target_feature() { } // @has doc_cfg/fn.uses_cfg_target_feature.html -// @has - '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ +// @has - '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported with target feature avx only.' #[doc(cfg(target_feature = "avx"))] pub fn uses_cfg_target_feature() { @@ -94,7 +94,7 @@ pub fn uses_cfg_target_feature() { // multiple attributes should be allowed // @has doc_cfg/fn.multiple_attrs.html \ -// '//*[@id="main"]/*[@class="item-info"]/*[@class="stab portability"]' \ +// '//*[@id="main-content"]/*[@class="item-info"]/*[@class="stab portability"]' \ // 'This is supported on x and y and z only.' #[doc(inline, cfg(x))] #[doc(cfg(y), cfg(z))] diff --git a/src/test/rustdoc/duplicate_impls/issue-33054.rs b/src/test/rustdoc/duplicate_impls/issue-33054.rs index 7ace13fe3a6b5..b018dd6cda58a 100644 --- a/src/test/rustdoc/duplicate_impls/issue-33054.rs +++ b/src/test/rustdoc/duplicate_impls/issue-33054.rs @@ -2,7 +2,7 @@ // @has - '//h3[@class="code-header in-band"]' 'impl Foo' // @has - '//h3[@class="code-header in-band"]' 'impl Bar for Foo' // @count - '//*[@id="trait-implementations-list"]//*[@class="impl has-srclink"]' 1 -// @count - '//*[@id="main"]/details/summary/*[@class="impl has-srclink"]' 1 +// @count - '//*[@id="main-content"]/details/summary/*[@class="impl has-srclink"]' 1 // @has issue_33054/impls/bar/trait.Bar.html // @has - '//h3[@class="code-header in-band"]' 'impl Bar for Foo' // @count - '//*[@class="struct"]' 1 diff --git a/src/test/rustdoc/impl-everywhere.rs b/src/test/rustdoc/impl-everywhere.rs index 742813262589b..44885d4301ff8 100644 --- a/src/test/rustdoc/impl-everywhere.rs +++ b/src/test/rustdoc/impl-everywhere.rs @@ -8,23 +8,23 @@ pub struct Bar; impl Foo for Bar {} impl Foo2 for Bar {} -// @has foo/fn.foo.html '//section[@id="main"]//pre' "x: &'x impl Foo" -// @has foo/fn.foo.html '//section[@id="main"]//pre' "-> &'x impl Foo" +// @has foo/fn.foo.html '//section[@id="main-content"]//pre' "x: &'x impl Foo" +// @has foo/fn.foo.html '//section[@id="main-content"]//pre' "-> &'x impl Foo" pub fn foo<'x>(x: &'x impl Foo) -> &'x impl Foo { x } -// @has foo/fn.foo2.html '//section[@id="main"]//pre' "x: &'x impl Foo" -// @has foo/fn.foo2.html '//section[@id="main"]//pre' '-> impl Foo2' +// @has foo/fn.foo2.html '//section[@id="main-content"]//pre' "x: &'x impl Foo" +// @has foo/fn.foo2.html '//section[@id="main-content"]//pre' '-> impl Foo2' pub fn foo2<'x>(_x: &'x impl Foo) -> impl Foo2 { Bar } -// @has foo/fn.foo_foo.html '//section[@id="main"]//pre' '-> impl Foo + Foo2' +// @has foo/fn.foo_foo.html '//section[@id="main-content"]//pre' '-> impl Foo + Foo2' pub fn foo_foo() -> impl Foo + Foo2 { Bar } -// @has foo/fn.foo_foo_foo.html '//section[@id="main"]//pre' "x: &'x impl Foo + Foo2" +// @has foo/fn.foo_foo_foo.html '//section[@id="main-content"]//pre' "x: &'x impl Foo + Foo2" pub fn foo_foo_foo<'x>(_x: &'x (impl Foo + Foo2)) { } diff --git a/src/test/rustdoc/intra-doc/prim-methods-external-core.rs b/src/test/rustdoc/intra-doc/prim-methods-external-core.rs index 9d869984bbd7c..1869cc6758ced 100644 --- a/src/test/rustdoc/intra-doc/prim-methods-external-core.rs +++ b/src/test/rustdoc/intra-doc/prim-methods-external-core.rs @@ -9,8 +9,8 @@ #![crate_type = "rlib"] // @has prim_methods_external_core/index.html -// @has - '//*[@id="main"]//a[@href="../my_core/primitive.char.html"]' 'char' -// @has - '//*[@id="main"]//a[@href="../my_core/primitive.char.html#method.len_utf8"]' 'char::len_utf8' +// @has - '//*[@id="main-content"]//a[@href="../my_core/primitive.char.html"]' 'char' +// @has - '//*[@id="main-content"]//a[@href="../my_core/primitive.char.html#method.len_utf8"]' 'char::len_utf8' //! A [`char`] and its [`char::len_utf8`]. diff --git a/src/test/rustdoc/intra-doc/prim-methods-local.rs b/src/test/rustdoc/intra-doc/prim-methods-local.rs index cfb3c3842ab16..7f0fcceca421a 100644 --- a/src/test/rustdoc/intra-doc/prim-methods-local.rs +++ b/src/test/rustdoc/intra-doc/prim-methods-local.rs @@ -3,10 +3,9 @@ #![no_core] #![crate_type = "rlib"] - // @has prim_methods_local/index.html -// @has - '//*[@id="main"]//a[@href="primitive.char.html"]' 'char' -// @has - '//*[@id="main"]//a[@href="primitive.char.html#method.len_utf8"]' 'char::len_utf8' +// @has - '//*[@id="main-content"]//a[@href="primitive.char.html"]' 'char' +// @has - '//*[@id="main-content"]//a[@href="primitive.char.html#method.len_utf8"]' 'char::len_utf8' //! A [prim@`char`] and its [`char::len_utf8`]. diff --git a/src/test/rustdoc/intra-doc/prim-methods.rs b/src/test/rustdoc/intra-doc/prim-methods.rs index 076117359d264..7c3b90839eeb9 100644 --- a/src/test/rustdoc/intra-doc/prim-methods.rs +++ b/src/test/rustdoc/intra-doc/prim-methods.rs @@ -1,8 +1,7 @@ #![deny(broken_intra_doc_links)] - // @has prim_methods/index.html -// @has - '//*[@id="main"]//a[@href="{{channel}}/std/primitive.char.html"]' 'char' -// @has - '//*[@id="main"]//a[@href="{{channel}}/std/primitive.char.html#method.len_utf8"]' 'char::len_utf8' +// @has - '//*[@id="main-content"]//a[@href="{{channel}}/std/primitive.char.html"]' 'char' +// @has - '//*[@id="main-content"]//a[@href="{{channel}}/std/primitive.char.html#method.len_utf8"]' 'char::len_utf8' //! A [`char`] and its [`char::len_utf8`]. diff --git a/src/test/rustdoc/intra-doc/true-false.rs b/src/test/rustdoc/intra-doc/true-false.rs index 44aac68841373..081df89a139dd 100644 --- a/src/test/rustdoc/intra-doc/true-false.rs +++ b/src/test/rustdoc/intra-doc/true-false.rs @@ -1,9 +1,8 @@ #![deny(broken_intra_doc_links)] #![crate_name = "foo"] - // @has foo/index.html -// @has - '//*[@id="main"]//a[@href="{{channel}}/std/primitive.bool.html"]' 'true' -// @has - '//*[@id="main"]//a[@href="{{channel}}/std/primitive.bool.html"]' 'false' +// @has - '//*[@id="main-content"]//a[@href="{{channel}}/std/primitive.bool.html"]' 'true' +// @has - '//*[@id="main-content"]//a[@href="{{channel}}/std/primitive.bool.html"]' 'false' //! A `bool` is either [`true`] or [`false`]. diff --git a/src/test/rustdoc/issue-55364.rs b/src/test/rustdoc/issue-55364.rs index 70aa10767b270..14a6f5041f208 100644 --- a/src/test/rustdoc/issue-55364.rs +++ b/src/test/rustdoc/issue-55364.rs @@ -2,19 +2,19 @@ // @has issue_55364/subone/index.html // These foo/bar links in the module's documentation should refer inside `subone` -// @has - '//section[@id="main"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' -// @has - '//section[@id="main"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' +// @has - '//section[@id="main-content"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' +// @has - '//section[@id="main-content"]/details[@open=""]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' pub mod subone { //! See either [foo] or [bar]. // This should refer to subone's `bar` // @has issue_55364/subone/fn.foo.html - // @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' + // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' /// See [bar] pub fn foo() {} // This should refer to subone's `foo` // @has issue_55364/subone/fn.bar.html - // @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' + // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' /// See [foo] pub fn bar() {} } @@ -23,27 +23,27 @@ pub mod subone { // @has issue_55364/subtwo/index.html // These foo/bar links in the module's documentation should not reference inside `subtwo` -// @!has - '//section[@id="main"]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' -// @!has - '//section[@id="main"]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' +// @!has - '//section[@id="main-content"]/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' +// @!has - '//section[@id="main-content"]/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' // Instead it should be referencing the top level functions -// @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="../fn.foo.html"]' 'foo' -// @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="../fn.bar.html"]' 'bar' +// @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.foo.html"]' 'foo' +// @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.bar.html"]' 'bar' // Though there should be such links later -// @has - '//section[@id="main"]/div[@class="item-table"]//div[@class="item-left module-item"]/a[@class="fn"][@href="fn.foo.html"]' 'foo' -// @has - '//section[@id="main"]/div[@class="item-table"]//div[@class="item-left module-item"]/a[@class="fn"][@href="fn.bar.html"]' 'bar' +// @has - '//section[@id="main-content"]/div[@class="item-table"]//div[@class="item-left module-item"]/a[@class="fn"][@href="fn.foo.html"]' 'foo' +// @has - '//section[@id="main-content"]/div[@class="item-table"]//div[@class="item-left module-item"]/a[@class="fn"][@href="fn.bar.html"]' 'bar' /// See either [foo] or [bar]. pub mod subtwo { // Despite the module's docs referring to the top level foo/bar, // this should refer to subtwo's `bar` // @has issue_55364/subtwo/fn.foo.html - // @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' + // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.bar.html"]' 'bar' /// See [bar] pub fn foo() {} // Despite the module's docs referring to the top level foo/bar, // this should refer to subtwo's `foo` // @has issue_55364/subtwo/fn.bar.html - // @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' + // @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="fn.foo.html"]' 'foo' /// See [foo] pub fn bar() {} } @@ -59,8 +59,8 @@ pub fn bar() {} // @has issue_55364/subthree/index.html // This module should also refer to the top level foo/bar -// @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="../fn.foo.html"]' 'foo' -// @has - '//section[@id="main"]/details/div[@class="docblock"]//a[@href="../fn.bar.html"]' 'bar' +// @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.foo.html"]' 'foo' +// @has - '//section[@id="main-content"]/details/div[@class="docblock"]//a[@href="../fn.bar.html"]' 'bar' pub mod subthree { //! See either [foo][super::foo] or [bar][super::bar] } @@ -68,8 +68,8 @@ pub mod subthree { // Next we go *deeper* - In order to ensure it's not just "this or parent" // we test `crate::` and a `super::super::...` chain // @has issue_55364/subfour/subfive/subsix/subseven/subeight/index.html -// @has - '//section[@id="main"]/div[@class="item-table"]//div[@class="item-right docblock-short"]//a[@href="../../../../../subone/fn.foo.html"]' 'other foo' -// @has - '//section[@id="main"]/div[@class="item-table"]//div[@class="item-right docblock-short"]//a[@href="../../../../../subtwo/fn.bar.html"]' 'other bar' +// @has - '//section[@id="main-content"]/div[@class="item-table"]//div[@class="item-right docblock-short"]//a[@href="../../../../../subone/fn.foo.html"]' 'other foo' +// @has - '//section[@id="main-content"]/div[@class="item-table"]//div[@class="item-right docblock-short"]//a[@href="../../../../../subtwo/fn.bar.html"]' 'other bar' pub mod subfour { pub mod subfive { pub mod subsix { diff --git a/src/test/rustdoc/keyword.rs b/src/test/rustdoc/keyword.rs index 16f7cac5f51cc..29ceda4f7c1d3 100644 --- a/src/test/rustdoc/keyword.rs +++ b/src/test/rustdoc/keyword.rs @@ -8,7 +8,7 @@ // @has foo/index.html '//div[@class="sidebar-elems"]//li/a/@href' '#keywords' // @has foo/keyword.match.html '//a[@class="keyword"]' 'match' // @has foo/keyword.match.html '//span[@class="in-band"]' 'Keyword match' -// @has foo/keyword.match.html '//section[@id="main"]//div[@class="docblock"]//p' 'this is a test!' +// @has foo/keyword.match.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!' // @has foo/index.html '//a/@href' '../foo/index.html' // @!has foo/foo/index.html // @!has-dir foo/foo @@ -16,7 +16,7 @@ /// this is a test! mod foo{} -// @has foo/keyword.foo.html '//section[@id="main"]//div[@class="docblock"]//p' 'hello' +// @has foo/keyword.foo.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'hello' #[doc(keyword = "foo")] /// hello mod bar {} diff --git a/src/test/rustdoc/struct-implementations-title.rs b/src/test/rustdoc/struct-implementations-title.rs index 96eb11311d6b4..5468796f669eb 100644 --- a/src/test/rustdoc/struct-implementations-title.rs +++ b/src/test/rustdoc/struct-implementations-title.rs @@ -3,7 +3,7 @@ pub struct Struc; // @has foo/struct.Struc.html -// @has - '//*[@id="main"]/h2[@id="implementations"]' "Implementations" +// @has - '//*[@id="main-content"]/h2[@id="implementations"]' "Implementations" impl Struc { pub const S: u64 = 0; } diff --git a/src/test/rustdoc/trait_alias.rs b/src/test/rustdoc/trait_alias.rs index c9fccf5a77cde..dec7fe3f6a5d9 100644 --- a/src/test/rustdoc/trait_alias.rs +++ b/src/test/rustdoc/trait_alias.rs @@ -14,13 +14,13 @@ use std::fmt::Debug; // @has foo/index.html '//a[@class="traitalias"]' 'Foo' // @has foo/traitalias.CopyAlias.html -// @has - '//section[@id="main"]/div[@class="docblock item-decl"]/pre' 'trait CopyAlias = Copy;' +// @has - '//section[@id="main-content"]/div[@class="docblock item-decl"]/pre' 'trait CopyAlias = Copy;' pub trait CopyAlias = Copy; // @has foo/traitalias.Alias2.html -// @has - '//section[@id="main"]/div[@class="docblock item-decl"]/pre' 'trait Alias2 = Copy + Debug;' +// @has - '//section[@id="main-content"]/div[@class="docblock item-decl"]/pre' 'trait Alias2 = Copy + Debug;' pub trait Alias2 = Copy + Debug; // @has foo/traitalias.Foo.html -// @has - '//section[@id="main"]/div[@class="docblock item-decl"]/pre' 'trait Foo = Into + Debug;' +// @has - '//section[@id="main-content"]/div[@class="docblock item-decl"]/pre' 'trait Foo = Into + Debug;' pub trait Foo = Into + Debug; // @has foo/fn.bar.html '//a[@href="traitalias.Alias2.html"]' 'Alias2' pub fn bar() where T: Alias2 {} diff --git a/src/test/rustdoc/tuple-struct-fields-doc.rs b/src/test/rustdoc/tuple-struct-fields-doc.rs index 139c5b4391ab7..2e339fe82649d 100644 --- a/src/test/rustdoc/tuple-struct-fields-doc.rs +++ b/src/test/rustdoc/tuple-struct-fields-doc.rs @@ -4,11 +4,11 @@ // @has - '//h2[@id="fields"]' 'Tuple Fields' // @has - '//h3[@class="sidebar-title"]/a[@href="#fields"]' 'Tuple Fields' // @has - '//*[@id="structfield.0"]' '0: u32' -// @has - '//*[@id="main"]/div[@class="docblock"]' 'hello' +// @has - '//*[@id="main-content"]/div[@class="docblock"]' 'hello' // @!has - '//*[@id="structfield.1"]' // @has - '//*[@id="structfield.2"]' '2: char' // @has - '//*[@id="structfield.3"]' '3: i8' -// @has - '//*[@id="main"]/div[@class="docblock"]' 'not hello' +// @has - '//*[@id="main-content"]/div[@class="docblock"]' 'not hello' pub struct Foo( /// hello pub u32, From d7528e2157762fadb9665518fd1e4dee6d6a2809 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 2 Dec 2021 14:21:32 +0100 Subject: [PATCH 13/13] Rename CSS class main-inner into width-limiter --- src/librustdoc/html/static/css/rustdoc.css | 6 +++--- src/librustdoc/html/templates/page.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index a028be6ce12c6..79c7626ffc4bd 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -264,12 +264,12 @@ main { padding: 15px; } -.main-inner { +.width-limiter { max-width: 960px; margin-right: auto; } -.source .main-inner { +.source .width-limiter { max-width: unset; } @@ -1698,7 +1698,7 @@ details.rustdoc-toggle[open] > summary.hideme::after { /* When we expand the sidebar on the source code page, we hide the logo on the left of the search bar to have more space. */ - .sidebar.expanded + main .main-inner .sub-logo-container.rust-logo { + .sidebar.expanded + main .width-limiter .sub-logo-container.rust-logo { display: none; } diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index f9735f69adbc5..13d8e6318a4fe 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -82,7 +82,7 @@ {{- sidebar | safe -}} {#- -#}
{#- -#} -
{#- -#} +
{#- -#}
{#- -#}