OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #60272 - Jakst:patch-1, r=Manishearth

Browse Source 
Explicitly set height on rust logo <img> element in docs

The layout of the left side menu in docs reflows when navigating between pages because of missing height on the <img> element of rust logo.

Setting height='100' tells the browser to reserve that vertical space, leading to a less janky experience.
This commit is contained in:
bors 2019-05-19 21:36:15 +00:00
commit a5000c5098
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/html/layout.rs
View File

@ -182,14 +182,14 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
let p = SlashChecker(&p);
if layout.logo.is_empty() {
format!("<a href='{path}index.html'>\
<img src='{static_root_path}rust-logo{suffix}.png' \
alt='logo' width='100'></a>",
<div class='logo-container'>\
<img src='{static_root_path}rust-logo{suffix}.png' alt='logo'></div></a>",
path=p,
static_root_path=static_root_path,
suffix=page.resource_suffix)
} else {
format!("<a href='{}index.html'>\
<img src='{}' alt='logo' width='100'></a>",
<div class='logo-container'><img src='{}' alt='logo'></div></a>",
p,
layout.logo)
}

23
src/librustdoc/html/static/rustdoc.css
View File

@ -182,12 +182,25 @@ nav.sub {
display: none !important;
}
.sidebar img {
.logo-container {
height: 100px;
width: 100px;
position: relative;
margin: 20px auto;
display: block;
margin-top: 10px;
}
.logo-container > img {
max-width: 100px;
max-height: 100px;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
display: block;
}
.sidebar .location {
border: 1px solid;
font-size: 17px;
@ -1030,14 +1043,20 @@ h3 > .collapse-toggle, h4 > .collapse-toggle {
padding: 0;
}
.sidebar img {
.sidebar .logo-container {
width: 35px;
height: 35px;
margin-top: 5px;
margin-bottom: 5px;
float: left;
margin-left: 50px;
}
.sidebar .logo-container > img {
max-width: 35px;
max-height: 35px;
}
.sidebar-menu {
position: fixed;
z-index: 10;