squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix remaining bugs

Browse source
This commit is contained in:
Guillaume Gomez 2021-11-29 15:55:05 +01:00
parent 6e9954d12e
commit 1e55c31cbb
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/librustdoc/html/static/css/rustdoc.css
View file

@ -348,13 +348,11 @@ nav.sub {
position: sticky; position: sticky;
min-width: 200px; min-width: 200px;
height: 100vh; height: 100vh;
top: 0;
left: 0;
} }
.rustdoc.source .sidebar { .rustdoc.source .sidebar {
overflow: auto;
}
.source .sidebar {
width: 50px; width: 50px;
min-width: 0px; min-width: 0px;
max-width: 300px; max-width: 300px;
@ -362,7 +360,6 @@ nav.sub {
flex-shrink: 0; flex-shrink: 0;
flex-basis: auto; flex-basis: auto;
border-right: 1px solid; border-right: 1px solid;
transition: width .5s;
overflow-x: hidden; overflow-x: hidden;
/* The sidebar is by default hidden */ /* The sidebar is by default hidden */
overflow-y: hidden; overflow-y: hidden;
@ -376,7 +373,7 @@ nav.sub {
.source .sidebar.expanded { .source .sidebar.expanded {
overflow-y: auto; overflow-y: auto;
width: 300px !important; width: 300px;
} }
.source .sidebar.expanded > * { .source .sidebar.expanded > * {
@ -1698,6 +1695,18 @@ details.rustdoc-toggle[open] > summary.hideme::after {
.docblock > .information:first-child > .tooltip { .docblock > .information:first-child > .tooltip {
margin-top: 16px; margin-top: 16px;
} }
/* 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 {
display: none;
}
/* It doesn't render well on mobile because of the layout, so better only have the transition
on desktop. */
.rustdoc.source .sidebar {
transition: width .5s;
}
} }
@media (max-width: 700px) { @media (max-width: 700px) {
@ -1723,6 +1732,7 @@ details.rustdoc-toggle[open] > summary.hideme::after {
padding: 0 15px; padding: 0 15px;
position: static; position: static;
z-index: 11; z-index: 11;
overflow-y: hidden;
} }
.rustdoc.source > .sidebar { .rustdoc.source > .sidebar {
@ -1779,6 +1789,7 @@ details.rustdoc-toggle[open] > summary.hideme::after {
cursor: pointer; cursor: pointer;
width: 45px; width: 45px;
left: 0; left: 0;
top: 0;
text-align: center; text-align: center;
display: block; display: block;
border-bottom: 1px solid; border-bottom: 1px solid;
@ -2052,6 +2063,10 @@ details.rustdoc-toggle[open] > summary.hideme::after {
height: 35px; height: 35px;
width: 35px; width: 35px;
} }
.sidebar:not(.expanded) #sidebar-toggle {
top: 10px;
}
} }

1
src/librustdoc/html/templates/page.html
View file

@ -111,7 +111,6 @@
<input {# -#} <input {# -#}
class="search-input" {# -#} class="search-input" {# -#}
name="search" {# -#} name="search" {# -#}
disabled {# -#}
autocomplete="off" {# -#} autocomplete="off" {# -#}
spellcheck="false" {# -#} spellcheck="false" {# -#}
placeholder="Click or press ‘S’ to search, ‘?’ for more options…" {# -#} placeholder="Click or press ‘S’ to search, ‘?’ for more options…" {# -#}

2
src/test/rustdoc-gui/source-code-page.goml
View file

@ -1,6 +1,6 @@
goto: file://|DOC_PATH|/src/test_docs/lib.rs.html goto: file://|DOC_PATH|/src/test_docs/lib.rs.html
// Check that we can click on the line number. // Check that we can click on the line number.
click: (50, 196) // This is the position of the span for line 4. click: ".line-numbers > span:nth-child(4)" // This is the span for line 4.
// Unfortunately, "#4" isn't a valid query selector, so we have to go around that limitation // Unfortunately, "#4" isn't a valid query selector, so we have to go around that limitation
// by instead getting the nth span. // by instead getting the nth span.
assert-attribute: (".line-numbers > span:nth-child(4)", {"class": "line-highlighted"}) assert-attribute: (".line-numbers > span:nth-child(4)", {"class": "line-highlighted"})