Skip to content

Commit 9ecba38

Browse files
author
Yuki Okushi
authored
Rollup merge of rust-lang#103493 - notriddle:notriddle/source-sidebar-logo, r=GuillaumeGomez
rustdoc: remove unused `.sidebar-logo` DOM on source pages
2 parents d77e239 + 4e1abcd commit 9ecba38

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

src/librustdoc/html/static/css/noscript.css

+4
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ nav.sub {
1818
/* The search bar and related controls don't work without JS */
1919
display: none;
2020
}
21+
22+
.source .sidebar {
23+
display: none;
24+
}

src/librustdoc/html/static/css/rustdoc.css

-4
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,6 @@ img {
402402
overflow-y: hidden;
403403
}
404404

405-
.rustdoc.source .sidebar .sidebar-logo {
406-
display: none;
407-
}
408-
409405
.source .sidebar, #sidebar-toggle, #source-sidebar {
410406
background-color: var(--sidebar-background-color);
411407
}

src/librustdoc/html/templates/page.html

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ <h2></h2> {#- -#}
8989
</nav> {#- -#}
9090
{%- endif -%}
9191
<nav class="sidebar"> {#- -#}
92+
{%- if page.css_class != "source" -%}
9293
<a class="sidebar-logo" href="{{page.root_path|safe}}{{krate_with_trailing_slash|safe}}index.html"> {#- -#}
9394
<div class="logo-container"> {#- -#}
9495
{%- if !layout.logo.is_empty() %}
@@ -98,6 +99,7 @@ <h2></h2> {#- -#}
9899
{%- endif -%}
99100
</div> {#- -#}
100101
</a> {#- -#}
102+
{%- endif -%}
101103
{{- sidebar|safe -}}
102104
</nav> {#- -#}
103105
<main> {#- -#}

src/test/rustdoc-gui/sidebar-source-code-display.goml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ javascript: false
33
goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
44
// Since the javascript is disabled, there shouldn't be a toggle.
55
assert-false: "#sidebar-toggle"
6-
wait-for-css: (".sidebar > *", {"visibility": "hidden"})
6+
wait-for-css: (".sidebar", {"display": "none"})
77

88
// Let's retry with javascript enabled.
99
javascript: true

0 commit comments

Comments
 (0)