Skip to content

Fix rendering issues on mobile #47810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 7, 2018
Merged

Fix rendering issues on mobile #47810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dde3611
Fix rendering issues on mobile
GuillaumeGomez Jan 27, 2018
c26abe7
Fix not selectable search input
GuillaumeGomez Feb 4, 2018
8a587e6
Improve big sidebar elements display
GuillaumeGomez Feb 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/librustdoc/html/static/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
// 2 for "In Return Types"
var currentTab = 0;

var themesWidth = null;

function hasClass(elem, className) {
if (elem && className && elem.className) {
var elemClass = elem.className;
Expand Down Expand Up @@ -121,10 +123,25 @@
sidebar.appendChild(div);
}
}
var themeChoices = document.getElementById("theme-choices");
if (themeChoices) {
if (!themesWidth) {
var savedState = themeChoices.style.display;
themeChoices.style.display = 'block';
themesWidth = themeChoices.offsetWidth + 'px';
themeChoices.style.display = savedState;
}
themeChoices.style.position = "fixed";
themeChoices.style.width = themesWidth;
themeChoices.style.top = '78px';
themeChoices.style.left = '250px';
}
document.getElementsByTagName("body")[0].style.marginTop = '45px';
var themePicker = document.getElementById("theme-picker");
if (themePicker) {
themePicker.style.position = "fixed";
themePicker.style.top = "50px";
themePicker.style.left = "250px";
}
}

Expand All @@ -143,6 +160,15 @@
var themePicker = document.getElementById("theme-picker");
if (themePicker) {
themePicker.style.position = "absolute";
themePicker.style.top = null;
themePicker.style.left = null;
}
var themeChoices = document.getElementById("theme-choices");
if (themeChoices) {
themeChoices.style.position = 'absolute';
themeChoices.style.width = null;
themeChoices.style.top = null;
themeChoices.style.left = null;
}
}

Expand Down
31 changes: 28 additions & 3 deletions src/librustdoc/html/static/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,7 @@ span.since {
display: block;
border-bottom: 1px solid;
border-right: 1px solid;
height: 45px;
}

.sidebar-elems {
Expand All @@ -875,13 +876,19 @@ span.since {
}

nav.sub {
margin: 0 auto;
width: calc(100% - 32px);
float: right;
}

.content {
margin-left: 0px;
}

#main {
margin-top: 50px;
padding: 0;
}

.content .in-band {
width: 100%;
}
Expand Down Expand Up @@ -1028,6 +1035,24 @@ h4 > .important-traits {

.show-it {
display: block;
width: 246px;
}

.show-it > .block.items {
margin: 8px 0;
}

.show-it > .block.items > ul {
margin: 0;
}

.show-it > .block.items > ul > li {
text-align: center;
margin: 2px 0;
}

.show-it > .block.items > ul > li > a {
font-size: 21px;
}

/* Because of ios, we need to actually have a full height sidebar title so the
Expand Down Expand Up @@ -1184,8 +1209,8 @@ kbd {

@media (max-width: 700px) {
.theme-picker {
left: 109px;
top: 7px;
left: 10px;
top: 54px;
z-index: 1;
}
}
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/themes/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,6 @@ kbd {

@media (max-width: 700px) {
#theme-picker {
background: #353535;
background: #f0f0f0;
}
}