Rollup merge of #47810 - GuillaumeGomez:fix-theme-but-position, r=QuietMisdreavus

Fix rendering issues on mobile

Fixes #47723

r? @QuietMisdreavus
This commit is contained in:
Manish Goregaokar 2018-02-07 08:30:49 -08:00 committed by GitHub
commit 185f258801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 4 deletions

View file

@ -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;
@ -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";
}
}
@ -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;
}
}

View file

@ -870,6 +870,7 @@ span.since {
display: block;
border-bottom: 1px solid;
border-right: 1px solid;
height: 45px;
}
.sidebar-elems {
@ -889,13 +890,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%;
}
@ -1042,6 +1049,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
@ -1198,8 +1223,8 @@ kbd {
@media (max-width: 700px) {
.theme-picker {
left: 109px;
top: 7px;
left: 10px;
top: 54px;
z-index: 1;
}
}

View file

@ -383,6 +383,6 @@ kbd {
@media (max-width: 700px) {
#theme-picker {
background: #353535;
background: #f0f0f0;
}
}