Skip to content

Commit

Permalink
Rollup merge of rust-lang#81592 - GuillaumeGomez:rustdoc-ui-fixes, r=…
Browse files Browse the repository at this point in the history
…Nemo157

Rustdoc UI fixes

The first commit fixes this bug (I couldn't figure out why we were setting the width manually and it works as expected without so...):

![Screenshot from 2021-01-31 12-58-46](https://user-images.githubusercontent.com/3050060/106384371-d56a7700-63ca-11eb-9e04-c06b40c2ab5e.png)

The second commit fixes a small bug. On tablets or computer with very little width, the search section goes "over" the search input, making it impossible to click on the search input:

![Screenshot from 2021-01-31 13-22-37](https://user-images.githubusercontent.com/3050060/106384413-021e8e80-63cb-11eb-8321-391a1f8a4c7e.png)

The third and last commit fixes two bugs that you can see in this screenshot:

![Screenshot from 2021-01-31 13-41-05](https://user-images.githubusercontent.com/3050060/106384424-0cd92380-63cb-11eb-82de-76218286c3fb.png)

The wheel is going over the search input and the search tab is going under the search results text. The bug was fixed by simply switching to "mobile mode" at a bigger width:

![Screenshot from 2021-01-31 13-49-50](https://user-images.githubusercontent.com/3050060/106384466-4447d000-63cb-11eb-9330-a7cd29403905.png)

cc `@pickfire`
r? `@Nemo157`
  • Loading branch information
JohnTitor committed Feb 1, 2021
2 parents c4c2ab6 + be9b112 commit 05ec03c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
9 changes: 0 additions & 9 deletions src/librustdoc/html/static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1695,15 +1695,6 @@ function defocusSearchBar() {

search.innerHTML = output;
showSearchResults(search);
var tds = search.getElementsByTagName("td");
var td_width = 0;
if (tds.length > 0) {
td_width = tds[0].offsetWidth;
}
var width = search.offsetWidth - 40 - td_width;
onEachLazy(search.getElementsByClassName("desc"), function(e) {
e.style.width = width + "px";
});
initSearchNav();
var elems = document.getElementById("titles").childNodes;
elems[0].onclick = function() { printTab(0); };
Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/html/static/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ h4 > .notable-traits {
margin-left: 0px;
}

#main {
#main, #search {
margin-top: 45px;
padding: 0;
}
Expand Down Expand Up @@ -1579,7 +1579,7 @@ h4 > .notable-traits {
}
}

@media (max-width: 416px) {
@media (max-width: 464px) {
#titles, #titles > button {
height: 73px;
}
Expand Down

0 comments on commit 05ec03c

Please sign in to comment.